[spring] 03/04: Merge tag 'upstream/100.0+dfsg'
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Jul 16 19:39:33 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 3ed0362ef93c257e997f192395a43ed61b7e5d6b
Merge: 11727ad 516f1dc
Author: Markus Koschany <apo at gambaru.de>
Date: Thu Jul 16 18:24:58 2015 +0200
Merge tag 'upstream/100.0+dfsg'
Upstream version 100.0+dfsg
# gpg: Signature made Thu 16 Jul 2015 18:24:52 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]
AI/Interfaces/C/src/Interface.cpp | 26 +-
.../Java/src/main/native/InterfaceExport.c | 58 +--
AI/Interfaces/Java/src/main/native/JavaBridge.c | 102 ++---
AI/Interfaces/Java/src/main/native/JniUtil.c | 22 +-
.../Java/src/main/native/JvmLocater_common.c | 10 +-
.../Java/src/main/native/JvmLocater_linux.c | 8 +-
.../Java/src/main/native/JvmLocater_windows.c | 2 +-
AI/Wrappers/CUtils/SimpleLog.c | 145 +------
AI/Wrappers/CUtils/SimpleLog.h | 29 +-
CMakeLists.txt | 32 +-
VERSION | 2 +-
.../springcontent/gamedata/weapondefs_post.lua | 13 +
cont/base/springcontent/shaders/GLSL/infoLOS.lua | 17 +-
doc/changelog.txt | 43 ++
doc/releasechecklist.txt | 29 +-
rts/ExternalAI/Interface/SAIInterfaceCallback.h | 3 +
rts/ExternalAI/SAIInterfaceCallbackImpl.cpp | 11 +
rts/ExternalAI/SAIInterfaceCallbackImpl.h | 1 +
rts/Game/Game.cpp | 5 +-
rts/Game/GameData.cpp | 10 +
rts/Game/GameData.h | 1 +
rts/Game/GameHelper.h | 9 -
rts/Game/Players/PlayerHandler.cpp | 2 +-
rts/Game/Players/PlayerHandler.h | 4 +-
rts/Game/PreGame.cpp | 54 +--
rts/Game/SyncedGameCommands.cpp | 2 +
rts/Game/UI/MiniMap.cpp | 5 +-
rts/Game/UI/MiniMap.h | 5 +-
rts/Game/UI/StartPosSelecter.cpp | 1 +
rts/Lua/LuaFeatureDefs.cpp | 17 +-
rts/Lua/LuaHashString.h | 4 +-
rts/Lua/LuaSyncedCtrl.cpp | 2 +-
rts/Lua/LuaSyncedMoveCtrl.cpp | 2 +-
rts/Lua/LuaSyncedRead.cpp | 11 +-
rts/Lua/LuaUnitDefs.cpp | 18 +-
rts/Lua/LuaUnsyncedCtrl.cpp | 44 +-
rts/Lua/LuaUnsyncedRead.cpp | 3 +-
rts/Lua/LuaUtils.h | 18 +-
rts/Lua/LuaWeaponDefs.cpp | 19 +-
rts/Map/BaseGroundDrawer.cpp | 4 +
rts/Map/BaseGroundDrawer.h | 1 +
rts/Map/ReadMap.cpp | 2 +-
rts/Menu/SelectionWidget.cpp | 15 +-
rts/Menu/SelectionWidget.h | 6 +-
rts/Net/GameParticipant.cpp | 3 +-
rts/Net/GameParticipant.h | 3 +
rts/Net/GameServer.cpp | 468 +++++++++------------
rts/Net/GameServer.h | 7 +-
rts/Net/NetCommands.cpp | 21 +-
rts/Net/Protocol/BaseNetProtocol.cpp | 18 +-
rts/Net/Protocol/BaseNetProtocol.h | 2 +
rts/Rendering/Env/Decals/GroundDecalHandler.cpp | 19 +-
rts/Rendering/Env/Decals/GroundDecalHandler.h | 2 -
rts/Rendering/Env/IGroundDecalDrawer.cpp | 5 +-
rts/Rendering/FeatureDrawer.cpp | 244 +++++------
rts/Rendering/FeatureDrawer.h | 19 +-
rts/Rendering/GroundFlash.h | 6 +-
.../Map/InfoTexture/IInfoTextureHandler.cpp | 15 +-
.../Legacy/LegacyInfoTextureHandler.cpp | 8 +-
rts/Rendering/Map/InfoTexture/Modern/AirLos.cpp | 3 +
rts/Rendering/Map/InfoTexture/Modern/Combiner.cpp | 7 +
rts/Rendering/Map/InfoTexture/Modern/Height.cpp | 5 +
rts/Rendering/Map/InfoTexture/Modern/Los.cpp | 5 +
.../Map/InfoTexture/Modern/MetalExtraction.cpp | 7 +-
rts/Rendering/Map/InfoTexture/Modern/Path.cpp | 5 +
rts/Rendering/Models/ModelDrawer.h | 1 -
rts/Rendering/Models/WorldObjectModelRenderer.cpp | 49 +--
rts/Rendering/Models/WorldObjectModelRenderer.h | 19 +-
rts/Rendering/ProjectileDrawer.cpp | 9 +-
rts/Rendering/ProjectileDrawer.h | 1 -
rts/Rendering/UnitDrawer.cpp | 29 +-
rts/Rendering/UnitDrawer.h | 2 -
rts/Rendering/WorldDrawer.cpp | 3 -
rts/Sim/Features/Feature.cpp | 10 +-
rts/Sim/Features/Feature.h | 3 +-
rts/Sim/Features/FeatureHandler.cpp | 85 ++--
rts/Sim/Features/FeatureHandler.h | 5 +-
rts/Sim/Misc/DefinitionTag.cpp | 112 +++--
rts/Sim/Misc/DefinitionTag.h | 78 ++--
rts/Sim/Misc/LosHandler.cpp | 144 ++++---
rts/Sim/Misc/LosHandler.h | 58 +--
rts/Sim/Misc/LosMap.cpp | 150 ++++---
rts/Sim/Misc/LosMap.h | 5 +-
rts/Sim/Misc/RadarHandler.cpp | 88 +++-
rts/Sim/Misc/RadarHandler.h | 79 +---
rts/Sim/MoveTypes/StrafeAirMoveType.cpp | 29 +-
rts/Sim/MoveTypes/StrafeAirMoveType.h | 1 +
rts/Sim/Path/Default/PathEstimator.cpp | 19 +-
rts/Sim/Path/Default/PathEstimator.h | 1 +
rts/Sim/Path/Default/PathManager.cpp | 50 +--
rts/Sim/Path/Default/PathManager.h | 15 +-
rts/Sim/Path/IPathManager.h | 20 +-
rts/Sim/Path/QTPFS/PathManager.cpp | 6 +-
rts/Sim/Path/QTPFS/PathManager.hpp | 4 +-
rts/Sim/Projectiles/FireProjectile.cpp | 9 +-
rts/Sim/Projectiles/Projectile.cpp | 5 +-
rts/Sim/Projectiles/Projectile.h | 3 +-
rts/Sim/Projectiles/ProjectileHandler.cpp | 50 ++-
rts/Sim/Projectiles/ProjectileHandler.h | 3 +
rts/Sim/Projectiles/Unsynced/FlyingPiece.h | 3 -
.../WeaponProjectiles/StarburstProjectile.cpp | 129 +++---
.../WeaponProjectiles/StarburstProjectile.h | 3 +
rts/Sim/Units/CommandAI/MobileCAI.cpp | 59 +--
rts/Sim/Units/Scripts/UnitScript.cpp | 3 +-
rts/Sim/Units/Unit.cpp | 17 +-
rts/Sim/Units/Unit.h | 2 +
rts/Sim/Units/UnitDef.cpp | 3 -
rts/Sim/Units/UnitDef.h | 1 -
rts/Sim/Units/UnitHandler.cpp | 27 +-
rts/Sim/Units/UnitHandler.h | 1 -
rts/Sim/Weapons/Weapon.cpp | 24 +-
rts/Sim/Weapons/Weapon.h | 4 +-
rts/Sim/Weapons/WeaponDef.cpp | 10 +-
rts/System/CMakeLists.txt | 1 -
rts/System/LoadSave/DemoRecorder.cpp | 50 +--
rts/System/LoadSave/DemoRecorder.h | 3 +-
rts/System/LoadSave/demofile.h | 2 +-
rts/System/MemPool.cpp | 60 ---
rts/System/MemPool.h | 42 --
rts/System/MsgStrings.h | 2 +-
rts/System/Object.cpp | 5 +-
rts/System/Platform/Linux/CrashHandler.cpp | 44 +-
rts/System/Platform/Threading.h | 5 +-
rts/System/Sound/ISound.cpp | 2 +-
rts/System/Sound/OpenAL/Sound.cpp | 10 +-
rts/System/SpringApp.cpp | 3 +
rts/System/Sync/SyncedPrimitiveBase.h | 21 +-
rts/System/TdfParser.cpp | 5 +-
rts/System/float3.h | 4 -
rts/build/cmake/TestCXXFlags.cmake | 3 +-
rts/builds/dedicated/main.cpp | 2 +
rts/lib/assimp/CMakeLists.txt | 4 +
rts/lib/lua/src/lauxlib.cpp | 2 +-
tools/DemoTool/DemoTool.cpp | 35 +-
134 files changed, 1612 insertions(+), 1813 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