[redeclipse] 02/05: Merge tag 'upstream/1.5.6'

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository redeclipse.

commit 87b284f0529812f77cce6169324f29a578201b3b
Merge: 9632e58 19b0890
Author: Markus Koschany <apo at debian.org>
Date:   Sat Sep 24 20:43:01 2016 +0200

    Merge tag 'upstream/1.5.6'
    
    Upstream version 1.5.6
    
    # gpg: Signature made Sat 24 Sep 2016 20:42:58 CEST
    # gpg:                using RSA key 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/ISSUE_TEMPLATE.md      |  16 +-
 bin/version.txt                |   2 +-
 config/fonts/emphasis.cfg      |   2 +-
 config/keymap.cfg              |   9 +
 config/menus/editing.cfg       | 304 +++++++----------------
 config/menus/game.cfg          |   2 +-
 config/menus/glue.cfg          | 240 +++++++++---------
 config/menus/help.cfg          |  95 ++++---
 config/menus/main.cfg          |   8 +-
 config/menus/maps.cfg          | 105 ++++----
 config/menus/options.cfg       | 551 +++++++++++++++++++++++------------------
 config/menus/profile.cfg       | 107 +++++---
 config/menus/servers.cfg       |  38 +--
 config/menus/vars.cfg          |  39 ++-
 config/setup.cfg               |  24 +-
 config/usage.cfg               |  72 ++++--
 sql/stats/create.sql           |   3 +-
 src/engine/client.cpp          |  12 +-
 src/engine/command.cpp         |   1 +
 src/engine/decal.cpp           |   2 +
 src/engine/irc.cpp             |  12 +-
 src/engine/main.cpp            |   8 +-
 src/engine/master.cpp          |   2 +-
 src/engine/movie.cpp           |   2 +-
 src/engine/rendergl.cpp        |   2 +-
 src/engine/renderparticles.cpp |   6 +-
 src/engine/rendersky.cpp       |   3 +-
 src/engine/rendertext.cpp      |  12 +-
 src/engine/server.cpp          |  14 +-
 src/engine/sound.cpp           |   4 +-
 src/engine/ui.cpp              |   4 +-
 src/engine/version.h           |   4 +-
 src/engine/worldio.cpp         |   7 +-
 src/game/ai.cpp                |   8 +-
 src/game/ai.h                  |   1 +
 src/game/auth.h                |   1 +
 src/game/client.cpp            |  48 ++--
 src/game/entities.cpp          |   2 +-
 src/game/game.cpp              |  21 +-
 src/game/game.h                |  24 +-
 src/game/hud.cpp               |  40 ++-
 src/game/physics.cpp           |  32 +--
 src/game/projs.cpp             |  12 +-
 src/game/scoreboard.cpp        |  10 +-
 src/game/server.cpp            | 125 ++++++----
 src/game/vars.h                |   2 +-
 src/game/weapons.cpp           |  34 ++-
 src/game/weapons.h             |   8 +-
 src/install/win/redeclipse.nsi |   4 +-
 src/semdeploy.sh               |  43 ++--
 src/shared/geom.h              |   5 +-
 src/shared/iengine.h           |   7 +-
 src/shared/igame.h             |   1 +
 version.txt                    |   2 +-
 54 files changed, 1147 insertions(+), 995 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git