[redeclipse] 15/23: Merge tag 'upstream/1.5.1' into next
Martin Werner
arand-guest at moszumanska.debian.org
Sat Apr 4 00:47:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
arand-guest pushed a commit to branch next
in repository redeclipse.
commit 1f2dfb7576ccf1025c03a82df9d281c1138d9bf0
Merge: 71509f1 f2c9e9f
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date: Fri Apr 3 17:34:54 2015 +0200
Merge tag 'upstream/1.5.1' into next
Upstream version 1.5.1
# gpg: Signature made Fri 03 Apr 2015 17:34:54 CEST using RSA key ID 481823D1
# gpg: Good signature from "Martin Erik Werner <martinerikwerner at gmail.com>"
# gpg: aka "Arand Nash <ienorand at gmail.com>"
config/brush.cfg | 140 +
config/compass.cfg | 43 +
config/defaults.cfg | 24 +
config/engine.cfg | 289 ++
config/fonts/command.cfg | 3 +
config/fonts/console.cfg | 3 +
config/fonts/consub.cfg | 3 +
config/fonts/default.cfg | 3 +
config/fonts/emphasis.cfg | 3 +
config/fonts/huge.cfg | 3 +
config/fonts/little.cfg | 3 +
config/fonts/play.cfg | 326 +++
config/fonts/reduced.cfg | 3 +
config/fonts/super.cfg | 3 +
config/fonts/tiny.cfg | 3 +
config/glsl.cfg | 2395 ++++++++++++++++
config/keymap.cfg | 486 ++++
config/legacy.cfg | 41 +
config/map/default.cfg | 74 +
config/map/models.cfg | 7 +
config/map/octa.cfg | 66 +
config/map/sounds.cfg | 2 +
config/map/textures.cfg | 10 +
config/menus/editing.cfg | 966 +++++++
config/menus/game.cfg | 42 +
config/menus/glue.cfg | 213 ++
config/menus/help.cfg | 1062 ++++++++
config/menus/irc.cfg | 68 +
config/menus/main.cfg | 116 +
config/menus/maps.cfg | 558 ++++
config/menus/options.cfg | 1133 ++++++++
config/menus/package.cfg | 12 +
config/menus/profile.cfg | 238 ++
config/menus/scratch.cfg | 85 +
config/menus/servers.cfg | 382 +++
config/menus/vars.cfg | 257 ++
config/setup.cfg | 311 +++
config/sounds/announcer.cfg | 37 +
config/sounds/interface.cfg | 3 +
config/sounds/package.cfg | 5 +
config/sounds/player.cfg | 7 +
config/sounds/sfx.cfg | 27 +
config/sounds/weapons.cfg | 260 ++
config/stdlib.cfg | 37 +
config/stdshader.cfg | 2848 ++++++++++++++++++++
config/tips.cfg | 41 +
config/usage.cfg | 809 ++++++
config/vanities.cfg | 46 +
config/version.cfg | 23 +
config/voice.cfg | 40 +
doc/all-licenses.txt | 515 ++--
doc/announce.txt | 13 +
doc/changelog.txt | 211 +-
doc/examples/servinit.cfg | 290 +-
doc/guidelines.txt | 14 +-
doc/irc.txt | 4 +-
doc/license.txt | 6 +-
doc/man/redeclipse.6.am | 7 -
doc/media.txt | 77 +
doc/trademark.txt | 10 +-
game/fps/version.cfg | 34 -
readme.md | 1 +
readme.txt | 221 +-
redeclipse.sh | 220 +-
redeclipse_server.sh | 72 +-
src/Makefile | 657 ++++-
src/core.mk | 618 -----
src/dist.mk | 267 +-
src/dpiaware.manifest | 32 +-
src/engine/animmodel.h | 66 +-
src/engine/bih.cpp | 10 +-
src/engine/blend.cpp | 6 +-
src/engine/blob.cpp | 8 +-
src/engine/client.cpp | 49 +-
src/engine/command.cpp | 624 ++++-
src/engine/console.cpp | 219 +-
src/engine/decal.cpp | 60 +-
src/engine/dynlight.cpp | 5 +-
src/engine/engine.h | 231 +-
src/engine/explosion.h | 29 +-
src/engine/glexts.h | 293 ++
src/engine/grass.cpp | 8 +-
src/engine/iqm.h | 74 +-
src/engine/irc.cpp | 283 +-
src/engine/irc.h | 28 +-
src/engine/lensflare.h | 35 +-
src/engine/lightmap.cpp | 4 +-
src/engine/lightmap.h | 3 +-
src/engine/lightning.h | 6 +-
src/engine/main.cpp | 139 +-
src/engine/master.cpp | 129 +-
src/engine/material.cpp | 39 +-
src/engine/md5.h | 4 +-
src/engine/menus.cpp | 310 ++-
src/engine/model.h | 54 +-
src/engine/movie.cpp | 16 +-
src/engine/mpr.h | 277 +-
src/engine/octa.cpp | 5 +-
src/engine/octa.h | 23 +-
src/engine/octaedit.cpp | 232 +-
src/engine/octarender.cpp | 25 +-
src/engine/physics.cpp | 649 +++--
src/engine/pvs.cpp | 48 +-
src/engine/ragdoll.h | 45 +-
src/engine/rendergl.cpp | 187 +-
src/engine/rendermodel.cpp | 37 +-
src/engine/renderparticles.cpp | 46 +-
src/engine/rendersky.cpp | 11 +-
src/engine/rendertext.cpp | 150 +-
src/engine/renderva.cpp | 94 +-
src/engine/scale.h | 12 +-
src/engine/server.cpp | 470 ++--
src/engine/serverbrowser.cpp | 145 +-
src/engine/shader.cpp | 8 +-
src/engine/shadowmap.cpp | 2 +-
src/engine/skelmodel.h | 14 +-
src/engine/sound.cpp | 132 +-
src/engine/sound.h | 4 +-
src/engine/textedit.h | 141 +-
src/engine/texture.cpp | 288 +-
src/engine/texture.h | 222 +-
src/engine/ui.cpp | 860 ++++--
src/engine/vertmodel.h | 18 +-
src/engine/water.cpp | 120 +-
src/engine/world.cpp | 218 +-
src/engine/world.h | 4 +-
src/engine/worldio.cpp | 144 +-
src/game/ai.cpp | 1272 +++++----
src/game/ai.h | 106 +-
src/game/aiman.h | 223 +-
src/game/auth.h | 209 +-
src/game/bomber.cpp | 445 +--
src/game/bomber.h | 62 +-
src/game/bombermode.h | 201 +-
src/game/capture.cpp | 441 +--
src/game/capture.h | 50 +-
src/game/capturemode.h | 121 +-
src/game/client.cpp | 975 ++++---
src/game/compass.h | 21 +-
src/game/defend.cpp | 191 +-
src/game/defend.h | 70 +-
src/game/defendmode.h | 59 +-
src/game/duelmut.h | 235 +-
src/game/entities.cpp | 857 +++---
src/game/game.cpp | 1811 +++++++------
src/game/game.h | 874 +++---
src/game/gamemode.h | 305 +--
src/game/hud.cpp | 1480 +++++-----
src/game/physics.cpp | 623 ++---
src/game/player.h | 180 +-
src/game/playerdef.h | 58 +
src/game/projs.cpp | 759 +++---
src/game/scoreboard.cpp | 1050 +++++---
src/game/server.cpp | 2845 +++++++++++--------
src/game/teamdef.h | 129 +
src/game/vars.h | 329 ++-
src/game/waypoint.cpp | 143 +-
src/game/weapdef.h | 233 +-
src/game/weapons.cpp | 227 +-
src/game/weapons.h | 877 +++---
src/install/nix/redeclipse.appdata.xml | 24 +
src/install/nix/redeclipse.desktop.am | 26 +-
src/redeclipse.cbp | 1575 +----------
src/redeclipse.ico | Bin 90022 -> 490479 bytes
src/redeclipse.mk | 9 -
src/redeclipse.rc | 40 +-
src/scripts/check-wiki-all-result | 13 -
.../{generate-cube2font-txt => cube2font-txt} | 0
src/scripts/generate-wiki-aliases | 30 -
src/scripts/generate-wiki-all-vars-commands | 25 -
src/scripts/generate-wiki-commands | 40 -
src/scripts/generate-wiki-engine-vars | 80 -
src/scripts/generate-wiki-game-vars | 60 -
src/scripts/generate-wiki-weapon-vars | 65 -
...{update-servinit-comments => servinit-comments} | 4 -
...{update-servinit-defaults => servinit-defaults} | 0
src/scripts/wiki-common | 132 -
...enerate-wiki-contributors => wiki-contributors} | 8 +-
src/scripts/wiki-convert | 179 ++
.../{generate-wiki-guidelines => wiki-guidelines} | 0
src/semaphore.sh | 170 ++
src/semdeploy.sh | 25 +
src/shared/command.h | 110 +-
src/shared/crypto.cpp | 211 +-
src/shared/cube.h | 11 +-
src/shared/cube2font.c | 5 +-
src/shared/ents.h | 34 +-
src/shared/geom.cpp | 16 +-
src/shared/geom.h | 267 +-
src/shared/iengine.h | 86 +-
src/shared/igame.h | 26 +-
src/shared/stream.cpp | 208 +-
src/shared/tools.cpp | 20 +-
src/shared/tools.h | 277 +-
src/shared/zip.cpp | 95 +-
src/system-install.mk | 85 +-
src/version.h | 10 +
src/wiki.mk | 107 +
198 files changed, 31247 insertions(+), 14478 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