| spring: develop 4066133c | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| hoijui | hoijui | develop | 2010-02-20 12:29:07 | develop bce7d163 |
| Changeset | Merge remote branch 'originSpring/master' into pureint Conflicts: AI/Skirmish/AAI/AAI.cpp AI/Wrappers/LegacyCpp/AIAICallback.cpp rts/ExternalAI/Interface/SSkirmishAICallback.h rts/ExternalAI/SSkirmishAICallbackImpl.cpp rts/ExternalAI/SSkirmishAICallbackImpl.h rts/Game/Game.cpp |
|||
| mod - AI/Skirmish/AAI/AAI.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/AAIAttackManager.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/AAIBrain.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/AAIBuildTable.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/AAIConfig.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/AAIExecute.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/AAIMap.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/aidef.h | [ Diff ] [ File ] | |||
| add - AI/Skirmish/AAI/data/cfg/mod/Balanced_Annihilation_V7.1.cfg | [ Diff ] [ File ] | |||
| add - AI/Skirmish/AAI/data/cfg/mod/Balanced_Annihilation_V7.11.cfg | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/CppTestAI/src/CppTestAI.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/EconomyTracker.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/Logger.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/MetalMap.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/UnitTable.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/Util.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/Util.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/Builder.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/BuilderPlacement.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/GResourceMap.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/GTerrainMap.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/RAI.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/RAI.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.h | [ Diff ] [ File ] | |||
| mod - Documentation/StartScriptFormat.txt | [ Diff ] [ File ] | |||
| mod - SConstruct | [ Diff ] [ File ] | |||
| mod - installer/builddata/springcontent/EngineOptions.lua | [ Diff ] [ File ] | |||
| mod - installer/builddata/springcontent/shaders/S3OFragProg.glsl | [ Diff ] [ File ] | |||
| mod - installer/builddata/springcontent/shaders/S3OVertProg.glsl | [ 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/SSkirmishAICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/LuaAIImplHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.h | [ Diff ] [ File ] | |||
| mod - rts/Game/ClientSetup.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/ClientSetup.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameHelper.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameHelper.h | [ Diff ] [ File ] | |||
| mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameServer.h | [ Diff ] [ File ] | |||
| mod - rts/Game/GameSetup.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameSetup.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Player.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/SelectedUnits.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/CommandColors.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/GameInfo.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MiniMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MouseCursor.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MouseHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/TooltipConsole.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaConstGame.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnitDefs.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SM3/terrain/TerrainTextureGLSL.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/BFGroundDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/BFGroundTextures.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/AdvSky.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/AdvWater.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/BaseWater.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/BasicSky.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/VertexArray.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/VertexArray.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/VertexArray.inl | [ Diff ] [ File ] | |||
| mod - rts/Rendering/ShadowHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitModels/UnitDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/ModInfo.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/ModInfo.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/SmoothHeightMesh.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/PathEstimator.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/PathEstimator.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ProjectileHandler.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/CommandAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/LineDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/LineDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/TransportCAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.cpp | [ 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/UnitHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitTypes/Builder.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/BeamLaser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/LightningCannon.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/BaseNetProtocol.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/BaseNetProtocol.h | [ Diff ] [ File ] | |||
| mod - rts/System/ConfigHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/ConfigHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/Archive7Zip.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/Archive7Zip.h | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveBase.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveBase.h | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveBuffered.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveBuffered.h | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveDir.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveDir.h | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchivePool.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchivePool.h | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveScanner.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveZip.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveZip.h | [ Diff ] [ File ] | |||
| add - rts/System/FileSystem/CacheDir.cpp | [ Diff ] [ File ] | |||
| add - rts/System/FileSystem/CacheDir.h | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/DataDirLocater.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/FileHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/FileHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/FileSystemHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/FileSystemHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/VFSHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/VFSHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/GlobalUnsynced.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/GlobalUnsynced.h | [ Diff ] [ File ] | |||
| mod - rts/System/Net/UDPConnection.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Net/UDPListener.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/NetProtocol.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/NetProtocol.h | [ Diff ] [ File ] | |||
| rm - rts/System/Platform/Mac/MacUtils.h | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Misc.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Win/seh.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Win/wsdl.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/errorhandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/TdfParser.h | [ Diff ] [ File ] | |||
| mod - rts/System/Util.h | [ Diff ] [ File ] | |||
| mod - rts/System/myMath.h | [ Diff ] [ File ] | |||
| mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | |||
| mod - tools/DedicatedServer/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - tools/DedicatedServer/main.cpp | [ Diff ] [ File ] | |||
| mod - tools/DemoTool/DemoTool.cpp | [ Diff ] [ File ] | |||
