| spring: master ef05475a | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| hokomoko | hokomoko | master | 2015-07-15 23:52:22 | master 8bc986c2 |
| Changeset | Merge branch 'develop' | |||
| mod - AI/Interfaces/C/src/Interface.cpp | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/src/main/native/InterfaceExport.c | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/src/main/native/JavaBridge.c | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/src/main/native/JniUtil.c | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/src/main/native/JvmLocater_common.c | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/src/main/native/JvmLocater_linux.c | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/src/main/native/JvmLocater_windows.c | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/CUtils/SimpleLog.c | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/CUtils/SimpleLog.h | [ Diff ] [ File ] | |||
| mod - CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/gamedata/weapondefs_post.lua | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/infoLOS.lua | [ Diff ] [ File ] | |||
| mod - doc/changelog.txt | [ Diff ] [ File ] | |||
| mod - doc/releasechecklist.txt | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/SAIInterfaceCallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SAIInterfaceCallbackImpl.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SAIInterfaceCallbackImpl.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameData.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameData.h | [ Diff ] [ File ] | |||
| mod - rts/Game/GameHelper.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Players/PlayerHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Players/PlayerHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/SyncedGameCommands.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MiniMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MiniMap.h | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/StartPosSelecter.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaFeatureDefs.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaHashString.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedMoveCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnitDefs.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnsyncedRead.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUtils.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaWeaponDefs.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/BaseGroundDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/BaseGroundDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Map/ReadMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Menu/SelectionWidget.cpp | [ Diff ] [ File ] | |||
| mod - rts/Menu/SelectionWidget.h | [ Diff ] [ File ] | |||
| mod - rts/Net/GameParticipant.cpp | [ Diff ] [ File ] | |||
| mod - rts/Net/GameParticipant.h | [ Diff ] [ File ] | |||
| mod - rts/Net/GameServer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Net/GameServer.h | [ Diff ] [ File ] | |||
| mod - rts/Net/NetCommands.cpp | [ Diff ] [ File ] | |||
| mod - rts/Net/Protocol/BaseNetProtocol.cpp | [ Diff ] [ File ] | |||
| mod - rts/Net/Protocol/BaseNetProtocol.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/Decals/GroundDecalHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/Decals/GroundDecalHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/IGroundDecalDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/FeatureDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/FeatureDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GroundFlash.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Map/InfoTexture/IInfoTextureHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Map/InfoTexture/Legacy/LegacyInfoTextureHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Map/InfoTexture/Modern/AirLos.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Map/InfoTexture/Modern/Combiner.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Map/InfoTexture/Modern/Height.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Map/InfoTexture/Modern/Los.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Map/InfoTexture/Modern/MetalExtraction.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Map/InfoTexture/Modern/Path.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/ModelDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/WorldObjectModelRenderer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/WorldObjectModelRenderer.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/ProjectileDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/ProjectileDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/WorldDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Features/Feature.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Features/Feature.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Features/FeatureHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Features/FeatureHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/DefinitionTag.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/DefinitionTag.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/LosHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/LosHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/LosMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/LosMap.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/RadarHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/RadarHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/StrafeAirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/StrafeAirMoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/Default/PathEstimator.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/Default/PathEstimator.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/Default/PathManager.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/Default/PathManager.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/IPathManager.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/QTPFS/PathManager.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/QTPFS/PathManager.hpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/FireProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Projectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Projectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ProjectileHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ProjectileHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/MobileCAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Scripts/UnitScript.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDef.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDef.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/Weapon.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/Weapon.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/WeaponDef.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/System/LoadSave/DemoRecorder.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/LoadSave/DemoRecorder.h | [ Diff ] [ File ] | |||
| mod - rts/System/LoadSave/demofile.h | [ Diff ] [ File ] | |||
| rm - rts/System/MemPool.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/MemPool.h | [ Diff ] [ File ] | |||
| mod - rts/System/MsgStrings.h | [ Diff ] [ File ] | |||
| mod - rts/System/Object.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Linux/CrashHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Threading.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/ISound.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/OpenAL/Sound.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sync/SyncedPrimitiveBase.h | [ Diff ] [ File ] | |||
| mod - rts/System/TdfParser.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/float3.h | [ Diff ] [ File ] | |||
| mod - rts/build/cmake/TestCXXFlags.cmake | [ Diff ] [ File ] | |||
| mod - rts/builds/dedicated/main.cpp | [ Diff ] [ File ] | |||
| mod - rts/lib/assimp/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/lib/lua/src/lauxlib.cpp | [ Diff ] [ File ] | |||
| mod - tools/DemoTool/DemoTool.cpp | [ Diff ] [ File ] | |||
