spring: develop 4f5f50b4 |
[ Diff ] [ Back to Repository ] |
Author |
Committer |
Branch |
Timestamp |
Parent |
Kaylewt |
Kaylewt |
develop |
2011-11-22 11:05:43 |
develop 566e0eb3 |
Changeset |
Merge branch 'develop' into QTPFS |
mod - .gitignore |
[ Diff ] [ File ] |
mod - buildbot/master/master.cfg |
[ Diff ] [ File ] |
mod - buildbot/slave/tests-prepare.sh |
[ Diff ] [ File ] |
mod - buildbot/slave/update-docs.sh |
[ Diff ] [ File ] |
mod - rts/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/ExternalAI/EngineOutHandler.h |
[ Diff ] [ File ] |
mod - rts/ExternalAI/Interface/SSkirmishAICallback.h |
[ Diff ] [ File ] |
mod - rts/Game/Game.cpp |
[ Diff ] [ File ] |
mod - rts/Game/GameServer.cpp |
[ Diff ] [ File ] |
mod - rts/Game/GameServer.h |
[ Diff ] [ File ] |
mod - rts/Game/NetCommands.cpp |
[ Diff ] [ File ] |
mod - rts/Game/PreGame.cpp |
[ Diff ] [ File ] |
mod - rts/Game/SelectedUnitsAI.cpp |
[ Diff ] [ File ] |
mod - rts/Game/SyncedGameCommands.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/GameInfo.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/ResourceBar.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaDisplayLists.h |
[ Diff ] [ File ] |
mod - rts/Lua/LuaRules.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaShaders.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaSyncedMoveCtrl.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaSyncedRead.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaUnsyncedCtrl.cpp |
[ Diff ] [ File ] |
mod - rts/Map/Ground.cpp |
[ Diff ] [ File ] |
mod - rts/Map/MapInfo.cpp |
[ Diff ] [ File ] |
mod - rts/Map/ReadMap.h |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/GlobalSynced.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/TeamHandler.h |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/AAirMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/AAirMoveType.h |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/HoverAirMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/HoverAirMoveType.h |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/MoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/MoveType.h |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/StrafeAirMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/StrafeAirMoveType.h |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathManager.h |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/ExplosionGenerator.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/ExplosionGenerator.h |
[ 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/WeaponProjectiles/MissileProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/AirCAI.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/BuilderCAI.h |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/CommandAI.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/CommandAI.h |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/MobileCAI.h |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Scripts/CobEngine.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Scripts/CobEngine.h |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Scripts/CobInstance.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Scripts/CobThread.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Scripts/CobThread.h |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Scripts/LuaUnitScript.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/UnitHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/UnitHandler.h |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/PlasmaRepulser.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/PlasmaRepulser.h |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/Weapon.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/WeaponDefHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/WeaponDefHandler.h |
[ Diff ] [ File ] |
mod - rts/System/BaseNetProtocol.cpp |
[ Diff ] [ File ] |
mod - rts/System/BaseNetProtocol.h |
[ Diff ] [ File ] |
mod - rts/System/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/System/FileSystem/IArchive.h |
[ Diff ] [ File ] |
mod - rts/System/LoadSave/DemoReader.cpp |
[ Diff ] [ File ] |
mod - rts/System/Log/Backend.cpp |
[ Diff ] [ File ] |
mod - rts/System/Log/ConsoleSink.cpp |
[ Diff ] [ File ] |
mod - rts/System/Log/DefaultFormatter.cpp |
[ Diff ] [ File ] |
mod - rts/System/Log/FileSink.cpp |
[ Diff ] [ File ] |
add - rts/System/Log/FramePrefixer.cpp |
[ Diff ] [ File ] |
add - rts/System/Log/FramePrefixer.h |
[ Diff ] [ File ] |
mod - rts/System/Log/OutputDebugStringSink.cpp |
[ Diff ] [ File ] |
mod - rts/System/LogOutput.cpp |
[ Diff ] [ File ] |
mod - rts/System/Object.cpp |
[ Diff ] [ File ] |
mod - rts/System/Object.h |
[ Diff ] [ File ] |
mod - rts/System/OffscreenGLContext.cpp |
[ Diff ] [ File ] |
mod - rts/System/OffscreenGLContext.h |
[ Diff ] [ File ] |
mod - rts/System/Platform/Threading.h |
[ Diff ] [ File ] |
mod - rts/System/Sync/Logger.cpp |
[ Diff ] [ File ] |
mod - rts/System/maindefines.h |
[ Diff ] [ File ] |
mod - rts/System/myMath.cpp |
[ Diff ] [ File ] |
mod - rts/System/myMath.h |
[ Diff ] [ File ] |
mod - rts/build/vstudio8/rts.vcproj |
[ Diff ] [ File ] |
mod - rts/builds/dedicated/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/builds/dedicated/main.cpp |
[ Diff ] [ File ] |
mod - rts/lib/lobby/Test/CMakeLists.txt |
[ Diff ] [ File ] |
mod - test/CMakeLists.txt |
[ Diff ] [ File ] |
rm - test/validation/E323AI.script.txt |
[ Diff ] [ File ] |
rm - test/validation/KAIK.script.txt |
[ Diff ] [ File ] |
rm - test/validation/RAI.script.txt |
[ Diff ] [ File ] |
rm - test/validation/Shard.script.txt |
[ Diff ] [ File ] |
mod - tools/DemoTool/CMakeLists.txt |
[ Diff ] [ File ] |