[redeclipse] 06/26: Merge tag 'upstream/1.5.5+ds1'
Markus Koschany
apo at moszumanska.debian.org
Sun Aug 28 15:31:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository redeclipse.
commit 6631944e2730426073f93262ab0e1d34a00ae0ad
Merge: 6a13b9f d53a6ef
Author: Markus Koschany <apo at debian.org>
Date: Sat Aug 27 00:56:20 2016 +0200
Merge tag 'upstream/1.5.5+ds1'
Upstream version 1.5.5+ds1
# gpg: Signature made Sat 27 Aug 2016 00:56:17 CEST using RSA key ID D9AD14B9513B51E4
# gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
# gpg: aka "Markus Koschany <markus at koschany.net>" [ultimate]
# gpg: aka "Markus Koschany <apo at debian.org>" [ultimate]
.github/CONTRIBUTING.md | 51 +
.github/ISSUE_TEMPLATE.md | 9 +
.gitignore | 1 +
.gitmodules | 147 +-
bin/update.bat | 122 +-
bin/update.sh | 181 +-
bin/version.txt | 1 +
branch.txt | 1 +
config/brush.cfg | 19 +-
config/compass.cfg | 35 +-
config/engine.cfg | 7 +-
config/glsl.cfg | 1956 +-
config/keymap.cfg | 615 +-
config/legacy.cfg | 2 +-
config/map/default.cfg | 9 +-
config/map/models.cfg | 18 +-
config/map/sounds.cfg | 4 +-
config/map/textures.cfg | 21 +-
config/menus/console.cfg | 3 +
config/menus/editing.cfg | 3066 +-
config/menus/game.cfg | 332 +-
config/menus/glue.cfg | 142 +-
config/menus/help.cfg | 313 +-
config/menus/irc.cfg | 25 +-
config/menus/main.cfg | 1 +
config/menus/maps.cfg | 193 +-
config/menus/options.cfg | 1553 +-
config/menus/package.cfg | 5 +-
config/menus/profile.cfg | 321 +-
config/menus/scratch.cfg | 19 -
config/menus/servers.cfg | 38 +-
config/menus/vars.cfg | 229 +-
config/setup.cfg | 99 +-
config/sounds/weapons.cfg | 64 +-
config/stdshader.cfg | 2848 -
config/tips.cfg | 32 +-
config/usage.cfg | 1622 +-
config/vanities.cfg | 90 +-
config/version.cfg | 25 +-
doc/all-licenses.txt | 14 +-
doc/changelog.txt | 1 -
doc/examples/servinit.cfg | 72 +-
doc/guidelines.txt | 2 +-
doc/license.txt | 6 +-
doc/man/redeclipse.6.am | 31 +-
doc/trademark.txt | 2 +-
readme.txt | 15 +-
redeclipse.bat | 7 +-
redeclipse.sh | 21 +-
redeclipse_server.bat | 3 +-
redeclipse_server.sh | 4 +-
sql/stats/create.sql | 92 +
sql/stats/upgrade_1.sql | 24 +
sql/stats/upgrade_2.sql | 2 +
sql/stats/upgrade_3.sql | 3 +
sql/stats/upgrade_4.sql | 2 +
src/Makefile | 704 +-
src/dist.mk | 113 +-
src/engine/animmodel.h | 796 +-
src/engine/bih.cpp | 333 +-
src/engine/bih.h | 86 +-
src/engine/blend.cpp | 18 +-
src/engine/blob.cpp | 267 +-
src/engine/client.cpp | 2 +-
src/engine/command.cpp | 83 +-
src/engine/console.cpp | 269 +-
src/engine/decal.cpp | 141 +-
src/engine/depthfx.h | 60 +-
src/engine/dynlight.cpp | 35 +-
src/engine/engine.h | 212 +-
src/engine/explosion.h | 510 +-
src/engine/genkey.cpp | 24 +-
src/engine/glare.cpp | 16 +-
src/engine/glexts.h | 293 -
src/engine/grass.cpp | 116 +-
src/engine/iqm.h | 36 +-
src/engine/irc.cpp | 162 +-
src/engine/irc.h | 14 +-
src/engine/lensflare.h | 42 +-
src/engine/lightmap.cpp | 134 +-
src/engine/lightmap.h | 6 +-
src/engine/lightning.h | 49 +-
src/engine/main.cpp | 686 +-
src/engine/master.cpp | 751 +-
src/engine/material.cpp | 302 +-
src/engine/md2.h | 27 +-
src/engine/md3.h | 55 +-
src/engine/md5.h | 36 +-
src/engine/menus.cpp | 230 +-
src/engine/model.h | 8 +-
src/engine/movie.cpp | 134 +-
src/engine/mpr.h | 6 +-
src/engine/normal.cpp | 57 +-
src/engine/obj.h | 27 +-
src/engine/octa.cpp | 160 +-
src/engine/octa.h | 4 +-
src/engine/octaedit.cpp | 897 +-
src/engine/octarender.cpp | 329 +-
src/engine/physics.cpp | 26 +-
src/engine/pvs.cpp | 58 +-
src/engine/ragdoll.h | 58 +-
src/engine/rendergl.cpp | 2216 +-
src/engine/rendermodel.cpp | 254 +-
src/engine/renderparticles.cpp | 529 +-
src/engine/rendersky.cpp | 553 +-
src/engine/rendertarget.h | 261 +-
src/engine/rendertext.cpp | 631 +-
src/engine/renderva.cpp | 1627 +-
src/engine/scale.h | 26 +-
src/engine/server.cpp | 343 +-
src/engine/serverbrowser.cpp | 42 +-
src/engine/shader.cpp | 1948 +-
src/engine/shadowmap.cpp | 267 +-
src/engine/skelmodel.h | 878 +-
src/engine/smd.h | 33 +-
src/engine/sound.cpp | 114 +-
src/engine/sound.h | 8 +-
src/engine/textedit.h | 147 +-
src/engine/texture.cpp | 1043 +-
src/engine/texture.h | 462 +-
src/engine/ui.cpp | 706 +-
src/engine/varray.h | 238 -
src/engine/version.h | 15 +
src/engine/vertmodel.h | 401 +-
src/engine/water.cpp | 651 +-
src/engine/world.cpp | 142 +-
src/engine/world.h | 5 +-
src/engine/worldio.cpp | 1285 +-
src/game/ai.cpp | 274 +-
src/game/ai.h | 54 +-
src/game/aiman.h | 168 +-
src/game/auth.h | 118 +-
src/game/bomber.cpp | 142 +-
src/game/bomber.h | 27 +-
src/game/bombermode.h | 136 +-
src/game/capture.cpp | 154 +-
src/game/capture.h | 33 +-
src/game/capturemode.h | 122 +-
src/game/client.cpp | 885 +-
src/game/compass.h | 14 +-
src/game/defend.cpp | 84 +-
src/game/defend.h | 7 +-
src/game/defendmode.h | 80 +-
src/game/duelmut.h | 289 +-
src/game/entities.cpp | 149 +-
src/game/game.cpp | 1006 +-
src/game/game.h | 569 +-
src/game/gamemode.h | 153 +-
src/game/hud.cpp | 1376 +-
src/game/physics.cpp | 152 +-
src/game/player.h | 172 +-
src/game/playerdef.h | 106 +-
src/game/projs.cpp | 247 +-
src/game/scoreboard.cpp | 226 +-
src/game/server.cpp | 3204 +-
src/game/teamdef.h | 4 +-
src/game/vars.h | 930 +-
src/game/waypoint.cpp | 112 +-
src/game/weapdef.h | 172 +-
src/game/weapons.cpp | 139 +-
src/game/weapons.h | 1231 +-
src/install/nix/redeclipse.appdata.xml.am | 8 +-
src/install/win/install.mpi | 2109 -
src/install/win/redeclipse.nsi | 90 +-
src/{osxbuild.sh => macbuild.sh} | 0
src/redeclipse.cbp | 437 +-
src/redeclipse.rc | 2 +-
src/scripts/servinit-defaults | 6 +-
src/scripts/wiki-convert | 3 +
src/semaphore.sh | 213 +-
src/semdeploy.sh | 43 +-
src/shared/command.h | 50 +-
src/shared/cube.h | 24 +-
src/shared/ents.h | 43 +-
src/shared/geom.cpp | 77 +-
src/shared/geom.h | 1219 +-
src/shared/glemu.cpp | 347 +
src/shared/glemu.h | 180 +
src/shared/glexts.h | 491 +
src/shared/iengine.h | 141 +-
src/shared/igame.h | 11 +-
src/shared/stream.cpp | 74 +-
src/shared/tools.cpp | 24 +-
src/shared/tools.h | 393 +-
src/shared/zip.cpp | 4 +-
src/support/sqlite3.c | 161623 ++++++++++++++++++++++
src/support/sqlite3.h | 7860 ++
src/version.h | 10 -
src/xcode/SDLMain.m | 2 +-
src/xcode/macutils.mm | 57 -
src/xcode/redeclipse-Info.plist | 2 +-
src/xcode/redeclipse.xcodeproj/project.pbxproj | 202 +-
version.txt | 1 +
193 files changed, 197425 insertions(+), 28573 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git
More information about the Pkg-games-commits
mailing list