[redeclipse] 04/09: Merge tag 'upstream/1.5.2+ds1'

[Martin Werner]

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

arand-guest pushed a commit to branch master
in repository redeclipse.

commit 0462041bc5d191d36f7b2bf638dc6bd35616046a
Merge: eaf8810 fcab7e7
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Sat Jun 20 15:31:50 2015 +0200

    Merge tag 'upstream/1.5.2+ds1'
    
    Upstream version 1.5.2+ds1
    
    # gpg: Signature made Sat 20 Jun 2015 15:31:50 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>"

 .gitattributes                                     |   16 +
 .gitignore                                         |   45 +
 .gitmodules                                        |    3 +
 bin/update.bat                                     |  236 +++
 bin/update.sh                                      |  401 ++++
 config/compass.cfg                                 |   47 +
 config/map/default.cfg                             |    2 +-
 config/menus/editing.cfg                           |    4 +-
 config/menus/maps.cfg                              |    6 +-
 config/menus/options.cfg                           |  105 +-
 config/menus/profile.cfg                           |   83 +-
 config/setup.cfg                                   |    2 +-
 config/usage.cfg                                   |   79 +-
 config/version.cfg                                 |    2 +-
 doc/all-licenses.txt                               |  146 +-
 doc/changelog.txt                                  |   61 +-
 doc/examples/servinit.cfg                          |    2 +
 redeclipse.bat                                     |   95 +
 redeclipse.sh                                      |   33 +-
 redeclipse_server.bat                              |   11 +
 src/Makefile                                       |   18 +-
 src/dist.mk                                        |  100 +-
 src/engine/animmodel.h                             |    5 +-
 src/engine/client.cpp                              |   15 +-
 src/engine/command.cpp                             |   25 +-
 src/engine/console.cpp                             |    7 +-
 src/engine/decal.cpp                               |    4 +-
 src/engine/engine.h                                |    4 +-
 src/engine/main.cpp                                |    2 +-
 src/engine/master.cpp                              |   11 +-
 src/engine/renderparticles.cpp                     |    8 +-
 src/engine/renderva.cpp                            |    9 +
 src/engine/server.cpp                              |   26 +-
 src/engine/sound.cpp                               |   18 +-
 src/engine/sound.h                                 |    2 +-
 src/engine/textedit.h                              |    8 +-
 src/engine/ui.cpp                                  |    8 +-
 src/engine/worldio.cpp                             |    2 +-
 src/game/ai.cpp                                    |   55 +-
 src/game/aiman.h                                   |    2 +-
 src/game/auth.h                                    |    6 +-
 src/game/client.cpp                                |    8 +-
 src/game/defend.cpp                                |    7 +-
 src/game/game.cpp                                  |   34 +-
 src/game/game.h                                    |   12 +-
 src/game/gamemode.h                                |   14 +-
 src/game/hud.cpp                                   |   34 +-
 src/game/physics.cpp                               |    6 +-
 src/game/projs.cpp                                 |   40 +-
 src/game/scoreboard.cpp                            |   42 +-
 src/game/server.cpp                                |  109 +-
 src/game/vars.h                                    |    8 +-
 src/game/weapons.cpp                               |   31 +-
 src/game/weapons.h                                 |   58 +-
 src/install/nix/redeclipse.appdata.xml             |   24 -
 src/install/nix/redeclipse.appdata.xml.am          |   40 +
 src/install/win/finish.bmp                         |  Bin 0 -> 206038 bytes
 src/install/win/header.bmp                         |  Bin 0 -> 34254 bytes
 src/install/win/install.mpi                        | 2109 ++++++++++++++++++++
 src/install/win/redeclipse.nsi                     |  152 ++
 src/osxbuild.sh                                    |   16 +
 src/semaphore.sh                                   |   45 +-
 src/semdeploy.sh                                   |    3 +-
 src/shared/cube2font.c                             |    2 +-
 src/shared/geom.h                                  |    2 +-
 src/shared/stream.cpp                              |   21 +-
 src/shared/tools.h                                 |    1 +
 src/system-install.mk                              |   50 +-
 src/version.h                                      |    4 +-
 src/xcode/ConsoleView.h                            |   25 +
 src/xcode/ConsoleView.m                            |  120 ++
 src/xcode/English.lproj/InfoPlist.strings          |  Bin 0 -> 540 bytes
 src/xcode/English.lproj/Localizable.strings        |   26 +
 src/xcode/English.lproj/MainMenu.nib/classes.nib   |   86 +
 src/xcode/English.lproj/MainMenu.nib/info.nib      |   21 +
 .../English.lproj/MainMenu.nib/keyedobjects.nib    |  Bin 0 -> 45980 bytes
 src/xcode/SDLMain.h                                |   16 +
 src/xcode/SDLMain.m                                |  381 ++++
 src/xcode/macutils.mm                              |  107 +
 src/xcode/main.m                                   |    6 +
 src/xcode/redeclipse-Info.plist                    |   30 +
 src/xcode/redeclipse.icns                          |  Bin 0 -> 35042 bytes
 src/xcode/redeclipse.xcodeproj/project.pbxproj     |  953 +++++++++
 83 files changed, 5898 insertions(+), 459 deletions(-)

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