[redeclipse] 02/08: Merge tag 'upstream/1.5.8+ds1'

[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 00a43cbfbd1ebd8d0995c6a35b6802b651a44ee9
Merge: 3eed25c 4017137
Author: Markus Koschany <apo at debian.org>
Date:   Sat Jan 21 05:32:44 2017 +0100

    Merge tag 'upstream/1.5.8+ds1'
    
    Upstream version 1.5.8+ds1
    
    # gpg: Signatur vom Sa 21 Jan 2017 05:32:42 CET
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 bin/update.bat                            |  45 +++--
 bin/update.sh                             |  53 ++++--
 bin/version.txt                           |   2 +-
 config/glsl.cfg                           |  86 ++++-----
 config/menus/editing.cfg                  |  46 +++--
 config/menus/help.cfg                     |   6 +-
 config/menus/maps.cfg                     |  39 +++--
 config/menus/options.cfg                  |  50 ++++--
 config/menus/profile.cfg                  |   1 +
 config/menus/servers.cfg                  |  12 +-
 config/setup.cfg                          |   2 +-
 config/usage.cfg                          |  59 +++++--
 config/version.cfg                        |  24 +--
 doc/all-licenses.txt                      |  10 +-
 doc/guidelines.txt                        |   2 +-
 doc/license.txt                           |   6 +-
 doc/trademark.txt                         |   2 +-
 readme.txt                                |  38 ++--
 src/CMakeLists.txt                        | 142 +++++++++++++++
 src/Makefile                              | 276 +++++++++++++++--------------
 src/engine/command.cpp                    |  13 +-
 src/engine/main.cpp                       |  90 ++++++++++
 src/engine/master.cpp                     |   2 +-
 src/engine/menus.cpp                      |  10 +-
 src/engine/octaedit.cpp                   |  93 ++++++----
 src/engine/physics.cpp                    |  42 +++--
 src/engine/ragdoll.h                      |   4 +-
 src/engine/rendergl.cpp                   |   2 +-
 src/engine/renderparticles.cpp            |  23 ++-
 src/engine/rendertext.cpp                 |   3 +-
 src/engine/server.cpp                     |   4 +-
 src/engine/shader.cpp                     |  48 ++---
 src/engine/ui.cpp                         |  10 +-
 src/engine/version.h                      |   6 +-
 src/game/ai.cpp                           | 282 ++++++++++++++++++++++--------
 src/game/ai.h                             |  32 ++--
 src/game/aiman.h                          |  24 ++-
 src/game/auth.h                           |  12 +-
 src/game/bomber.cpp                       |  24 +--
 src/game/bombermode.h                     |   3 +-
 src/game/capture.cpp                      |  70 +++++---
 src/game/capture.h                        |   7 +-
 src/game/capturemode.h                    |  20 ++-
 src/game/client.cpp                       |  39 +++--
 src/game/defend.cpp                       |  18 +-
 src/game/duelmut.h                        |  21 ++-
 src/game/entities.cpp                     |   5 +-
 src/game/game.cpp                         |  75 ++++----
 src/game/game.h                           |  37 +++-
 src/game/hud.cpp                          | 130 +++++++-------
 src/game/projs.cpp                        |  32 ++--
 src/game/scoreboard.cpp                   |  27 ++-
 src/game/server.cpp                       | 222 +++++++++++++----------
 src/game/vars.h                           |  22 ++-
 src/game/weapons.cpp                      |  24 +--
 src/install/nix/redeclipse.appdata.xml.am |   2 +-
 src/install/win/redeclipse.nsi            |   4 +-
 src/semdeploy.sh                          |  38 ++--
 src/shared/geom.h                         |   1 +
 src/shared/iengine.h                      |  15 +-
 src/shared/tools.h                        |   9 +
 version.txt                               |   2 +-
 62 files changed, 1593 insertions(+), 855 deletions(-)

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