[spring] 03/12: Merge tag 'upstream/99.0+dfsg'

Markus Koschany apo-guest at moszumanska.debian.org
Mon Jul 6 19:09:59 UTC 2015


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

apo-guest pushed a commit to branch master
in repository spring.

commit 5c43876a20be33f2301877a1588409284737b872
Merge: bb1a989 17e40f0
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Jul 6 00:36:06 2015 +0200

    Merge tag 'upstream/99.0+dfsg'
    
    Upstream version 99.0+dfsg
    
    # gpg: Signature made Mon 06 Jul 2015 00:35:57 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 .mailmap                                           |   34 +-
 .travis.yml                                        |   44 +-
 AI/CMakeLists.txt                                  |    2 -
 AI/Interfaces/Java/CMakeLists.txt                  |  339 +--
 AI/Interfaces/Java/bin/jni_wrappCallback.awk       |   41 +-
 AI/Interfaces/Java/src/main/native/JavaBridge.c    |   18 +-
 AI/Skirmish/AAI/AAIBrain.cpp                       |   10 +-
 AI/Skirmish/AAI/AAIBuildTable.cpp                  |    4 +-
 AI/Skirmish/AAI/AAIExecute.cpp                     |   19 +-
 AI/Skirmish/AAI/aidef.h                            |   16 +-
 AI/Skirmish/E323AI/headers/Defines.h               |    2 +-
 .../HughAI/src-ai/hughai/unitdata/BuildTable.java  |    2 +-
 AI/Skirmish/KAIK/BuildUp.cpp                       |    2 +-
 AI/Skirmish/KAIK/CommandTracker.h                  |    4 +-
 AI/Skirmish/KAIK/DGunController.cpp                |    2 +-
 AI/Skirmish/KAIK/Defines.h                         |    2 -
 AI/Skirmish/KAIK/EconomyTracker.cpp                |    7 +-
 AI/Skirmish/KAIK/KAIK.cpp                          |   19 +-
 AI/Skirmish/KAIK/MetalMap.cpp                      |    2 -
 AI/Skirmish/KAIK/MetalMap.h                        |    2 +-
 AI/Skirmish/KAIK/MicroPather.cpp                   |    3 +-
 AI/Skirmish/KAIK/Unit.cpp                          |   14 +-
 AI/Skirmish/KAIK/Unit.h                            |    2 +-
 AI/Skirmish/KAIK/UnitHandler.cpp                   |    4 +-
 AI/Skirmish/Shard/.gitmodules                      |    3 +
 AI/Skirmish/Shard/data/ai/BA/attackerbehaviour.lua |    4 +-
 AI/Skirmish/Shard/data/ai/BA/counthandler.lua      |    4 +-
 AI/Skirmish/Shard/data/ai/BA/damagehandler.lua     |    2 +-
 .../Shard/data/ai/BA/mexupgradebehaviour.lua       |    4 +-
 AI/Skirmish/Shard/data/ai/BA/targethandler.lua     |    4 +-
 AI/Skirmish/Shard/data/ai/BA/wardbehaviour.lua     |    2 +-
 AI/Skirmish/Shard/data/ai/EvoRTS/attackers.lua     |    7 +-
 AI/Skirmish/Shard/data/ai/EvoRTS/behaviours.lua    |   36 +-
 .../data/ai/EvoRTS/missingfactorybehaviour.lua     |    5 +-
 AI/Skirmish/Shard/data/ai/EvoRTS/taskqueues.lua    |  392 +---
 AI/Skirmish/Shard/data/ai/ai.lua                   |    5 +-
 AI/Skirmish/Shard/data/ai/behaviour.lua            |    2 +-
 AI/Skirmish/Shard/data/ai/preload/aibase.lua       |    2 +-
 AI/Skirmish/Shard/data/ai/unit.lua                 |    4 +-
 AI/Skirmish/Shard/data/ai/unithandler.lua          |    4 +-
 AI/Skirmish/Shard/src/API/api.i                    |    6 +-
 AI/Skirmish/Shard/src/API/api_wrap.cpp             | 2190 +++++++++++++++++++-
 AI/Skirmish/Shard/src/API/boost_shared_ptr.i       |    7 +
 AI/Skirmish/Shard/src/API/interfaces/IAI.h         |    2 +-
 AI/Skirmish/Shard/src/API/interfaces/IDamage.h     |   23 +
 AI/Skirmish/Shard/src/API/interfaces/api.h         |    2 +
 AI/Skirmish/Shard/src/API/spring/SpringDamage.cpp  |   67 +
 AI/Skirmish/Shard/src/API/spring/SpringDamage.h    |   33 +
 AI/Skirmish/Shard/src/API/spring/spring_api.h      |    2 +-
 AI/Skirmish/Shard/src/API/swig.h                   |  595 ++++--
 AI/Skirmish/Shard/src/CppTestAI.cpp                |    4 +-
 AI/Skirmish/Shard/src/TestAI.cpp                   |    7 +-
 AI/Skirmish/Shard/src/TestAI.h                     |    3 +-
 AI/Wrappers/CUtils/bin/common.awk                  |   17 +-
 AI/Wrappers/Cpp/CMakeLists.txt                     |    5 +-
 AI/Wrappers/Cpp/bin/wrappCallback.awk              |   11 +-
 AI/Wrappers/JavaOO/CMakeLists.txt                  |   45 +-
 AI/Wrappers/JavaOO/bin/wrappCallback.awk           |   11 +-
 AI/Wrappers/LegacyCpp/AIAICallback.cpp             |   25 +-
 AI/Wrappers/LegacyCpp/AIAICallback.h               |    4 +-
 AI/Wrappers/LegacyCpp/DamageArray.cpp              |    4 +-
 AI/Wrappers/LegacyCpp/DamageArray.h                |    2 +-
 AI/Wrappers/LegacyCpp/IAICallback.h                |    6 +-
 AI/Wrappers/LegacyCpp/MoveData.cpp                 |    7 +-
 AI/Wrappers/LegacyCpp/MoveData.h                   |    4 +-
 AUTHORS                                            |   29 +-
 CMakeLists.txt                                     |   41 +-
 Doxyfile                                           |   18 +-
 VERSION                                            |    2 +-
 buildbot/master/.gitignore                         |    6 +
 buildbot/master/cleanup.sh                         |    2 +-
 buildbot/master/master.cfg                         |   50 +-
 buildbot/master/passwords.py.template              |   11 +
 buildbot/master/public_html/default.css            |  109 +-
 buildbot/master/public_html/robots.txt             |    1 -
 buildbot/master/templates/forms.html               |  263 ---
 buildbot/slave/create-build-dirs.sh                |    2 +
 buildbot/slave/linux/create_linux_static_bundle.sh |   11 +-
 buildbot/slave/prepare.sh                          |    2 +-
 buildbot/slave/rsync.sh                            |    4 +-
 buildbot/slave/validation/tests-install.sh         |    2 +
 buildbot/slave/validation/tests-prepare.sh         |    5 +-
 buildbot/slave/wiki/update_springsettings_page.sh  |    2 +-
 buildbot/slave/wiki/update_weapondefs_page.sh      |    2 +-
 buildbot/slave/win/make_installer.sh               |   12 +-
 .../stacktrace_translator/stacktrace_translator.py |    2 +-
 buildbot/version_list/list.php                     |    3 +
 cont/CMakeLists.txt                                |    1 +
 cont/LuaUI/widgets.lua                             |    8 +
 cont/base/springcontent/CMakeLists.txt             |    4 +
 cont/base/springcontent/LuaGadgets/callins.lua     |    1 +
 cont/base/springcontent/LuaGadgets/gadgets.lua     |   28 +-
 .../springcontent/LuaIntro/Addons/loadprogress.lua |   14 +-
 .../springcontent/shaders/GLSL/GrassVertProg.glsl  |    2 +
 .../springcontent/shaders/GLSL/SMFFragProg.glsl    |   21 +-
 .../springcontent/shaders/GLSL/bumpWaterFS.glsl    |   14 +-
 .../base/springcontent/shaders/GLSL/infoHeight.lua |   54 +
 cont/base/springcontent/shaders/GLSL/infoLOS.lua   |   89 +
 cont/base/springcontent/shaders/GLSL/infoMetal.lua |   82 +
 cont/base/springcontent/shaders/GLSL/infoPath.lua  |   85 +
 cont/cmdcolors.txt                                 |   79 +-
 cont/springrc-template-headless.txt                |   92 -
 doc/StartScriptFormat.txt                          |    3 +-
 doc/changelog.txt                                  |  187 +-
 doc/manpages/spring.6.txt                          |   20 +-
 doc/releasechecklist.txt                           |   45 +-
 doc/uikeys.txt                                     |   32 +-
 installer/make_installer.sh                        |    1 -
 installer/sections/deprecated.nsh                  |    5 +
 installer/sections/sectiondesc.nsh                 |    2 -
 installer/sections/setupSections.nsh               |    1 -
 installer/sections/shortcuts_desktop.nsh           |    3 -
 installer/sections/shortcuts_startMenu.nsh         |    3 -
 installer/sections/zeroK.nsh                       |   15 -
 installer/spring.nsi                               |    7 -
 rts/CMakeLists.txt                                 |   27 +-
 rts/ExternalAI/AICallback.cpp                      |   52 +-
 rts/ExternalAI/AICheats.cpp                        |   12 +-
 rts/ExternalAI/AIInterfaceLibrary.cpp              |    2 +-
 rts/ExternalAI/EngineOutHandler.cpp                |   36 +-
 rts/ExternalAI/EngineOutHandler.h                  |    5 +-
 rts/ExternalAI/IAILibraryManager.cpp               |   16 +-
 rts/ExternalAI/IAILibraryManager.h                 |    2 +-
 rts/ExternalAI/Interface/AISCommands.h             |    8 +-
 rts/ExternalAI/Interface/SSkirmishAICallback.h     |   47 +-
 rts/ExternalAI/Interface/aidefines.h               |    3 +
 rts/ExternalAI/SAIInterfaceCallbackImpl.cpp        |    2 +-
 rts/ExternalAI/SSkirmishAICallbackImpl.cpp         |  307 ++-
 rts/ExternalAI/SSkirmishAICallbackImpl.h           |   52 +-
 rts/ExternalAI/SkirmishAIData.cpp                  |    2 +-
 rts/ExternalAI/SkirmishAIHandler.cpp               |  118 +-
 rts/ExternalAI/SkirmishAIHandler.h                 |   28 +-
 rts/Game/Benchmark.cpp                             |   36 +-
 rts/Game/Benchmark.h                               |   27 +-
 rts/Game/CMakeLists.txt                            |    6 +-
 rts/Game/Camera.cpp                                |  143 +-
 rts/Game/Camera.h                                  |  101 +-
 rts/Game/Camera/CameraController.cpp               |    4 +-
 rts/Game/Camera/CameraController.h                 |   10 +-
 rts/Game/Camera/FPSController.cpp                  |   37 +-
 rts/Game/Camera/FPSController.h                    |    7 +-
 rts/Game/Camera/FreeController.cpp                 |   85 +-
 rts/Game/Camera/FreeController.h                   |    9 +-
 rts/Game/Camera/OrbitController.cpp                |  290 ---
 rts/Game/Camera/OrbitController.h                  |   60 -
 rts/Game/Camera/OverheadController.cpp             |   59 +-
 rts/Game/Camera/OverheadController.h               |   11 +-
 rts/Game/Camera/OverviewController.cpp             |    7 +-
 rts/Game/Camera/OverviewController.h               |    4 +-
 rts/Game/Camera/RotOverheadController.cpp          |   45 +-
 rts/Game/Camera/RotOverheadController.h            |    7 +-
 rts/Game/Camera/SmoothController.cpp               |  288 ---
 rts/Game/Camera/SmoothController.h                 |   70 -
 rts/Game/Camera/SpringController.cpp               |  286 +++
 .../Camera/{TWController.h => SpringController.h}  |   28 +-
 rts/Game/Camera/TWController.cpp                   |  136 --
 rts/Game/CameraHandler.cpp                         |  109 +-
 rts/Game/CameraHandler.h                           |   10 +-
 rts/Game/ClientSetup.cpp                           |    2 +-
 rts/Game/Console.cpp                               |   41 +-
 rts/Game/Console.h                                 |   12 +-
 rts/Game/FPSUnitController.cpp                     |    4 +-
 rts/Game/GUI/PlayerRosterDrawer.cpp                |    9 +-
 rts/Game/Game.cpp                                  |  813 +++++---
 rts/Game/Game.h                                    |   22 +-
 rts/Game/GameData.cpp                              |    5 +-
 rts/Game/GameData.h                                |    7 +-
 rts/Game/GameHelper.cpp                            |  244 +--
 rts/Game/GameHelper.h                              |    2 +-
 rts/Game/GameJobDispatcher.h                       |   74 +
 rts/Game/GameSetup.cpp                             |  184 +-
 rts/Game/GameSetup.h                               |  100 +-
 rts/Game/GameVersion.cpp                           |   15 +-
 rts/Game/GameVersion.h                             |    6 +-
 rts/Game/GlobalUnsynced.cpp                        |   35 +-
 rts/Game/GlobalUnsynced.h                          |    6 +-
 rts/Game/InMapDraw.cpp                             |   23 +-
 rts/Game/InMapDrawModel.cpp                        |   10 +-
 rts/Game/LoadScreen.cpp                            |   19 +-
 rts/Game/Players/Player.cpp                        |    2 +-
 rts/Game/Players/PlayerHandler.cpp                 |   21 +-
 rts/Game/Players/PlayerHandler.h                   |    1 +
 rts/Game/PreGame.cpp                               |  306 +--
 rts/Game/PreGame.h                                 |   18 +-
 rts/Game/SelectedUnitsAI.cpp                       |    2 +-
 rts/Game/SelectedUnitsHandler.cpp                  |   54 +-
 rts/Game/SyncedGameCommands.cpp                    |   13 +-
 rts/Game/TraceRay.cpp                              |  117 +-
 rts/Game/UI/GameInfo.cpp                           |    7 +-
 rts/Game/UI/GameInfo.h                             |    2 -
 rts/{Sim/Units => Game/UI}/Groups/Group.cpp        |    0
 rts/{Sim/Units => Game/UI}/Groups/Group.h          |    0
 rts/{Sim/Units => Game/UI}/Groups/GroupHandler.cpp |    5 +-
 rts/{Sim/Units => Game/UI}/Groups/GroupHandler.h   |    8 -
 rts/Game/UI/GuiHandler.cpp                         |   42 +-
 rts/Game/UI/HwMouseCursor.cpp                      |   15 +-
 rts/Game/UI/KeyBindings.cpp                        |   28 +-
 rts/Game/UI/KeyCodes.cpp                           |    6 +-
 rts/Game/UI/MiniMap.cpp                            |   72 +-
 rts/Game/UI/MouseHandler.cpp                       |   58 +-
 rts/Game/UI/ProfileDrawer.cpp                      |    4 +-
 rts/Game/UI/QuitBox.cpp                            |  413 ++--
 rts/Game/UI/QuitBox.h                              |   12 +-
 rts/Game/UI/ResourceBar.cpp                        |   43 +-
 rts/Game/UI/SelectionKeyHandler.cpp                |   18 +-
 rts/Game/UI/ShareBox.cpp                           |   10 +-
 rts/Game/UI/StartPosSelecter.cpp                   |   15 +-
 rts/Game/UI/TooltipConsole.cpp                     |  208 +-
 rts/Game/UI/TooltipConsole.h                       |   27 +-
 rts/Game/UI/UnitTracker.cpp                        |   43 +-
 rts/Game/UI/UnitTracker.h                          |    3 +-
 rts/Game/UnsyncedGameCommands.cpp                  |  375 ++--
 rts/Game/WordCompletion.cpp                        |   34 +-
 rts/Game/WordCompletion.h                          |    1 -
 rts/Lua/LuaConstCOB.cpp                            |    2 +-
 rts/Lua/LuaConstGame.cpp                           |   40 +-
 rts/Lua/LuaContextData.h                           |    4 +-
 rts/Lua/LuaDefs.h                                  |   33 +
 rts/Lua/LuaFBOs.cpp                                |    2 +
 rts/Lua/LuaFeatureDefs.cpp                         |   65 +-
 rts/Lua/LuaFeatureDefs.h                           |    6 +-
 rts/Lua/LuaFonts.cpp                               |    1 +
 rts/Lua/LuaGaia.cpp                                |   27 +-
 rts/Lua/LuaHandle.cpp                              |   26 +-
 rts/Lua/LuaHandle.h                                |    2 +
 rts/Lua/LuaHandleSynced.cpp                        |   17 +-
 rts/Lua/LuaIO.cpp                                  |    6 +-
 rts/Lua/LuaIO.h                                    |    2 +-
 rts/Lua/LuaIntro.cpp                               |   28 +-
 rts/Lua/LuaOpenGL.cpp                              |   79 +-
 rts/Lua/LuaOpenGLUtils.cpp                         |  146 +-
 rts/Lua/LuaOpenGLUtils.h                           |    1 +
 rts/Lua/LuaPathFinder.cpp                          |   24 +-
 rts/Lua/LuaRules.cpp                               |   38 +-
 rts/Lua/LuaSyncedCtrl.cpp                          |  244 ++-
 rts/Lua/LuaSyncedCtrl.h                            |    2 +
 rts/Lua/LuaSyncedMoveCtrl.cpp                      |   12 +-
 rts/Lua/LuaSyncedRead.cpp                          |  252 ++-
 rts/Lua/LuaSyncedRead.h                            |    5 +
 rts/Lua/LuaUI.cpp                                  |   28 +-
 rts/Lua/LuaUnitDefs.cpp                            |   66 +-
 rts/Lua/LuaUnitDefs.h                              |    6 +-
 rts/Lua/LuaUnsyncedCtrl.cpp                        |  226 +-
 rts/Lua/LuaUnsyncedCtrl.h                          |   10 +-
 rts/Lua/LuaUnsyncedRead.cpp                        |  180 +-
 rts/Lua/LuaUnsyncedRead.h                          |    4 +-
 rts/Lua/LuaUtils.h                                 |   35 +
 rts/Lua/LuaWeaponDefs.cpp                          |   59 +-
 rts/Lua/LuaWeaponDefs.h                            |    4 +-
 rts/Map/BaseGroundDrawer.cpp                       |  479 +----
 rts/Map/BaseGroundDrawer.h                         |   69 +-
 rts/Map/BasicMapDamage.cpp                         |   33 +-
 rts/Map/Ground.cpp                                 |  169 +-
 rts/Map/Ground.h                                   |    7 +-
 rts/Map/HeightLinePalette.cpp                      |   87 +-
 rts/Map/HeightLinePalette.h                        |   17 +-
 rts/Map/HeightMapTexture.cpp                       |    4 +-
 rts/Map/MapInfo.cpp                                |   43 +-
 rts/Map/MapInfo.h                                  |    9 +-
 rts/Map/MapParser.cpp                              |    1 +
 rts/Map/MetalMap.cpp                               |    3 +
 rts/Map/ReadMap.cpp                                |  206 +-
 rts/Map/ReadMap.h                                  |   97 +-
 rts/Map/SM3/SM3Map.cpp                             |   20 +-
 rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp            |    6 +-
 rts/Map/SMF/ROAM/Patch.cpp                         |   57 +-
 rts/Map/SMF/ROAM/RoamMeshDrawer.cpp                |    6 +-
 rts/Map/SMF/SMFFormat.h                            |   97 +-
 rts/Map/SMF/SMFGroundDrawer.cpp                    |    9 +-
 rts/Map/SMF/SMFGroundTextures.cpp                  |   23 +-
 rts/Map/SMF/SMFGroundTextures.h                    |    2 +-
 rts/Map/SMF/SMFMapFile.cpp                         |   91 +-
 rts/Map/SMF/SMFMapFile.h                           |    7 +-
 rts/Map/SMF/SMFReadMap.cpp                         |  147 +-
 rts/Map/SMF/SMFReadMap.h                           |    1 +
 rts/Map/SMF/SMFRenderState.cpp                     |   35 +-
 rts/Menu/SelectMenu.cpp                            |   30 +-
 rts/Net/GameParticipant.cpp                        |   13 +-
 rts/Net/GameServer.cpp                             |  196 +-
 rts/Net/GameServer.h                               |   25 +-
 rts/Net/NetCommands.cpp                            |   65 +-
 rts/Net/Protocol/BaseNetProtocol.cpp               |    4 -
 rts/Net/Protocol/BaseNetProtocol.h                 |    5 +-
 rts/Net/Protocol/NetProtocol.cpp                   |   32 +-
 rts/Net/Protocol/NetProtocol.h                     |    4 +-
 rts/Rendering/CMakeLists.txt                       |   14 +
 rts/Rendering/CommandDrawer.cpp                    |   68 +-
 rts/Rendering/CommandDrawer.h                      |   11 +
 rts/Rendering/DebugColVolDrawer.cpp                |   74 +-
 rts/Rendering/DefaultPathDrawer.cpp                |   91 +-
 rts/Rendering/Env/AdvSky.cpp                       |    8 +-
 rts/Rendering/Env/AdvTreeDrawer.cpp                |   70 +-
 rts/Rendering/Env/AdvWater.cpp                     |    6 +-
 rts/Rendering/Env/BasicSky.cpp                     |   34 +-
 rts/Rendering/Env/BasicSky.h                       |    1 -
 rts/Rendering/Env/BasicTreeDrawer.cpp              |  388 ++--
 rts/Rendering/Env/BasicWater.cpp                   |    8 +-
 rts/Rendering/Env/BumpWater.cpp                    |   82 +-
 rts/Rendering/Env/CubeMapHandler.cpp               |    5 +-
 rts/Rendering/Env/Decals/DecalsDrawerGL4.cpp       |   17 +-
 rts/Rendering/Env/Decals/GroundDecalHandler.cpp    |   37 +-
 rts/Rendering/Env/DynWater.cpp                     |   36 +-
 rts/Rendering/Env/GrassDrawer.cpp                  |  354 ++--
 rts/Rendering/Env/IGroundDecalDrawer.cpp           |    2 +-
 rts/Rendering/Env/ISky.cpp                         |    2 +-
 rts/Rendering/Env/ITreeDrawer.cpp                  |    3 +-
 rts/Rendering/Env/IWater.cpp                       |    1 +
 rts/Rendering/Env/RefractWater.cpp                 |    4 +-
 rts/Rendering/FarTextureHandler.cpp                |    6 +-
 rts/Rendering/FeatureDrawer.cpp                    |  127 +-
 rts/Rendering/FeatureDrawer.h                      |   13 +-
 rts/Rendering/Fonts/CFontTexture.cpp               |    3 +-
 rts/Rendering/GL/VBO.cpp                           |    7 +-
 rts/Rendering/GL/glExtra.cpp                       |    6 +-
 rts/Rendering/GL/myGL.cpp                          |    5 +-
 rts/Rendering/GL/myGL.h                            |   16 +-
 rts/Rendering/GlobalRendering.cpp                  |   41 +-
 rts/Rendering/GlobalRendering.h                    |    9 +-
 rts/Rendering/GroundFlash.cpp                      |    6 +-
 rts/Rendering/HUDDrawer.cpp                        |   28 +-
 rts/Rendering/IPathDrawer.cpp                      |   18 +-
 rts/Rendering/InMapDrawView.cpp                    |    4 +
 .../Map/InfoTexture/IInfoTextureHandler.cpp        |   25 +
 .../Map/InfoTexture/IInfoTextureHandler.h          |   41 +
 rts/Rendering/Map/InfoTexture/InfoTexture.cpp      |   21 +
 rts/Rendering/Map/InfoTexture/InfoTexture.h        |   33 +
 .../Legacy/LegacyInfoTextureHandler.cpp            |  455 ++++
 .../InfoTexture/Legacy/LegacyInfoTextureHandler.h  |   71 +
 rts/Rendering/Map/InfoTexture/Modern/AirLos.cpp    |  171 ++
 rts/Rendering/Map/InfoTexture/Modern/AirLos.h      |   34 +
 rts/Rendering/Map/InfoTexture/Modern/Combiner.cpp  |  139 ++
 rts/Rendering/Map/InfoTexture/Modern/Combiner.h    |   40 +
 rts/Rendering/Map/InfoTexture/Modern/Height.cpp    |  170 ++
 rts/Rendering/Map/InfoTexture/Modern/Height.h      |   48 +
 .../Map/InfoTexture/Modern/InfoTextureHandler.cpp  |  123 ++
 .../Map/InfoTexture/Modern/InfoTextureHandler.h    |   49 +
 rts/Rendering/Map/InfoTexture/Modern/Los.cpp       |  171 ++
 rts/Rendering/Map/InfoTexture/Modern/Los.h         |   34 +
 rts/Rendering/Map/InfoTexture/Modern/Metal.cpp     |   50 +
 rts/Rendering/Map/InfoTexture/Modern/Metal.h       |   34 +
 .../Map/InfoTexture/Modern/MetalExtraction.cpp     |  121 ++
 .../Map/InfoTexture/Modern/MetalExtraction.h       |   30 +
 rts/Rendering/Map/InfoTexture/Modern/Path.cpp      |  263 +++
 rts/Rendering/Map/InfoTexture/Modern/Path.h        |   44 +
 .../Map/InfoTexture/Modern/PboInfoTexture.cpp      |   17 +
 .../Map/InfoTexture/Modern/PboInfoTexture.h        |   26 +
 rts/Rendering/Map/InfoTexture/Modern/Radar.cpp     |   69 +
 rts/Rendering/Map/InfoTexture/Modern/Radar.h       |   19 +
 rts/Rendering/Models/3DOParser.cpp                 |   48 +-
 rts/Rendering/Models/AssParser.cpp                 |    2 +-
 rts/Rendering/Models/ModelDrawer.cpp               |    1 +
 rts/Rendering/Models/WorldObjectModelRenderer.cpp  |  103 +-
 rts/Rendering/Models/WorldObjectModelRenderer.h    |    6 +-
 rts/Rendering/ProjectileDrawer.cpp                 |  271 +--
 rts/Rendering/ProjectileDrawer.h                   |   35 +-
 rts/Rendering/QTPFSPathDrawer.cpp                  |   38 +-
 rts/Rendering/Shaders/GLSLCopyState.cpp            |   30 +-
 rts/Rendering/Shaders/LuaShaderContainer.cpp       |  212 ++
 rts/Rendering/Shaders/LuaShaderContainer.h         |   14 +
 rts/Rendering/Shaders/Shader.cpp                   |  350 ++--
 rts/Rendering/Shaders/Shader.h                     |  252 +--
 rts/Rendering/Shaders/ShaderHandler.cpp            |   85 +-
 rts/Rendering/Shaders/ShaderHandler.h              |   64 +-
 rts/Rendering/Shaders/ShaderStates.cpp             |    4 +-
 rts/Rendering/Shaders/ShaderStates.h               |   69 +-
 rts/Rendering/ShadowHandler.cpp                    |   94 +-
 rts/Rendering/ShadowHandler.h                      |   10 +-
 rts/Rendering/TeamHighlight.cpp                    |    6 +-
 rts/Rendering/Textures/Bitmap.cpp                  |   56 +-
 rts/Rendering/Textures/Bitmap.h                    |    1 +
 rts/Rendering/Textures/NamedTextures.cpp           |   49 +-
 rts/Rendering/Textures/S3OTextureHandler.h         |    1 -
 rts/Rendering/Textures/nv_dds.cpp                  |   34 +-
 rts/Rendering/UnitDrawer.cpp                       |  255 +--
 rts/Rendering/UnitDrawer.h                         |   14 +-
 rts/Rendering/VerticalSync.cpp                     |    2 +-
 rts/Rendering/WorldDrawer.cpp                      |   18 +-
 rts/Rendering/WorldDrawer.h                        |    3 +
 rts/Sim/CMakeLists.txt                             |   16 +-
 rts/Sim/Features/Feature.cpp                       |  138 +-
 rts/Sim/Features/Feature.h                         |   15 +-
 rts/Sim/Features/FeatureHandler.cpp                |   18 +-
 rts/Sim/Misc/CategoryHandler.cpp                   |   35 +-
 rts/Sim/Misc/CategoryHandler.h                     |   16 +-
 rts/Sim/Misc/CollisionHandler.cpp                  |   35 +-
 rts/Sim/Misc/CollisionHandler.h                    |   35 +-
 rts/Sim/Misc/CollisionVolume.cpp                   |   68 +-
 rts/Sim/Misc/CollisionVolume.h                     |    1 +
 rts/Sim/Misc/GeometricObjects.cpp                  |    4 +-
 rts/Sim/Misc/GlobalConstants.h                     |   34 +-
 rts/Sim/Misc/GlobalSynced.cpp                      |   91 +-
 rts/Sim/Misc/GlobalSynced.h                        |  100 +-
 rts/Sim/Misc/GroundBlockingObjectMap.cpp           |   54 +-
 rts/Sim/Misc/GroundBlockingObjectMap.h             |    1 +
 rts/Sim/Misc/InterceptHandler.cpp                  |  107 +-
 rts/Sim/Misc/InterceptHandler.h                    |   21 +-
 rts/Sim/Misc/LosHandler.cpp                        |   24 +-
 rts/Sim/Misc/LosHandler.h                          |    1 -
 rts/Sim/Misc/LosMap.cpp                            |   16 +-
 rts/Sim/Misc/ModInfo.cpp                           |   82 +-
 rts/Sim/Misc/ModInfo.h                             |   69 +-
 rts/Sim/Misc/NanoPieceCache.cpp                    |    1 -
 rts/Sim/Misc/QuadField.cpp                         |  787 +++----
 rts/Sim/Misc/QuadField.h                           |   69 +-
 rts/Sim/Misc/RadarHandler.cpp                      |    4 +-
 rts/Sim/Misc/Resource.cpp                          |   42 +-
 rts/Sim/Misc/Resource.h                            |  110 +-
 rts/Sim/Misc/ResourceHandler.cpp                   |  114 +-
 rts/Sim/Misc/ResourceHandler.h                     |   20 +-
 rts/Sim/Misc/ResourceMapAnalyzer.cpp               |    8 +-
 rts/Sim/Misc/SideParser.cpp                        |   10 -
 rts/Sim/Misc/SideParser.h                          |    3 -
 rts/Sim/Misc/SimObjectIDPool.cpp                   |    7 +-
 rts/Sim/Misc/SimObjectIDPool.h                     |    5 +-
 rts/Sim/Misc/Team.cpp                              |  274 ++-
 rts/Sim/Misc/Team.h                                |   52 +-
 rts/Sim/Misc/TeamHandler.cpp                       |   21 +-
 rts/Sim/Misc/TeamHandler.h                         |   14 +-
 rts/Sim/Misc/TeamStatistics.h                      |    2 +-
 rts/Sim/Misc/Wind.cpp                              |   25 +-
 rts/Sim/Misc/Wind.h                                |    1 +
 rts/Sim/MoveTypes/AAirMoveType.cpp                 |    8 +-
 rts/Sim/MoveTypes/ClassicGroundMoveType.cpp        |   31 +-
 rts/Sim/MoveTypes/GroundMoveType.cpp               |  133 +-
 rts/Sim/MoveTypes/GroundMoveType.h                 |    6 +-
 rts/Sim/MoveTypes/HoverAirMoveType.cpp             |   30 +-
 rts/Sim/MoveTypes/MoveDefHandler.cpp               |   54 +-
 rts/Sim/MoveTypes/MoveDefHandler.h                 |   10 +-
 rts/Sim/MoveTypes/MoveMath/GroundMoveMath.cpp      |   24 +-
 rts/Sim/MoveTypes/MoveMath/HoverMoveMath.cpp       |   18 +-
 rts/Sim/MoveTypes/MoveMath/MoveMath.cpp            |   58 +-
 rts/Sim/MoveTypes/MoveMath/MoveMath.h              |    6 +-
 rts/Sim/MoveTypes/MoveType.cpp                     |    2 +-
 rts/Sim/MoveTypes/StrafeAirMoveType.cpp            |   44 +-
 rts/Sim/MoveTypes/StrafeAirMoveType.h              |    2 +-
 rts/Sim/Objects/SolidObject.cpp                    |   16 +-
 rts/Sim/Objects/SolidObject.h                      |    4 +-
 rts/Sim/Objects/SolidObjectDef.cpp                 |    2 -
 rts/Sim/Objects/WorldObject.cpp                    |    3 +-
 rts/Sim/Objects/WorldObject.h                      |    6 +-
 rts/Sim/Path/Default/IPathFinder.cpp               |   15 +-
 rts/Sim/Path/Default/IPathFinder.h                 |    3 +-
 rts/Sim/Path/Default/PathCache.cpp                 |    6 +-
 rts/Sim/Path/Default/PathConstants.h               |   27 +-
 rts/Sim/Path/Default/PathDataTypes.h               |   23 +-
 rts/Sim/Path/Default/PathEstimator.cpp             |  104 +-
 rts/Sim/Path/Default/PathEstimator.h               |   14 +-
 rts/Sim/Path/Default/PathFinder.cpp                |  145 +-
 rts/Sim/Path/Default/PathFinder.h                  |    3 +-
 rts/Sim/Path/Default/PathFinderDef.h               |    7 +-
 rts/Sim/Path/Default/PathFlowMap.cpp               |   36 +-
 rts/Sim/Path/Default/PathHeatMap.cpp               |   24 +-
 rts/Sim/Path/Default/PathManager.cpp               |  343 +--
 rts/Sim/Path/Default/PathManager.h                 |   28 +-
 rts/Sim/Path/IPathManager.cpp                      |   17 +-
 rts/Sim/Path/IPathManager.h                        |    1 +
 rts/Sim/Path/QTPFS/Node.cpp                        |   65 +-
 rts/Sim/Path/QTPFS/Node.hpp                        |    6 +-
 rts/Sim/Path/QTPFS/NodeLayer.cpp                   |   40 +-
 rts/Sim/Path/QTPFS/PathDefines.hpp                 |    2 +
 rts/Sim/Path/QTPFS/PathManager.cpp                 |   23 +-
 rts/Sim/Path/QTPFS/PathSearch.cpp                  |   61 +-
 rts/Sim/Path/QTPFS/PathSearch.hpp                  |    3 +-
 rts/Sim/Projectiles/ExpGenSpawner.cpp              |    5 +
 rts/Sim/Projectiles/ExpGenSpawner.h                |    4 +-
 rts/Sim/Projectiles/ExplosionGenerator.cpp         |   75 +-
 rts/Sim/Projectiles/ExplosionGenerator.h           |   11 +-
 rts/Sim/Projectiles/FireProjectile.cpp             |   21 +-
 rts/Sim/Projectiles/FireProjectile.h               |   12 +-
 rts/Sim/Projectiles/FlareProjectile.cpp            |   14 +-
 rts/Sim/Projectiles/FlareProjectile.h              |    7 +-
 rts/Sim/Projectiles/PieceProjectile.cpp            |   36 +-
 rts/Sim/Projectiles/PieceProjectile.h              |   18 +-
 rts/Sim/Projectiles/Projectile.cpp                 |   36 +-
 rts/Sim/Projectiles/Projectile.h                   |   41 +-
 rts/Sim/Projectiles/ProjectileFunctors.cpp         |   10 +-
 rts/Sim/Projectiles/ProjectileFunctors.h           |    8 -
 rts/Sim/Projectiles/ProjectileHandler.cpp          |  509 +++--
 rts/Sim/Projectiles/ProjectileHandler.h            |  102 +-
 rts/Sim/Projectiles/ProjectileParams.h             |    2 +
 rts/Sim/Projectiles/Unsynced/BitmapMuzzleFlame.cpp |    6 +-
 rts/Sim/Projectiles/Unsynced/BitmapMuzzleFlame.h   |    8 +-
 rts/Sim/Projectiles/Unsynced/BubbleProjectile.cpp  |   13 +-
 rts/Sim/Projectiles/Unsynced/BubbleProjectile.h    |    6 +-
 rts/Sim/Projectiles/Unsynced/DirtProjectile.cpp    |   15 +-
 rts/Sim/Projectiles/Unsynced/DirtProjectile.h      |    6 +-
 .../Projectiles/Unsynced/ExploSpikeProjectile.cpp  |    5 +
 .../Projectiles/Unsynced/ExploSpikeProjectile.h    |    8 +-
 rts/Sim/Projectiles/Unsynced/FlyingPiece.cpp       |   30 +-
 rts/Sim/Projectiles/Unsynced/FlyingPiece.h         |   22 +-
 .../Unsynced/GenericParticleProjectile.cpp         |   13 +-
 .../Unsynced/GenericParticleProjectile.h           |    7 +-
 .../Projectiles/Unsynced/GeoSquareProjectile.cpp   |    5 +
 rts/Sim/Projectiles/Unsynced/GeoSquareProjectile.h |    6 +-
 rts/Sim/Projectiles/Unsynced/GfxProjectile.cpp     |   89 -
 rts/Sim/Projectiles/Unsynced/GfxProjectile.h       |   28 -
 .../Projectiles/Unsynced/HeatCloudProjectile.cpp   |   13 +-
 rts/Sim/Projectiles/Unsynced/HeatCloudProjectile.h |    6 +-
 rts/Sim/Projectiles/Unsynced/MuzzleFlame.cpp       |   27 +-
 rts/Sim/Projectiles/Unsynced/MuzzleFlame.h         |    8 +-
 rts/Sim/Projectiles/Unsynced/NanoProjectile.cpp    |   88 +
 rts/Sim/Projectiles/Unsynced/NanoProjectile.h      |   30 +
 rts/Sim/Projectiles/Unsynced/RepulseGfx.cpp        |    5 +
 rts/Sim/Projectiles/Unsynced/RepulseGfx.h          |    8 +-
 rts/Sim/Projectiles/Unsynced/ShieldProjectile.cpp  |  167 +-
 rts/Sim/Projectiles/Unsynced/ShieldProjectile.h    |   46 +-
 .../Projectiles/Unsynced/SimpleParticleSystem.cpp  |   46 +-
 .../Projectiles/Unsynced/SimpleParticleSystem.h    |    8 +-
 rts/Sim/Projectiles/Unsynced/SmokeProjectile.cpp   |    9 +-
 rts/Sim/Projectiles/Unsynced/SmokeProjectile.h     |    8 +-
 rts/Sim/Projectiles/Unsynced/SmokeProjectile2.cpp  |   13 +-
 rts/Sim/Projectiles/Unsynced/SmokeProjectile2.h    |    8 +-
 .../Projectiles/Unsynced/SmokeTrailProjectile.cpp  |   52 +-
 .../Projectiles/Unsynced/SmokeTrailProjectile.h    |   18 +-
 .../Projectiles/Unsynced/SpherePartProjectile.cpp  |   14 +
 .../Projectiles/Unsynced/SpherePartProjectile.h    |   10 +-
 rts/Sim/Projectiles/Unsynced/TracerProjectile.cpp  |    5 +
 rts/Sim/Projectiles/Unsynced/TracerProjectile.h    |    8 +-
 rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp    |    5 +
 rts/Sim/Projectiles/Unsynced/WakeProjectile.h      |    6 +-
 rts/Sim/Projectiles/Unsynced/WreckProjectile.cpp   |   15 +-
 rts/Sim/Projectiles/Unsynced/WreckProjectile.h     |    8 +-
 .../WeaponProjectiles/BeamLaserProjectile.cpp      |   21 +-
 .../WeaponProjectiles/BeamLaserProjectile.h        |    8 +-
 .../WeaponProjectiles/EmgProjectile.cpp            |   13 +-
 .../Projectiles/WeaponProjectiles/EmgProjectile.h  |    8 +-
 .../WeaponProjectiles/ExplosiveProjectile.cpp      |    9 +-
 .../WeaponProjectiles/ExplosiveProjectile.h        |    8 +-
 .../WeaponProjectiles/FireBallProjectile.cpp       |   23 +-
 .../WeaponProjectiles/FireBallProjectile.h         |    8 +-
 .../WeaponProjectiles/FlameProjectile.cpp          |   12 +-
 .../WeaponProjectiles/FlameProjectile.h            |   10 +-
 .../WeaponProjectiles/LargeBeamLaserProjectile.cpp |   24 +-
 .../WeaponProjectiles/LargeBeamLaserProjectile.h   |    8 +-
 .../WeaponProjectiles/LaserProjectile.cpp          |    5 +
 .../WeaponProjectiles/LaserProjectile.h            |   14 +-
 .../WeaponProjectiles/LightningProjectile.cpp      |    5 +
 .../WeaponProjectiles/LightningProjectile.h        |    8 +-
 .../WeaponProjectiles/MissileProjectile.cpp        |   31 +-
 .../WeaponProjectiles/MissileProjectile.h          |   16 +-
 .../WeaponProjectiles/StarburstProjectile.cpp      |   64 +-
 .../WeaponProjectiles/StarburstProjectile.h        |   17 +-
 .../WeaponProjectiles/TorpedoProjectile.cpp        |   21 +-
 .../WeaponProjectiles/TorpedoProjectile.h          |    6 +-
 .../WeaponProjectiles/WeaponProjectile.cpp         |    9 +
 .../WeaponProjectiles/WeaponProjectile.h           |    3 +
 rts/Sim/Units/CommandAI/AirCAI.cpp                 |   25 +-
 rts/Sim/Units/CommandAI/BuilderCAI.cpp             |   50 +-
 rts/Sim/Units/CommandAI/BuilderCAI.h               |    2 +
 rts/Sim/Units/CommandAI/Command.h                  |   21 +-
 rts/Sim/Units/CommandAI/CommandAI.cpp              |   74 +-
 rts/Sim/Units/CommandAI/CommandAI.h                |    8 +-
 rts/Sim/Units/CommandAI/FactoryCAI.cpp             |    1 -
 rts/Sim/Units/CommandAI/MobileCAI.cpp              |  311 +--
 rts/Sim/Units/CommandAI/MobileCAI.h                |    4 +-
 rts/Sim/Units/CommandAI/TransportCAI.cpp           |    1 +
 rts/Sim/Units/CommandAI/TransportCAI.h             |    2 +
 rts/Sim/Units/Scripts/CobDefines.h                 |    1 -
 rts/Sim/Units/Scripts/CobFile.cpp                  |   26 +-
 rts/Sim/Units/Scripts/CobInstance.cpp              |   28 +-
 rts/Sim/Units/Scripts/CobScriptNames.cpp           |   56 +-
 rts/Sim/Units/Scripts/LuaScriptNames.cpp           |   31 +-
 rts/Sim/Units/Scripts/LuaUnitScript.cpp            |  125 +-
 rts/Sim/Units/Scripts/UnitScript.cpp               |  133 +-
 rts/Sim/Units/Scripts/UnitScript.h                 |    3 +-
 rts/Sim/Units/Unit.cpp                             | 1243 ++++++-----
 rts/Sim/Units/Unit.h                               |  215 +-
 rts/Sim/Units/UnitDef.cpp                          |    9 +-
 rts/Sim/Units/UnitDef.h                            |    4 +-
 rts/Sim/Units/UnitDefHandler.cpp                   |    2 +-
 rts/Sim/Units/UnitHandler.cpp                      |  166 +-
 rts/Sim/Units/UnitHandler.h                        |    1 +
 rts/Sim/Units/UnitLoader.cpp                       |   20 +-
 rts/Sim/Units/UnitTypes/Builder.cpp                |   62 +-
 rts/Sim/Units/UnitTypes/ExtractorBuilding.cpp      |    6 +-
 rts/Sim/Units/UnitTypes/Factory.cpp                |   18 +-
 rts/Sim/Units/UnitTypes/Factory.h                  |    3 -
 rts/Sim/Weapons/BeamLaser.cpp                      |   64 +-
 rts/Sim/Weapons/BeamLaser.h                        |    8 +-
 rts/Sim/Weapons/BombDropper.cpp                    |  155 +-
 rts/Sim/Weapons/BombDropper.h                      |   16 +-
 rts/Sim/Weapons/Cannon.cpp                         |   39 +-
 rts/Sim/Weapons/Cannon.h                           |   16 +-
 rts/Sim/Weapons/DGunWeapon.cpp                     |   28 +-
 rts/Sim/Weapons/DGunWeapon.h                       |    6 +-
 rts/Sim/Weapons/EmgCannon.cpp                      |   24 +-
 rts/Sim/Weapons/EmgCannon.h                        |    4 +-
 rts/Sim/Weapons/FlameThrower.cpp                   |   15 +-
 rts/Sim/Weapons/FlameThrower.h                     |    4 +-
 rts/Sim/Weapons/LaserCannon.cpp                    |   26 +-
 rts/Sim/Weapons/LaserCannon.h                      |    5 +-
 rts/Sim/Weapons/LightningCannon.cpp                |   34 +-
 rts/Sim/Weapons/LightningCannon.h                  |    6 +-
 rts/Sim/Weapons/MeleeWeapon.cpp                    |   25 +-
 rts/Sim/Weapons/MeleeWeapon.h                      |    6 +-
 rts/Sim/Weapons/MissileLauncher.cpp                |   31 +-
 rts/Sim/Weapons/MissileLauncher.h                  |    6 +-
 rts/Sim/Weapons/NoWeapon.h                         |   10 +-
 rts/Sim/Weapons/PlasmaRepulser.cpp                 |   26 +-
 rts/Sim/Weapons/PlasmaRepulser.h                   |   12 +-
 rts/Sim/Weapons/Rifle.cpp                          |   17 +-
 rts/Sim/Weapons/Rifle.h                            |    5 +-
 rts/Sim/Weapons/StarburstLauncher.cpp              |   23 +-
 rts/Sim/Weapons/StarburstLauncher.h                |    7 +-
 rts/Sim/Weapons/TorpedoLauncher.cpp                |   27 +-
 rts/Sim/Weapons/TorpedoLauncher.h                  |    6 +-
 rts/Sim/Weapons/Weapon.cpp                         | 1348 ++++++------
 rts/Sim/Weapons/Weapon.h                           |  144 +-
 rts/Sim/Weapons/WeaponDef.cpp                      |   17 +-
 rts/Sim/Weapons/WeaponDef.h                        |    2 +
 rts/Sim/Weapons/WeaponLoader.cpp                   |   32 +-
 rts/Sim/Weapons/WeaponTarget.cpp                   |   80 +
 rts/Sim/Weapons/WeaponTarget.h                     |   48 +
 rts/System/CMakeLists.txt                          |   19 +-
 rts/System/Color.cpp                               |    8 +
 rts/System/Color.h                                 |   21 +-
 rts/System/Config/ConfigHandler.cpp                |   39 +-
 rts/System/Config/ConfigHandler.h                  |    6 +
 rts/System/Config/ConfigLocater.cpp                |    7 -
 rts/System/Config/ConfigSource.cpp                 |   31 +
 rts/System/Config/ConfigSource.h                   |   22 +
 rts/System/Config/ConfigVariable.cpp               |    6 +
 rts/System/Config/ConfigVariable.h                 |   12 +
 rts/System/EventBatchHandler.cpp                   |   99 +-
 rts/System/EventBatchHandler.h                     |   25 +-
 rts/System/EventClient.cpp                         |    1 +
 rts/System/EventClient.h                           |    2 +
 rts/System/EventHandler.cpp                        |   87 +-
 rts/System/EventHandler.h                          |   26 +-
 rts/System/Events.def                              |    2 +
 rts/System/FastMath.h                              |    4 +
 rts/System/FileSystem/ArchiveScanner.cpp           |   17 +-
 rts/System/FileSystem/DataDirLocater.cpp           |    7 +
 rts/System/FileSystem/DataDirsAccess.cpp           |    2 +-
 rts/System/FileSystem/FileSystemInitializer.cpp    |    7 +-
 rts/System/FileSystem/FileSystemInitializer.h      |    2 +-
 rts/System/FileSystem/RapidHandler.cpp             |    4 +-
 rts/System/FileSystem/RapidHandler.h               |    2 +-
 rts/System/FileSystem/VFSHandler.cpp               |   10 +-
 rts/System/FileSystem/VFSHandler.h                 |    2 +-
 rts/System/Input/Joystick.cpp                      |    2 +-
 rts/System/Input/KeyInput.cpp                      |    2 +
 rts/System/LoadSave/CregLoadSaveHandler.cpp        |   50 +-
 rts/System/LoadSave/DemoReader.cpp                 |    7 +-
 rts/System/LoadSave/LuaLoadSaveHandler.cpp         |    8 +-
 rts/System/Log/FileSink.h                          |    2 +-
 rts/System/Log/FramePrefixer.cpp                   |   11 +-
 rts/System/Log/ILog.h                              |    6 +-
 rts/System/LogOutput.cpp                           |    1 -
 rts/System/Matrix44f.cpp                           |   29 +-
 rts/System/Matrix44f.h                             |   18 +-
 rts/System/Misc/SpringTime.cpp                     |    8 +-
 rts/System/Misc/SpringTime.h                       |    2 +-
 rts/System/Net/LocalConnection.cpp                 |   11 +
 rts/System/Net/LocalConnection.h                   |    2 +-
 rts/System/Net/Socket.cpp                          |    4 -
 rts/System/Net/UDPConnection.h                     |    3 +-
 rts/System/Object.cpp                              |  120 +-
 rts/System/Object.h                                |   11 +-
 rts/System/ObjectDependenceTypes.h                 |    3 +-
 rts/System/OffscreenGLContext.cpp                  |   10 +-
 rts/System/Platform/Battery.cpp                    |   73 +
 rts/System/Platform/Battery.h                      |   35 +
 rts/System/Platform/CpuID.cpp                      |    8 +-
 rts/System/Platform/CpuID.h                        |    1 +
 rts/System/Platform/CrashHandler.h                 |   12 +
 rts/System/Platform/Linux/CrashHandler.cpp         |  670 ++++--
 rts/System/Platform/Linux/ThreadSupport.cpp        |  241 +++
 rts/System/Platform/Linux/ThreadSupport.h          |   24 +
 rts/System/Platform/Linux/thread_backtrace.cpp     |  116 --
 rts/System/Platform/Linux/thread_backtrace.h       |    5 -
 rts/System/Platform/Mac/CrashHandler.cpp           |  129 ++
 rts/System/Platform/Misc.cpp                       |    3 +-
 rts/System/Platform/RecursiveScopedLock.h          |    8 -
 rts/System/Platform/Threading.cpp                  |   93 +-
 rts/System/Platform/Threading.h                    |   73 +-
 rts/System/Platform/Watchdog.cpp                   |   15 +
 rts/System/Platform/byteorder.h                    |    5 -
 rts/System/Sound/CMakeLists.txt                    |    4 -
 rts/System/Sound/ISound.cpp                        |   28 +-
 rts/System/Sound/ISound.h                          |    4 +-
 rts/System/Sound/Null/NullSound.cpp                |   50 -
 rts/System/Sound/Null/NullSound.h                  |   30 +-
 rts/System/Sound/Null/SoundChannels.cpp            |   10 +-
 rts/System/Sound/OpenAL/AudioChannel.cpp           |   24 +-
 rts/System/Sound/OpenAL/EFX.cpp                    |    3 -
 rts/System/Sound/OpenAL/OggStream.cpp              |    3 +-
 rts/System/Sound/OpenAL/Sound.cpp                  |  137 +-
 rts/System/Sound/OpenAL/Sound.h                    |   17 +-
 rts/System/Sound/OpenAL/SoundSource.cpp            |   39 +-
 rts/System/Sound/OpenAL/SoundSource.h              |   22 +-
 rts/System/SpringApp.cpp                           |  292 ++-
 rts/System/SpringApp.h                             |   26 +-
 rts/System/Sync/DumpState.cpp                      |   14 +-
 rts/System/Sync/HsiehHash.h                        |    8 +-
 rts/System/Sync/SyncDebugger.cpp                   |   10 +-
 rts/System/Sync/SyncedFloat3.h                     |    6 +-
 rts/System/Sync/SyncedPrimitiveBase.h              |    2 +-
 rts/System/ThreadPool.cpp                          |    6 +
 rts/System/ThreadPool.h                            |    8 +-
 rts/System/Threading/CriticalSection.cpp           |   33 +
 rts/System/Threading/CriticalSection.h             |   36 +
 rts/System/Threading/Futex.cpp                     |   89 +
 rts/System/Threading/Futex.h                       |   58 +
 rts/System/Threading/SpringMutex.h                 |   32 +
 rts/System/TimeProfiler.cpp                        |   12 +-
 rts/System/TimeProfiler.h                          |    1 +
 rts/System/Util.cpp                                |   26 +-
 rts/System/creg/ISerializer.h                      |    1 +
 rts/System/creg/STL_Deque.h                        |    2 +-
 rts/System/creg/STL_List.h                         |    6 +-
 rts/System/creg/STL_Map.h                          |   16 +-
 rts/System/creg/STL_Set.h                          |   10 +-
 rts/System/creg/Serializer.cpp                     |   71 +-
 rts/System/creg/TypeDeduction.h                    |  105 +-
 rts/System/creg/VarTypes.cpp                       |   77 +-
 rts/System/creg/VarTypes.h                         |   15 +-
 rts/System/creg/creg.cpp                           |   13 +-
 rts/System/creg/creg.h                             |  139 +-
 rts/System/creg/creg_cond.h                        |    4 +-
 rts/System/creg/creg_runtime_tests.cpp             |   44 +-
 rts/System/exportdefines.h                         |    4 +-
 rts/System/float3.h                                |   12 +-
 rts/System/myMath.cpp                              |   30 +-
 rts/System/myMath.h                                |   10 +-
 rts/System/tdf_grammar.h                           |    6 -
 rts/System/type2.cpp                               |    6 +
 rts/System/type2.h                                 |   24 +
 rts/aGui/CMakeLists.txt                            |    9 +-
 rts/build/cmake/FindJavaExtended.cmake             |    2 +-
 rts/build/cmake/FindLibunwind.cmake                |   54 +
 rts/build/cmake/FindMaven.cmake                    |   67 -
 rts/build/cmake/FindSDL2.cmake                     |    3 +-
 rts/build/cmake/FindWin32Libs.cmake                |    4 +
 rts/build/cmake/TestCXXFlags.cmake                 |   10 +-
 rts/build/cmake/Util.cmake                         |    5 +-
 rts/build/cmake/UtilJava.cmake                     |   13 -
 rts/build/cmake/UtilVersion.cmake                  |   15 +-
 rts/build/maven/support/common/pom.xml             |  298 ---
 rts/build/maven/support/common/spring/pom.xml      |   54 -
 .../common/src/main/resources/checkstyle.xml       |  207 --
 rts/builds/CMakeLists.txt                          |   14 +-
 rts/builds/dedicated/CMakeLists.txt                |    9 +-
 rts/builds/dedicated/main.cpp                      |   46 +-
 rts/builds/legacy/CMakeLists.txt                   |    3 +
 rts/lib/CMakeLists.txt                             |    7 +
 rts/lib/assimp/.gitignore                          |    2 +
 rts/lib/assimp/CMakeLists.txt                      |   42 +
 rts/lib/assimp/code/Q3BSPZipArchive.h              |    2 +-
 rts/lib/assimp/code/StringComparison.h             |    2 +-
 rts/lib/assimp/contrib/unzip/crypt.h               |  132 --
 rts/lib/assimp/contrib/unzip/ioapi.c               |  181 --
 rts/lib/assimp/contrib/unzip/ioapi.h               |   75 -
 rts/lib/assimp/contrib/unzip/unzip.c               | 1604 --------------
 rts/lib/assimp/contrib/unzip/unzip.h               |  358 ----
 rts/lib/assimp/contrib/zlib/CMakeLists.txt         |  141 --
 rts/lib/assimp/contrib/zlib/README                 |  115 -
 rts/lib/assimp/contrib/zlib/adler32.c              |  169 --
 rts/lib/assimp/contrib/zlib/compress.c             |   80 -
 rts/lib/assimp/contrib/zlib/crc32.c                |  442 ----
 rts/lib/assimp/contrib/zlib/crc32.h                |  441 ----
 rts/lib/assimp/contrib/zlib/deflate.c              | 1834 ----------------
 rts/lib/assimp/contrib/zlib/deflate.h              |  342 ---
 rts/lib/assimp/contrib/zlib/inffast.c              |  340 ---
 rts/lib/assimp/contrib/zlib/inffast.h              |   11 -
 rts/lib/assimp/contrib/zlib/inffixed.h             |   94 -
 rts/lib/assimp/contrib/zlib/inflate.c              | 1480 -------------
 rts/lib/assimp/contrib/zlib/inflate.h              |  122 --
 rts/lib/assimp/contrib/zlib/inftrees.c             |  330 ---
 rts/lib/assimp/contrib/zlib/inftrees.h             |   62 -
 rts/lib/assimp/contrib/zlib/trees.c                | 1244 -----------
 rts/lib/assimp/contrib/zlib/trees.h                |  128 --
 rts/lib/assimp/contrib/zlib/zconf.h                |  428 ----
 rts/lib/assimp/contrib/zlib/zconf.in.h             |  332 ---
 rts/lib/assimp/contrib/zlib/zlib.h                 | 1613 --------------
 rts/lib/assimp/contrib/zlib/zutil.c                |  318 ---
 rts/lib/assimp/contrib/zlib/zutil.h                |  274 ---
 rts/lib/gml/ThreadSafeContainers.h                 |  361 +---
 rts/lib/headlessStubs/glewstub.h                   |   11 +-
 rts/lib/headlessStubs/sdlstub.c                    |   17 +
 rts/lib/lua/CMakeLists.txt                         |    5 +
 rts/lib/lua/include/LuaInclude.h                   |    2 +-
 rts/lib/lua/include/LuaUser.cpp                    |   48 +-
 rts/lib/lua/include/luaconf.h                      |    1 +
 rts/lib/minizip/CMakeLists.txt                     |    1 +
 rts/lib/minizip/crypt.h                            |  131 --
 rts/lib/minizip/unzip.c                            |   12 +-
 rts/lib/minizip/unzip.h                            |    4 +-
 rts/lib/minizip/zip.c                              |    2 +-
 test/CMakeLists.txt                                |   43 +
 test/engine/Sim/Misc/testQuadField.cpp             |   92 +
 test/engine/System/LoadSave/testCregLoadSave.cpp   |   19 +-
 test/other/testMutex.cpp                           |  118 ++
 test/validation/LuaUI/Widgets/test.lua             |    8 +-
 test/validation/run-client.sh                      |    2 +-
 test/validation/run.sh                             |    4 +-
 tools/DemoTool/DemoTool.cpp                        |    2 +
 tools/scripts/travis_before_install.sh             |   15 +
 tools/scripts/travis_install.sh                    |   19 +
 tools/unitsync/CMakeLists.txt                      |    4 +-
 800 files changed, 22396 insertions(+), 28789 deletions(-)

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



More information about the Pkg-games-commits mailing list