[spring] 03/08: Merge tag 'upstream/102.0+dfsg'
Markus Koschany
apo at moszumanska.debian.org
Fri Jul 8 17:14:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository spring.
commit 40625660cb19a0c52552840330024436772eda1a
Merge: a1d94f6 b3deb97
Author: Markus Koschany <apo at debian.org>
Date: Fri Jul 8 16:56:06 2016 +0200
Merge tag 'upstream/102.0+dfsg'
Upstream version 102.0+dfsg
# gpg: Signature made Fri 08 Jul 2016 16:56:00 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]
# gpg: aka "Markus Koschany <apo at debian.org>" [ultimate]
.travis.yml | 3 +
AI/Interfaces/C/data/InterfaceInfo.lua | 2 +-
AI/Interfaces/Java/data/InterfaceInfo.lua | 2 +-
AI/Interfaces/Java/data/interface.properties | 18 -
AI/Interfaces/Java/pom.xml | 2 +-
.../Java/src/main/native/InterfaceExport.c | 72 +-
AI/Interfaces/Java/src/main/native/JavaBridge.c | 11 +-
.../Java/src/main/native/JvmLocater_common.c | 2 +
AI/Skirmish/AAI/data/AIInfo.lua | 2 +-
AI/Skirmish/CppTestAI/data/AIInfo.lua | 2 +-
AI/Skirmish/KAIK/MetalMaker.cpp | 4 +-
AI/Skirmish/NullAI/data/AIInfo.lua | 2 +-
AI/Skirmish/RAI/README | 6 +-
AI/Skirmish/RAI/data/AIInfo.lua | 2 +-
AI/Skirmish/Shard/.gitmodules | 2 +-
.../BA/devwidgets/shard_help_debug_visualizer.lua | 203 ++
.../ai/BA/devwidgets/shard_help_unit_table.lua | 176 ++
AI/Skirmish/Shard/data/ai/BA/econhandler.lua | 2 +-
.../Shard/data/ai/BA/taskqueuebehaviour.lua | 21 +-
.../Shard/data/ai/BAR/antinukebehaviour.lua | 62 +
AI/Skirmish/Shard/data/ai/BAR/assistbehaviour.lua | 177 ++
AI/Skirmish/Shard/data/ai/BAR/assisthandler.lua | 371 ++++
.../Shard/data/ai/BAR/attackerbehaviour.lua | 194 ++
AI/Skirmish/Shard/data/ai/BAR/attackhandler.lua | 454 ++++
AI/Skirmish/Shard/data/ai/BAR/behaviours.lua | 107 +
AI/Skirmish/Shard/data/ai/BAR/bombardbehaviour.lua | 83 +
AI/Skirmish/Shard/data/ai/BAR/bomberbehaviour.lua | 114 +
AI/Skirmish/Shard/data/ai/BAR/bomberhandler.lua | 117 +
AI/Skirmish/Shard/data/ai/BAR/bootbehaviour.lua | 207 ++
AI/Skirmish/Shard/data/ai/BAR/buildsitehandler.lua | 541 +++++
AI/Skirmish/Shard/data/ai/BAR/common.lua | 4 +
AI/Skirmish/Shard/data/ai/BAR/commonfunctions.lua | 308 +++
AI/Skirmish/Shard/data/ai/BAR/countbehaviour.lua | 108 +
AI/Skirmish/Shard/data/ai/BAR/counthandler.lua | 64 +
AI/Skirmish/Shard/data/ai/BAR/damagehandler.lua | 61 +
AI/Skirmish/Shard/data/ai/BAR/defendbehaviour.lua | 209 ++
AI/Skirmish/Shard/data/ai/BAR/defendhandler.lua | 620 ++++++
.../BAR/devwidgets/shard_help_debug_visualizer.lua | 203 ++
.../ai/BAR/devwidgets/shard_help_unit_table.lua | 176 ++
.../Shard/data/ai/{BA => BAR}/econhandler.lua | 4 +-
.../Shard/data/ai/BAR/factoryregisterbehaviour.lua | 113 +
AI/Skirmish/Shard/data/ai/BAR/featuretable.lua | 678 ++++++
AI/Skirmish/Shard/data/ai/BAR/loshandler.lua | 428 ++++
AI/Skirmish/Shard/data/ai/BAR/maphandler.lua | 865 ++++++++
.../Shard/data/ai/BAR/mexupgradebehaviour.lua | 178 ++
AI/Skirmish/Shard/data/ai/BAR/modules.lua | 19 +
AI/Skirmish/Shard/data/ai/BAR/nukebehaviour.lua | 103 +
AI/Skirmish/Shard/data/ai/BAR/raiderbehaviour.lua | 205 ++
AI/Skirmish/Shard/data/ai/BAR/raidhandler.lua | 90 +
AI/Skirmish/Shard/data/ai/BAR/reclaimbehaviour.lua | 160 ++
AI/Skirmish/Shard/data/ai/BAR/scoutbehaviour.lua | 140 ++
AI/Skirmish/Shard/data/ai/BAR/scouthandler.lua | 129 ++
AI/Skirmish/Shard/data/ai/BAR/tacticalhandler.lua | 130 ++
AI/Skirmish/Shard/data/ai/BAR/targethandler.lua | 1183 ++++++++++
.../data/ai/{BA => BAR}/taskqueuebehaviour.lua | 2 +-
AI/Skirmish/Shard/data/ai/BAR/taskqueues.lua | 2287 ++++++++++++++++++++
AI/Skirmish/Shard/data/ai/BAR/turtlehandler.lua | 664 ++++++
AI/Skirmish/Shard/data/ai/BAR/unitlists.lua | 567 +++++
AI/Skirmish/Shard/data/ai/BAR/unittable.lua | 1122 ++++++++++
AI/Skirmish/Shard/data/ai/BAR/wardbehaviour.lua | 170 ++
AI/Skirmish/Shard/data/ai/sleep.lua | 16 +-
AI/Wrappers/CUtils/SimpleLog.c | 10 +-
AI/Wrappers/CUtils/TimeUtil.cpp | 1 +
AI/Wrappers/CUtils/Util.c | 3 +-
AI/Wrappers/CUtils/bin/commonOOCallback.awk | 10 +-
AI/Wrappers/Cpp/CMakeLists.txt | 9 -
AI/Wrappers/JavaOO/CMakeLists.txt | 3 -
AI/Wrappers/JavaOO/pom.xml | 2 +-
AI/Wrappers/LegacyCpp/AIAICallback.cpp | 16 +-
AI/Wrappers/LegacyCpp/AIAICallback.h | 8 +-
AI/Wrappers/LegacyCpp/CMakeLists.txt | 1 -
AI/Wrappers/LegacyCpp/CommandQueue.cpp | 12 -
AI/Wrappers/LegacyCpp/IAICallback.h | 6 +-
AI/Wrappers/LegacyCpp/aibase.h | 3 +-
AUTHORS | 2 +-
CMakeLists.txt | 65 +-
FAQ | 4 +-
README.markdown | 16 +-
THANKS | 2 +-
VERSION | 2 +-
buildbot/README | 2 +-
buildbot/master/master.cfg | 70 +-
buildbot/slave/create-md5sums.py | 61 +
buildbot/slave/linux/create_linux_static_bundle.sh | 2 +
buildbot/slave/prepare.py | 2 +-
buildbot/slave/rsync.sh | 2 +-
buildbot/slave/wiki/mediawiki_upload.sh | 2 +-
buildbot/slave/win/make_installer.sh | 35 +-
.../stacktrace_translator/stacktrace_translator.py | 4 +-
buildbot/version_list/list.php | 4 +-
cont/LuaUI/callins.lua | 1 +
cont/LuaUI/widgets.lua | 9 +
cont/base/maphelper/maphelper/setupopts.lua | 4 +-
cont/base/springcontent/LuaGadgets/callins.lua | 6 +-
cont/base/springcontent/LuaGadgets/gadgets.lua | 67 +-
cont/base/springcontent/LuaHandler/config.lua | 14 +-
.../springcontent/shaders/GLSL/DecalsFragGL4.glsl | 282 ++-
.../springcontent/shaders/GLSL/DecalsVertGL4.glsl | 61 +-
.../springcontent/shaders/GLSL/ModelFragProg.glsl | 81 +-
.../springcontent/shaders/GLSL/ModelVertProg.glsl | 2 +
.../springcontent/shaders/GLSL/SMFFragProg.glsl | 19 +-
doc/DevGuide.txt | 2 +-
doc/HowToBuild.txt | 2 +-
doc/HowToSyncDebug.txt | 2 +-
doc/changelog.txt | 157 +-
doc/cmds.txt | 2 +-
doc/manpages/spring.6.txt | 2 +-
doc/releasechecklist.txt | 26 +-
installer/include/checkrunning.nsh | 30 -
installer/make_installer.sh | 9 +-
installer/sections/main.nsh | 1 -
installer/sections/portable.nsh | 4 -
installer/sections/sectiondesc.nsh | 1 -
installer/sections/setupSections.nsh | 3 -
installer/sections/shortcuts_desktop.nsh | 6 -
installer/sections/shortcuts_startMenu.nsh | 8 +-
installer/sections/springlobby.nsh | 29 -
installer/spring.nsi | 33 +-
rts/CMakeLists.txt | 2 +-
rts/ExternalAI/AICallback.cpp | 11 +-
rts/ExternalAI/AICallback.h | 6 +-
rts/ExternalAI/AICheats.cpp | 2 +-
rts/ExternalAI/AICheats.h | 3 +-
rts/ExternalAI/AILegacySupport.h | 1 -
rts/ExternalAI/EngineOutHandler.cpp | 118 +-
rts/ExternalAI/EngineOutHandler.h | 46 -
rts/ExternalAI/Interface/SAIInterfaceLibrary.h | 2 +-
rts/ExternalAI/Interface/SSkirmishAICallback.h | 141 +-
rts/ExternalAI/Interface/SSkirmishAILibrary.h | 2 +-
rts/ExternalAI/SAIInterfaceCallbackImpl.cpp | 2 +-
rts/ExternalAI/SSkirmishAICallbackImpl.cpp | 383 +---
rts/ExternalAI/SSkirmishAICallbackImpl.h | 44 +-
rts/ExternalAI/SkirmishAIWrapper.cpp | 16 +-
rts/Game/Camera.cpp | 62 +-
rts/Game/Camera.h | 3 +-
rts/Game/Camera/FreeController.cpp | 9 +-
rts/Game/Camera/OverheadController.cpp | 7 +-
rts/Game/Camera/SpringController.cpp | 261 +--
rts/Game/Camera/SpringController.h | 21 +-
rts/Game/CameraHandler.cpp | 273 +--
rts/Game/CameraHandler.h | 60 +-
rts/Game/ClientSetup.cpp | 2 +
rts/Game/ClientSetup.h | 1 +
rts/Game/Game.cpp | 88 +-
rts/Game/Game.h | 5 +-
rts/Game/GameHelper.cpp | 52 +-
rts/Game/GameHelper.h | 57 +-
rts/Game/GameSetup.cpp | 26 +-
rts/Game/LoadScreen.cpp | 112 +-
rts/Game/LoadScreen.h | 1 +
rts/Game/PreGame.cpp | 11 +-
rts/Game/PreGame.h | 2 +-
rts/Game/SelectedUnitsHandler.cpp | 39 +-
rts/Game/SelectedUnitsHandler.h | 3 +-
rts/Game/UI/GuiHandler.cpp | 89 +-
rts/Game/UI/GuiHandler.h | 14 +-
rts/Game/UI/HwMouseCursor.cpp | 2 +-
rts/Game/UI/MiniMap.cpp | 4 +-
rts/Game/UI/MouseHandler.cpp | 2 +-
rts/Game/UI/QuitBox.cpp | 2 +-
rts/Game/UI/SelectionKeyHandler.cpp | 6 +-
rts/Game/UnsyncedGameCommands.cpp | 71 +-
rts/Lua/LuaArchive.cpp | 77 +-
rts/Lua/LuaArchive.h | 4 +-
rts/Lua/LuaFeatureDefs.cpp | 6 +-
rts/Lua/LuaHandle.cpp | 14 +-
rts/Lua/LuaHandle.h | 3 +-
rts/Lua/LuaHandleSynced.cpp | 6 +-
rts/Lua/LuaHandleSynced.h | 2 -
rts/Lua/LuaMaterial.cpp | 722 ++++--
rts/Lua/LuaMaterial.h | 235 +-
rts/Lua/LuaObjectMaterial.h | 48 +-
rts/Lua/LuaObjectRendering.cpp | 262 +--
rts/Lua/LuaObjectRendering.h | 11 -
rts/Lua/LuaOpenGL.cpp | 13 +-
rts/Lua/LuaOpenGLUtils.cpp | 105 +-
rts/Lua/LuaRulesParams.h | 6 +-
rts/Lua/LuaShaders.cpp | 96 +-
rts/Lua/LuaShaders.h | 10 +-
rts/Lua/LuaSyncedCtrl.cpp | 144 +-
rts/Lua/LuaSyncedCtrl.h | 6 +-
rts/Lua/LuaSyncedRead.cpp | 399 ++--
rts/Lua/LuaSyncedRead.h | 8 +-
rts/Lua/LuaUI.cpp | 13 +-
rts/Lua/LuaUI.h | 53 +-
rts/Lua/LuaUnitDefs.cpp | 18 +-
rts/Lua/LuaUnsyncedCtrl.cpp | 209 +-
rts/Lua/LuaUnsyncedCtrl.h | 10 +-
rts/Lua/LuaUnsyncedRead.cpp | 205 +-
rts/Lua/LuaUnsyncedRead.h | 10 +
rts/Lua/LuaUtils.cpp | 11 +-
rts/Lua/LuaUtils.h | 3 +-
rts/Lua/LuaVFSDownload.cpp | 6 +-
rts/Lua/LuaWeaponDefs.cpp | 2 +-
rts/Map/BaseGroundDrawer.cpp | 12 +-
rts/Map/BaseGroundDrawer.h | 1 +
rts/Map/BasicMapDamage.cpp | 159 +-
rts/Map/BasicMapDamage.h | 11 +-
rts/Map/MapDamage.cpp | 22 +-
rts/Map/MapDamage.h | 2 +-
rts/Map/MapInfo.cpp | 197 +-
rts/Map/ReadMap.cpp | 113 +-
rts/Map/ReadMap.h | 26 +-
rts/Map/SM3/SM3GroundDrawer.cpp | 18 +-
rts/Map/SM3/SM3GroundDrawer.h | 1 +
rts/Map/SM3/SM3Map.cpp | 2 +-
rts/Map/SM3/terrain/TerrainTextureGLSL.cpp | 6 +-
rts/Map/SMF/ROAM/Patch.cpp | 129 +-
rts/Map/SMF/ROAM/Patch.h | 25 +-
rts/Map/SMF/ROAM/RoamMeshDrawer.cpp | 38 +-
rts/Map/SMF/ROAM/RoamMeshDrawer.h | 4 +-
rts/Map/SMF/SMFGroundDrawer.cpp | 39 +-
rts/Map/SMF/SMFGroundDrawer.h | 6 +-
rts/Map/SMF/SMFReadMap.cpp | 19 +-
rts/Map/SMF/SMFReadMap.h | 6 +-
rts/Map/SMF/SMFRenderState.cpp | 25 +-
rts/Map/SMF/SMFRenderState.h | 4 -
rts/Menu/SelectionWidget.cpp | 6 +-
rts/Net/GameServer.cpp | 24 +-
rts/Net/GameServer.h | 3 +-
rts/Rendering/CMakeLists.txt | 4 +-
rts/Rendering/CommandDrawer.cpp | 15 +-
rts/Rendering/DebugColVolDrawer.cpp | 6 +-
rts/Rendering/DefaultPathDrawer.cpp | 11 +-
rts/Rendering/Env/AdvSky.cpp | 53 +-
rts/Rendering/Env/AdvTreeDrawer.cpp | 19 +-
rts/Rendering/Env/AdvTreeGenerator.cpp | 169 +-
rts/Rendering/Env/AdvTreeGenerator.h | 1 -
rts/Rendering/Env/AdvWater.cpp | 81 +-
rts/Rendering/Env/BasicSky.cpp | 44 +-
rts/Rendering/Env/BumpWater.cpp | 129 +-
rts/Rendering/Env/CubeMapHandler.cpp | 2 +-
rts/Rendering/Env/Decals/DecalsDrawerGL4.cpp | 1694 +++++++++++----
rts/Rendering/Env/Decals/DecalsDrawerGL4.h | 251 ++-
rts/Rendering/Env/Decals/GroundDecalHandler.cpp | 504 +----
rts/Rendering/Env/Decals/GroundDecalHandler.h | 93 +-
rts/Rendering/Env/Decals/LegacyTrackHandler.cpp | 563 +++++
rts/Rendering/Env/Decals/LegacyTrackHandler.h | 138 ++
rts/Rendering/Env/DynWater.cpp | 125 +-
rts/Rendering/Env/GrassDrawer.cpp | 19 +-
rts/Rendering/Env/IGroundDecalDrawer.cpp | 76 +-
rts/Rendering/Env/IGroundDecalDrawer.h | 53 +-
rts/Rendering/Env/ITreeDrawer.cpp | 1 +
rts/Rendering/Env/IWater.cpp | 238 +-
rts/Rendering/Env/IWater.h | 11 +-
.../Env/Particles/Classes/BubbleProjectile.cpp | 11 +-
.../Env/Particles/Classes/BubbleProjectile.h | 1 +
.../Env/Particles/Classes/DirtProjectile.cpp | 3 -
.../Env/Particles/Classes/FlyingPiece.cpp | 13 +-
.../Classes/GenericParticleProjectile.cpp | 37 +-
.../Particles/Classes/GenericParticleProjectile.h | 1 +
.../Env/Particles/Classes/GeoSquareProjectile.cpp | 3 +-
.../Env/Particles/Classes/GeoSquareProjectile.h | 1 +
.../Particles/Classes/GeoThermSmokeProjectile.cpp | 9 +-
.../Particles/Classes/GeoThermSmokeProjectile.h | 1 +
.../Env/Particles/Classes/HeatCloudProjectile.cpp | 3 -
.../Env/Particles/Classes/MuzzleFlame.cpp | 3 +-
rts/Rendering/Env/Particles/Classes/MuzzleFlame.h | 1 +
.../Env/Particles/Classes/NanoProjectile.cpp | 5 -
rts/Rendering/Env/Particles/Classes/RepulseGfx.cpp | 3 +-
rts/Rendering/Env/Particles/Classes/RepulseGfx.h | 1 +
...dProjectile.cpp => ShieldSegmentProjectile.cpp} | 238 +-
...hieldProjectile.h => ShieldSegmentProjectile.h} | 44 +-
.../Env/Particles/Classes/SimpleParticleSystem.cpp | 2 +-
.../Env/Particles/Classes/SmokeProjectile.cpp | 3 -
.../Env/Particles/Classes/SmokeProjectile2.cpp | 3 -
.../Env/Particles/Classes/SmokeTrailProjectile.cpp | 11 +-
.../Env/Particles/Classes/SmokeTrailProjectile.h | 1 +
.../Env/Particles/Classes/SpherePartProjectile.cpp | 9 +-
.../Env/Particles/Classes/SpherePartProjectile.h | 1 +
.../Env/Particles/Classes/TracerProjectile.cpp | 3 -
.../Env/Particles/Classes/WakeProjectile.cpp | 7 +-
.../Env/Particles/Classes/WakeProjectile.h | 1 +
.../Env/Particles/Classes/WreckProjectile.cpp | 6 +-
.../Env/Particles/Classes/WreckProjectile.h | 1 +
rts/Rendering/Env/Particles/ProjectileDrawer.cpp | 78 +-
rts/Rendering/Env/Particles/ProjectileDrawer.h | 7 +-
rts/Rendering/Env/SkyBox.cpp | 2 +
rts/Rendering/Env/SkyLight.cpp | 22 +-
rts/Rendering/Env/SunLighting.cpp | 2 +-
rts/Rendering/FarTextureHandler.cpp | 220 +-
rts/Rendering/FarTextureHandler.h | 33 +-
rts/Rendering/FeatureDrawer.cpp | 46 +-
rts/Rendering/FeatureDrawer.h | 6 +-
rts/Rendering/Fonts/TextWrap.cpp | 7 +-
rts/Rendering/Fonts/glFont.cpp | 12 +-
rts/Rendering/GL/VertexArray.h | 4 +
rts/Rendering/GL/glExtra.cpp | 14 +-
rts/Rendering/GL/glMarkers.cpp | 25 +
rts/Rendering/GL/glMarkers.h | 24 +
rts/Rendering/GL/myGL.cpp | 31 +-
rts/Rendering/GL/myGL.h | 9 +-
rts/Rendering/IconHandler.cpp | 8 +-
rts/Rendering/InMapDrawView.cpp | 2 +-
rts/Rendering/LineDrawer.cpp | 5 +-
rts/Rendering/LuaObjectDrawer.cpp | 144 +-
rts/Rendering/LuaObjectDrawer.h | 14 +-
.../Legacy/LegacyInfoTextureHandler.cpp | 6 +-
rts/Rendering/Map/InfoTexture/Modern/Combiner.cpp | 2 +-
rts/Rendering/Map/InfoTexture/Modern/Path.cpp | 1 +
rts/Rendering/Models/3DModel.cpp | 89 +-
rts/Rendering/Models/3DModel.h | 74 +-
rts/Rendering/Models/3DOParser.cpp | 7 +-
rts/Rendering/Models/AssParser.cpp | 53 +-
rts/Rendering/Models/AssParser.h | 1 +
rts/Rendering/Models/IModelParser.cpp | 181 +-
rts/Rendering/Models/IModelParser.h | 46 +-
rts/Rendering/Models/OBJParser.cpp | 62 +-
rts/Rendering/Models/OBJParser.h | 34 +-
rts/Rendering/Models/S3OParser.cpp | 6 +-
rts/Rendering/Shaders/GLSLCopyState.cpp | 51 +-
rts/Rendering/Shaders/Shader.cpp | 34 +-
rts/Rendering/Shaders/ShaderStates.h | 19 +-
rts/Rendering/ShadowHandler.cpp | 50 +-
rts/Rendering/ShadowHandler.h | 14 +-
rts/Rendering/Textures/Bitmap.cpp | 48 +-
rts/Rendering/Textures/Bitmap.h | 2 +-
rts/Rendering/Textures/ColorMap.cpp | 104 +-
rts/Rendering/Textures/ColorMap.h | 33 +-
rts/Rendering/Textures/S3OTextureHandler.cpp | 139 +-
rts/Rendering/Textures/S3OTextureHandler.h | 22 +-
rts/Rendering/UnitDrawer.cpp | 492 ++---
rts/Rendering/UnitDrawer.h | 81 +-
rts/Rendering/UnitDrawerState.cpp | 147 +-
rts/Rendering/UnitDrawerState.hpp | 80 +-
rts/Rendering/WorldDrawer.cpp | 43 +-
rts/Sim/CMakeLists.txt | 5 +-
rts/Sim/Features/Feature.cpp | 74 +-
rts/Sim/Features/Feature.h | 31 +-
rts/Sim/Features/FeatureDef.cpp | 18 -
rts/Sim/Features/FeatureDef.h | 2 -
rts/Sim/Features/FeatureDefHandler.cpp | 247 +++
rts/Sim/Features/FeatureDefHandler.h | 53 +
rts/Sim/Features/FeatureHandler.cpp | 415 +---
rts/Sim/Features/FeatureHandler.h | 29 +-
rts/Sim/Misc/CollisionVolume.cpp | 22 +-
rts/Sim/Misc/CollisionVolume.h | 2 +
rts/Sim/Misc/DamageArray.cpp | 32 +-
rts/Sim/Misc/DamageArray.h | 3 +
rts/Sim/Misc/LosHandler.cpp | 5 +-
rts/Sim/Misc/LosMap.cpp | 58 +-
rts/Sim/Misc/LosMap.h | 1 -
rts/Sim/Misc/ModInfo.cpp | 4 +-
rts/Sim/Misc/ModInfo.h | 1 -
rts/Sim/Misc/QuadField.cpp | 242 ++-
rts/Sim/Misc/QuadField.h | 37 +-
rts/Sim/Misc/Team.cpp | 1 -
rts/Sim/Misc/Team.h | 3 +-
rts/Sim/MoveTypes/AAirMoveType.cpp | 11 +-
rts/Sim/MoveTypes/AAirMoveType.h | 3 +
rts/Sim/MoveTypes/ClassicGroundMoveType.cpp | 1643 --------------
rts/Sim/MoveTypes/ClassicGroundMoveType.h | 128 --
rts/Sim/MoveTypes/GroundMoveType.cpp | 79 +-
rts/Sim/MoveTypes/GroundMoveType.h | 29 +-
rts/Sim/MoveTypes/HoverAirMoveType.cpp | 79 +-
rts/Sim/MoveTypes/MoveDefHandler.cpp | 5 +-
rts/Sim/MoveTypes/MoveMath/GroundMoveMath.cpp | 2 +-
rts/Sim/MoveTypes/MoveMath/MoveMath.cpp | 72 +-
rts/Sim/MoveTypes/MoveMath/MoveMath.h | 3 +
rts/Sim/MoveTypes/MoveType.h | 3 +-
rts/Sim/MoveTypes/MoveTypeFactory.cpp | 7 +-
rts/Sim/MoveTypes/ScriptMoveType.cpp | 16 +-
rts/Sim/MoveTypes/ScriptMoveType.h | 1 -
rts/Sim/MoveTypes/StaticMoveType.cpp | 1 +
rts/Sim/MoveTypes/StrafeAirMoveType.cpp | 67 +-
rts/Sim/MoveTypes/StrafeAirMoveType.h | 26 +-
rts/Sim/Objects/SolidObject.cpp | 73 +-
rts/Sim/Objects/SolidObject.h | 24 +-
rts/Sim/Objects/SolidObjectDef.cpp | 54 +-
rts/Sim/Objects/SolidObjectDef.h | 2 -
rts/Sim/Path/Default/PathConstants.h | 2 +-
rts/Sim/Path/Default/PathEstimator.cpp | 65 +-
rts/Sim/Path/Default/PathFinderDef.cpp | 3 +
rts/Sim/Path/Default/PathFinderDef.h | 1 +
rts/Sim/Path/Default/PathManager.cpp | 19 +-
rts/Sim/Projectiles/ExplosionGenerator.cpp | 12 +-
rts/Sim/Projectiles/ExplosionListener.cpp | 14 +-
rts/Sim/Projectiles/ExplosionListener.h | 33 +-
rts/Sim/Projectiles/FireProjectile.cpp | 8 +-
rts/Sim/Projectiles/FireProjectile.h | 1 +
rts/Sim/Projectiles/FlareProjectile.cpp | 2 +-
rts/Sim/Projectiles/FlareProjectile.h | 1 +
rts/Sim/Projectiles/PieceProjectile.cpp | 8 +-
rts/Sim/Projectiles/PieceProjectile.h | 1 +
rts/Sim/Projectiles/Projectile.cpp | 2 +-
rts/Sim/Projectiles/Projectile.h | 6 +-
.../WeaponProjectiles/BeamLaserProjectile.cpp | 2 +-
.../WeaponProjectiles/BeamLaserProjectile.h | 1 +
.../WeaponProjectiles/EmgProjectile.cpp | 3 +-
.../Projectiles/WeaponProjectiles/EmgProjectile.h | 1 +
.../WeaponProjectiles/ExplosiveProjectile.cpp | 6 +-
.../WeaponProjectiles/ExplosiveProjectile.h | 1 +
.../WeaponProjectiles/FireBallProjectile.cpp | 3 +-
.../WeaponProjectiles/FireBallProjectile.h | 1 +
.../WeaponProjectiles/FlameProjectile.cpp | 2 +-
.../WeaponProjectiles/FlameProjectile.h | 1 +
.../WeaponProjectiles/LargeBeamLaserProjectile.cpp | 3 +-
.../WeaponProjectiles/LargeBeamLaserProjectile.h | 1 +
.../WeaponProjectiles/LaserProjectile.cpp | 3 +-
.../WeaponProjectiles/LaserProjectile.h | 1 +
.../WeaponProjectiles/LightningProjectile.cpp | 3 +-
.../WeaponProjectiles/LightningProjectile.h | 1 +
.../WeaponProjectiles/MissileProjectile.cpp | 3 +-
.../WeaponProjectiles/MissileProjectile.h | 1 +
.../WeaponProjectiles/StarburstProjectile.cpp | 2 +-
.../WeaponProjectiles/StarburstProjectile.h | 1 +
.../WeaponProjectiles/TorpedoProjectile.cpp | 11 +-
.../WeaponProjectiles/TorpedoProjectile.h | 1 +
.../WeaponProjectiles/WeaponProjectile.cpp | 33 +-
.../WeaponProjectiles/WeaponProjectile.h | 4 +-
rts/Sim/Units/CommandAI/AirCAI.cpp | 73 +-
rts/Sim/Units/CommandAI/AirCAI.h | 6 +-
rts/Sim/Units/CommandAI/BuilderCAI.cpp | 161 +-
rts/Sim/Units/CommandAI/BuilderCAI.h | 6 +-
rts/Sim/Units/CommandAI/Command.cpp | 19 -
rts/Sim/Units/CommandAI/Command.h | 83 +-
rts/Sim/Units/CommandAI/CommandAI.cpp | 185 +-
rts/Sim/Units/CommandAI/CommandAI.h | 18 +-
rts/Sim/Units/CommandAI/CommandDescription.cpp | 121 ++
rts/Sim/Units/CommandAI/CommandDescription.h | 72 +
rts/Sim/Units/CommandAI/FactoryCAI.cpp | 92 +-
rts/Sim/Units/CommandAI/FactoryCAI.h | 14 +-
rts/Sim/Units/CommandAI/MobileCAI.cpp | 195 +-
rts/Sim/Units/CommandAI/MobileCAI.h | 3 +-
rts/Sim/Units/Scripts/CobEngine.cpp | 70 +-
rts/Sim/Units/Scripts/CobEngine.h | 17 +-
rts/Sim/Units/Scripts/CobInstance.cpp | 226 +-
rts/Sim/Units/Scripts/CobInstance.h | 35 +-
rts/Sim/Units/Scripts/CobThread.cpp | 185 +-
rts/Sim/Units/Scripts/CobThread.h | 40 +-
rts/Sim/Units/Scripts/LuaUnitScript.cpp | 73 +-
rts/Sim/Units/Scripts/LuaUnitScript.h | 6 +-
rts/Sim/Units/Scripts/NullUnitScript.cpp | 23 +-
rts/Sim/Units/Scripts/NullUnitScript.h | 6 +-
rts/Sim/Units/Scripts/UnitScript.cpp | 305 ++-
rts/Sim/Units/Scripts/UnitScript.h | 60 +-
rts/Sim/Units/Scripts/UnitScriptEngine.cpp | 55 +-
rts/Sim/Units/Scripts/UnitScriptEngine.h | 13 +-
rts/Sim/Units/Scripts/UnitScriptFactory.cpp | 4 +-
rts/Sim/Units/Scripts/UnitScriptLog.h | 18 -
rts/Sim/Units/Unit.cpp | 71 +-
rts/Sim/Units/Unit.h | 18 +-
rts/Sim/Units/UnitDef.cpp | 2 +-
rts/Sim/Units/UnitHandler.cpp | 28 +-
rts/Sim/Units/UnitHandler.h | 2 +
rts/Sim/Units/UnitLoader.cpp | 8 +-
rts/Sim/Units/UnitTypes/Builder.cpp | 14 +-
rts/Sim/Units/UnitTypes/Builder.h | 1 -
rts/Sim/Units/UnitTypes/Building.cpp | 4 +-
rts/Sim/Units/UnitTypes/Building.h | 1 -
rts/Sim/Units/UnitTypes/ExtractorBuilding.cpp | 9 +-
rts/Sim/Units/UnitTypes/ExtractorBuilding.h | 1 -
rts/Sim/Units/UnitTypes/Factory.cpp | 69 +-
rts/Sim/Units/UnitTypes/Factory.h | 5 +-
rts/Sim/Weapons/BeamLaser.cpp | 2 +-
rts/Sim/Weapons/BombDropper.cpp | 2 +-
rts/Sim/Weapons/BombDropper.h | 2 +-
rts/Sim/Weapons/Cannon.cpp | 2 +-
rts/Sim/Weapons/Cannon.h | 2 +-
rts/Sim/Weapons/DGunWeapon.cpp | 1 +
rts/Sim/Weapons/EmgCannon.cpp | 1 +
rts/Sim/Weapons/LightningCannon.cpp | 2 +-
rts/Sim/Weapons/MeleeWeapon.cpp | 3 +-
rts/Sim/Weapons/MeleeWeapon.h | 2 +-
rts/Sim/Weapons/MissileLauncher.cpp | 3 +-
rts/Sim/Weapons/MissileLauncher.h | 2 +-
rts/Sim/Weapons/NoWeapon.cpp | 1 +
rts/Sim/Weapons/PlasmaRepulser.cpp | 12 +-
rts/Sim/Weapons/PlasmaRepulser.h | 6 +-
rts/Sim/Weapons/Rifle.cpp | 1 +
rts/Sim/Weapons/StarburstLauncher.cpp | 2 +-
rts/Sim/Weapons/StarburstLauncher.h | 2 +-
rts/Sim/Weapons/Weapon.cpp | 33 +-
rts/Sim/Weapons/Weapon.h | 7 +-
rts/Sim/Weapons/WeaponDef.cpp | 5 +-
rts/Sim/Weapons/WeaponLoader.cpp | 1 -
rts/System/EventClient.cpp | 3 +-
rts/System/EventClient.h | 3 +-
rts/System/EventHandler.cpp | 9 +-
rts/System/EventHandler.h | 3 +-
rts/System/Events.def | 1 -
rts/System/FastMath.h | 53 +-
rts/System/FileSystem/ArchiveNameResolver.cpp | 5 +-
rts/System/FileSystem/ArchiveScanner.cpp | 278 ++-
rts/System/FileSystem/ArchiveScanner.h | 10 +-
rts/System/FileSystem/Archives/PoolArchive.cpp | 6 +-
rts/System/FileSystem/DataDirLocater.cpp | 19 +-
rts/System/FileSystem/DataDirLocater.h | 6 +-
rts/System/FileSystem/RapidHandler.cpp | 72 +-
rts/System/FileSystem/RapidHandler.h | 4 +-
rts/System/FileSystem/VFSHandler.cpp | 2 +-
rts/System/Info.cpp | 24 +-
rts/System/Info.h | 7 +-
rts/System/LoadSave/CregLoadSaveHandler.cpp | 88 +-
rts/System/LoadSave/CregLoadSaveHandler.h | 8 +-
rts/System/LoadSave/LoadSaveHandler.cpp | 14 +-
rts/System/LoadSave/LoadSaveHandler.h | 2 +-
rts/System/LoadSave/LuaLoadSaveHandler.cpp | 2 +-
rts/System/Main.cpp | 2 +-
rts/System/Matrix44f.cpp | 3 +
rts/System/Misc/RectangleOptimizer.cpp | 9 +
rts/System/Misc/RectangleOptimizer.h | 68 +-
rts/System/Misc/SpringTime.h | 2 +-
rts/System/Net/UDPConnection.cpp | 4 +-
rts/System/Net/UDPListener.cpp | 4 +-
rts/System/Object.cpp | 26 +-
rts/System/Object.h | 1 +
rts/System/ObjectDependenceTypes.h | 2 -
rts/System/OffscreenGLContext.cpp | 3 +
rts/System/Platform/CpuID.cpp | 2 +-
rts/System/Platform/CrashHandler.h | 4 +-
rts/System/Platform/Misc.cpp | 55 +-
rts/System/Platform/Misc.h | 2 +-
rts/System/Platform/SDL1_keysym.cpp | 4 +-
rts/System/Platform/Threading.cpp | 20 +
rts/System/Platform/Win/CrashHandler.cpp | 45 +-
rts/System/Platform/errorhandler.h | 3 +
rts/System/SafeVector.h | 3 +-
rts/System/SpringApp.cpp | 38 +-
rts/System/SpringApp.h | 1 +
rts/System/StartScriptGen.cpp | 2 +-
rts/System/Sync/DumpState.cpp | 1 +
rts/System/Sync/FPUCheck.cpp | 13 -
rts/System/Sync/FPUCheck.h | 1 -
rts/System/Sync/Logger.cpp | 50 +-
rts/System/Sync/Logger.h | 4 +-
rts/System/Sync/SyncDebugger.cpp | 17 +-
rts/System/Sync/SyncedFloat3.h | 25 +-
rts/System/Sync/SyncedPrimitiveBase.h | 2 +-
rts/System/Sync/backtrace.c | 24 +
rts/System/TdfParser.cpp | 2 +-
rts/System/Util.cpp | 4 +-
rts/System/Util.h | 29 +-
rts/System/creg/BasicTypes.h | 142 ++
rts/System/creg/DefTypes.h | 53 +
rts/System/creg/STL_Deque.h | 3 +-
rts/System/creg/STL_List.h | 4 +-
rts/System/creg/STL_Map.h | 32 +-
rts/System/creg/STL_Queue.h | 71 +
rts/System/creg/STL_Set.h | 24 +-
rts/System/creg/Serializer.cpp | 86 +-
rts/System/creg/Serializer.h | 10 +-
rts/System/creg/TypeDeduction.h | 14 +-
rts/System/creg/VarTypes.cpp | 5 +
rts/System/creg/VarTypes.h | 14 -
rts/System/creg/creg.cpp | 256 +--
rts/System/creg/creg.h | 475 ++--
rts/System/creg/creg_runtime_tests.cpp | 98 +-
rts/System/float3.cpp | 5 -
rts/System/float3.h | 59 +-
rts/System/float4.cpp | 2 +-
rts/System/maindefines.h | 2 +-
rts/System/type2.cpp | 9 +-
rts/build/cmake/FindGLEW.cmake | 2 +
rts/build/cmake/OverrideFlags.cmake | 2 +-
rts/builds/CMakeLists.txt | 9 +-
rts/builds/dedicated/CMakeLists.txt | 3 +
rts/builds/dedicated/main.cpp | 72 +-
rts/builds/legacy/CMakeLists.txt | 6 -
rts/icon.rc | 2 +-
rts/lib/headlessStubs/glewstub.c | 1 -
rts/lib/headlessStubs/glewstub.h | 9 +-
rts/lib/headlessStubs/glstub.c | 16 +-
rts/lib/headlessStubs/glstub.h | 12 +-
rts/lib/headlessStubs/glustub.c | 21 +-
rts/lib/streflop/streflop_cond.h | 3 +
test/CMakeLists.txt | 22 +
test/engine/System/LoadSave/testCregLoadSave.cpp | 2 -
test/engine/System/testFloat3.cpp | 14 +-
test/engine/System/testSQRT.cpp | 283 +++
tools/CMakeLists.txt | 28 +-
tools/pr-downloader/.gitignore | 7 +
tools/pr-downloader/.travis.yml | 10 +-
tools/pr-downloader/CMakeLists.txt | 18 +-
tools/pr-downloader/src/CMakeLists.txt | 4 +-
.../src/Downloader/Http/HttpDownloader.cpp | 173 +-
.../src/Downloader/Http/HttpDownloader.h | 2 +-
.../src/Downloader/Rapid/RapidDownloader.cpp | 29 +-
.../src/Downloader/Rapid/RapidDownloader.h | 4 +-
tools/pr-downloader/src/Downloader/Rapid/Repo.cpp | 2 +
tools/pr-downloader/src/Downloader/Rapid/Sdp.cpp | 19 +-
tools/pr-downloader/src/FileSystem/File.cpp | 21 +-
tools/pr-downloader/src/FileSystem/FileSystem.cpp | 33 +-
tools/pr-downloader/src/FileSystem/FileSystem.h | 6 +-
.../src/FileSystem/SevenZipArchive.cpp | 2 +-
tools/pr-downloader/src/Logger.cpp | 10 +-
tools/pr-downloader/src/lib/bencode/bencode.cpp | 54 -
tools/pr-downloader/src/lib/bencode/bencode.h | 4 -
tools/pr-downloader/src/main.cpp | 2 +-
tools/pr-downloader/src/pr-downloader.cpp | 25 +-
tools/pr-downloader/test/CMakeLists.txt | 27 +-
tools/pr-downloader/test/test.cpp | 11 +
tools/scripts/cob_fixer.py | 164 +-
tools/scripts/travis_before_install.sh | 10 +-
tools/scripts/travis_install.sh | 12 +-
tools/unitsync/CMakeLists.txt | 5 +
tools/unitsync/exports.def | 168 ++
tools/unitsync/unitsync.cpp | 3 +-
598 files changed, 26554 insertions(+), 11857 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