| spring: develop cc5204bf | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| hoijui | hoijui | develop | 2010-04-08 12:20:33 | develop 111e7af3 |
| Changeset | Merge remote branch 'originSpring/master' into pureint Conflicts: AI/Wrappers/LegacyCpp/AIAICallback.cpp rts/ExternalAI/AICallback.cpp rts/ExternalAI/Interface/AISCommands.h rts/ExternalAI/SSkirmishAICallbackImpl.cpp rts/ExternalAI/SkirmishAI.cpp |
|||
| mod - AI/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.h | [ Diff ] [ File ] | |||
| mod - AUTHORS | [ Diff ] [ File ] | |||
| mod - FAQ | [ Diff ] [ File ] | |||
| mod - LICENSE | [ Diff ] [ File ] | |||
| mod - THANKS | [ Diff ] [ File ] | |||
| mod - installer/builddata/springcontent/LuaGadgets/gadgets.lua | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/IAICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/AISCommands.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/SSkirmishAICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/WordCompletion.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaHandle.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaHandleSynced.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaParser.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaRules.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaRules.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/Ground.cpp | [ Diff ] [ File ] | |||
| add - rts/Rendering/DebugDrawerAI.cpp | [ Diff ] [ File ] | |||
| add - rts/Rendering/DebugDrawerAI.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/myGL.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GroundFlash.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/3DModel.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/3DOParser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/3DOParser.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/IModelParser.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/OBJParser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/OBJParser.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/S3OParser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/S3OParser.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/WorldObjectModelRenderer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/ProjectileDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/ProjectileDrawer.hpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/AirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/TAAirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/FireProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/PieceProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ProjectileHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ProjectileHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/Command.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/PlasmaRepulser.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/EventHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | |||
| mod - rts/lib/gml/ThreadSafeContainers.h | [ Diff ] [ File ] | |||
| mod - rts/lib/gml/gmlsrv.h | [ Diff ] [ File ] | |||
