| spring: develop eb20cfb7 | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| hoijui | hoijui | develop | 2010-04-27 14:03:56 | develop 189067e6 |
| Changeset | Merge remote branch 'originSpring/master' into pureint Conflicts: AI/Skirmish/E323AI AI/Skirmish/KAIK/Defines.h AI/Skirmish/KAIK/KAIK.cpp AI/Wrappers/LegacyCpp/AIGlobalAI.cpp rts/ExternalAI/SSkirmishAICallbackImpl.cpp rts/ExternalAI/SSkirmishAICallbackImpl.h rts/ExternalAI/SkirmishAIWrapper.cpp rts/Sim/Units/UnitDef.h |
|||
| mod - AI/SConscript | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/AAIConfig.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/aidef.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | |||
| add - AI/Skirmish/KAIK/AIClasses.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/AttackGroup.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/AttackHandler.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/BuildUp.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/CMakeLists.txt | [ Diff ] [ File ] | |||
| rm - AI/Skirmish/KAIK/Containers.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/DGunController.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/DGunController.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/Defines.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/IncExternAI.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/IncGlobalAI.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/KAIK.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/Logger.h | [ Diff ] [ File ] | |||
| add - AI/Skirmish/KAIK/LuaParser.cpp | [ Diff ] [ File ] | |||
| add - AI/Skirmish/KAIK/LuaParser.hpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/SpotFinder.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/UnitHandler.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/UnitHandler.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/UnitTable.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/UnitTable.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/Util.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/Util.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/data/AIInfo.lua | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/Builder.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/BuilderPlacement.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/CombatManager.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/GResourceMap.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/GTerrainMap.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/LogFile.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/RAI.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/RAI.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAI.cpp | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICheats.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIGlobalAICallback.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/Event/AIEvent.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/Event/AIInitEvent.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/Event/AIPlayerCommandEvent.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/Event/AIWeaponFiredEvent.h | [ Diff ] [ File ] | |||
| mod - installer/builddata/springcontent/LuaGadgets/Gadgets/unit_script.lua | [ Diff ] [ File ] | |||
| mod - installer/builddata/springcontent/shaders/GLSL/S3OFragProg.glsl | [ Diff ] [ File ] | |||
| mod - installer/builddata/springcontent/shaders/GLSL/S3OVertProg.glsl | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICheats.h | [ Diff ] [ File ] | |||
| add - rts/ExternalAI/AILegacySupport.h | [ Diff ] [ File ] | |||
| rm - rts/ExternalAI/GlobalAICallback.cpp | [ Diff ] [ File ] | |||
| rm - rts/ExternalAI/GlobalAICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAIWrapper.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAIWrapper.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/PreGame.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/PreGame.h | [ Diff ] [ File ] | |||
| mod - rts/Game/SelectedUnits.h | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/EndGameBox.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/SelectionKeyHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/WordCompletion.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaParser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaRules.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaRules.h | [ Diff ] [ File ] | |||
| add - rts/Lua/LuaRulesParams.cpp | [ Diff ] [ File ] | |||
| add - rts/Lua/LuaRulesParams.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedCtrl.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedRead.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnitDefs.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/BFGroundDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Shaders/Shader.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Shaders/Shader.hpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/GlobalConstants.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/Team.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/TeamHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/TeamStatistics.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDef.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDefHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitLoader.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/BaseNetProtocol.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/BaseNetProtocol.h | [ Diff ] [ File ] | |||
| mod - rts/System/EventHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/Matrix44f.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Matrix44f.h | [ Diff ] [ File ] | |||
| mod - rts/System/Net/Connection.h | [ Diff ] [ File ] | |||
| mod - rts/System/Net/LocalConnection.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Net/LocalConnection.h | [ Diff ] [ File ] | |||
| mod - rts/System/Net/UDPConnection.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Net/UDPConnection.h | [ Diff ] [ File ] | |||
| mod - rts/System/NetProtocol.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/NetProtocol.h | [ Diff ] [ File ] | |||
| mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Util.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/myTime.h | [ Diff ] [ File ] | |||
| mod - rts/build/vstudio8/rts.sln | [ Diff ] [ File ] | |||
| mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | |||
| mod - rts/build/vstudio9/rts.vcproj | [ Diff ] [ File ] | |||
| mod - tools/DedicatedServer/main.cpp | [ Diff ] [ File ] | |||
| mod - tools/unitsync/CMakeLists.txt | [ Diff ] [ File ] | |||
| add - tools/unitsync/test/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync.cpp | [ Diff ] [ File ] | |||
