2025-08-26 06:44 CEST

spring: develop 5c5beafa Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
zerver zerver develop 2010-09-23 21:20:32 develop a628b043
Changeset Merge branch 'master' of git@github.com:spring/spring

Conflicts:
    rts/System/Platform/Threading.cpp
mod - .gitmodules Diff ] File ]
mod - AI/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/C/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/C/src/Interface.cpp Diff ] File ]
mod - AI/Interfaces/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/Java/CMakeLists.txt Diff ] File ]
rm - AI/Interfaces/Java/bin/java_wrappCallbackOO.awk Diff ] File ]
rm - AI/Interfaces/Java/bin/jna_wrappCallback.awk Diff ] File ]
rm - AI/Interfaces/Java/bin/jna_wrappCommands.awk Diff ] File ]
rm - AI/Interfaces/Java/bin/jna_wrappEvents.awk Diff ] File ]
mod - AI/Interfaces/Java/bin/native_createCallbackFPInitializations.awk Diff ] File ]
rm - AI/Interfaces/Java/data/jlib/jna.jar Diff ] File ]
rm - AI/Interfaces/Java/data/jlib/vecmath.jar Diff ] File ]
mod - AI/Interfaces/Java/data/jvm.properties Diff ] File ]
rm - AI/Interfaces/Java/src/main/java/com/springrts/ai/AI.java Diff ] File ]
rm - AI/Interfaces/Java/src/main/java/com/springrts/ai/AICommand.java Diff ] File ]
rm - AI/Interfaces/Java/src/main/java/com/springrts/ai/AIEvent.java Diff ] File ]
rm - AI/Interfaces/Java/src/main/java/com/springrts/ai/AIFloat3.java Diff ] File ]
rm - AI/Interfaces/Java/src/main/java/manifest.mf Diff ] File ]
mod - AI/Interfaces/Java/src/main/native/InterfaceDefines.h 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/JavaBridge.h Diff ] File ]
mod - AI/Interfaces/Java/src/main/native/JvmLocater_common.c Diff ] File ]
mod - AI/Interfaces/Java/src/main/native/JvmLocater_solaris.c Diff ] File ]
mod - AI/Interfaces/Java/src/main/native/JvmLocater_windows.c Diff ] File ]
mod - AI/SConscript Diff ] File ]
mod - AI/Skirmish/AAI/AAI.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AIExport.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AIExport.h Diff ] File ]
mod - AI/Skirmish/AAI/aidef.h Diff ] File ]
mod - AI/Skirmish/CppTestAI/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/CppTestAI/src/AIExport.cpp Diff ] File ]
mod - AI/Skirmish/CppTestAI/src/AIExport.h Diff ] File ]
mod - AI/Skirmish/CppTestAI/src/CppTestAI.cpp Diff ] File ]
mod - AI/Skirmish/CppTestAI/src/CppTestAI.h Diff ] File ]
mod - AI/Skirmish/KAIK/AIClasses.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/AIExport.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/AIExport.h Diff ] File ]
mod - AI/Skirmish/KAIK/AttackGroup.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/AttackHandler.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/Defines.h Diff ] File ]
mod - AI/Skirmish/KAIK/KAIK.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/ThreatMap.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/ThreatMap.h Diff ] File ]
mod - AI/Skirmish/NullAI/src/AIExport.c Diff ] File ]
mod - AI/Skirmish/NullAI/src/AIExport.h Diff ] File ]
mod - AI/Skirmish/NullJavaAI/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/NullJavaAI/src/nulljavaai/NullJavaAI.java Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/bin/ant.dependent.properties Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/bin/ant.independent.properties Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/bin/build.xml Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/data/AIInfo.lua Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/src/nulloojavaai/NullOOJavaAI.java Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/src/nulloojavaai/NullOOJavaAIFactory.java Diff ] File ]
mod - AI/Skirmish/RAI/AIExport.cpp Diff ] File ]
mod - AI/Skirmish/RAI/AIExport.h Diff ] File ]
mod - AI/Wrappers/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/CUtils/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/CUtils/SSkirmishAISpecifier.cpp Diff ] File ]
mod - AI/Wrappers/CUtils/SharedLibrary.c Diff ] File ]
mod - AI/Wrappers/CUtils/SimpleLog.c Diff ] File ]
mod - AI/Wrappers/CUtils/Util.c Diff ] File ]
mod - AI/Wrappers/CUtils/Util.h Diff ] File ]
mod - AI/Wrappers/CUtils/bin/common.awk Diff ] File ]
mod - AI/Wrappers/CUtils/bin/commonOOCallback.awk Diff ] File ]
rm - AI/Wrappers/CUtils/cutilsdefines.h Diff ] File ]
mod - AI/Wrappers/Cpp/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/Cpp/bin/wrappCallback.awk Diff ] File ]
mod - AI/Wrappers/Cpp/bin/wrappEvents.awk Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAI.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAI.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICheats.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICheats.h Diff ] File ]
rm - AI/Wrappers/LegacyCpp/AIGlobalAI.cpp Diff ] File ]
rm - AI/Wrappers/LegacyCpp/AIGlobalAI.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIGlobalAICallback.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIGlobalAICallback.h Diff ] File ]
rm - AI/Wrappers/LegacyCpp/AISCommands.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEnemyDamagedEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEvents.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/AISeismicPingEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIUnitDamagedEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/IAICallback.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/IAICheats.h Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - doc/StartScriptFormat.txt Diff ] File ]
mod - installer/sections/main.nsh Diff ] File ]
mod - installer/spring.nsi Diff ] File ]
mod - rts/ExternalAI/AICallback.cpp Diff ] File ]
mod - rts/ExternalAI/AICallback.h Diff ] File ]
mod - rts/ExternalAI/AICheats.cpp Diff ] File ]
mod - rts/ExternalAI/AICheats.h Diff ] File ]
mod - rts/ExternalAI/AILibraryManager.cpp Diff ] File ]
mod - rts/ExternalAI/AILibraryManager.h Diff ] File ]
mod - rts/ExternalAI/AISCommands.cpp Diff ] File ]
mod - rts/ExternalAI/EngineOutHandler.cpp Diff ] File ]
mod - rts/ExternalAI/IAILibraryManager.cpp Diff ] File ]
mod - rts/ExternalAI/IAILibraryManager.h Diff ] File ]
mod - rts/ExternalAI/Interface/AISCommands.h Diff ] File ]
mod - rts/ExternalAI/Interface/AISEvents.h Diff ] File ]
rm - rts/ExternalAI/Interface/SAIFloat3.h Diff ] File ]
mod - rts/ExternalAI/Interface/SAIInterfaceCallback.h Diff ] File ]
mod - rts/ExternalAI/Interface/SAIInterfaceLibrary.h Diff ] File ]
mod - rts/ExternalAI/Interface/SSkirmishAICallback.h Diff ] File ]
mod - rts/ExternalAI/Interface/SSkirmishAILibrary.h Diff ] File ]
mod - rts/ExternalAI/Interface/aidefines.h Diff ] File ]
mod - rts/ExternalAI/SAIInterfaceCallbackImpl.cpp 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/ExternalAI/SkirmishAI.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAILibrary.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAILibrary.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.h Diff ] File ]
mod - rts/Game/Action.cpp Diff ] File ]
mod - rts/Game/Action.h Diff ] File ]
mod - rts/Game/Camera.cpp Diff ] File ]
mod - rts/Game/Camera.h Diff ] File ]
mod - rts/Game/CameraHandler.cpp Diff ] File ]
mod - rts/Game/Console.cpp Diff ] File ]
mod - rts/Game/Console.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/GameServer.cpp Diff ] File ]
mod - rts/Game/GameSetup.cpp Diff ] File ]
mod - rts/Game/GameSetup.h Diff ] File ]
mod - rts/Game/NetCommands.cpp Diff ] File ]
mod - rts/Game/SelectedUnits.cpp Diff ] File ]
mod - rts/Game/UI/CursorIcons.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.h Diff ] File ]
mod - rts/Lua/LuaRules.cpp Diff ] File ]
mod - rts/Lua/LuaRules.h Diff ] File ]
mod - rts/Lua/LuaUnitDefs.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Map/Ground.cpp Diff ] File ]
mod - rts/Map/Ground.h Diff ] File ]
mod - rts/Map/MapParser.cpp Diff ] File ]
mod - rts/Map/MapParser.h Diff ] File ]
mod - rts/Map/NoMapDamage.cpp Diff ] File ]
mod - rts/Map/NoMapDamage.h Diff ] File ]
mod - rts/Map/ReadMap.h Diff ] File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp Diff ] File ]
mod - rts/Rendering/DefaultPathDrawer.cpp Diff ] File ]
mod - rts/Sim/Misc/AirBaseHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/AirBaseHandler.h Diff ] File ]
mod - rts/Sim/Misc/CategoryHandler.h Diff ] File ]
mod - rts/Sim/Misc/CollisionHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/CollisionHandler.h Diff ] File ]
mod - rts/Sim/Misc/CollisionVolume.cpp Diff ] File ]
mod - rts/Sim/Misc/CollisionVolume.h Diff ] File ]
mod - rts/Sim/Misc/CommonDefHandler.h Diff ] File ]
mod - rts/Sim/Misc/GuiSoundSet.h Diff ] File ]
mod - rts/Sim/Misc/InterceptHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/InterceptHandler.h Diff ] File ]
mod - rts/Sim/Misc/LosHandler.h Diff ] File ]
mod - rts/Sim/Misc/LosMap.h Diff ] File ]
mod - rts/Sim/Misc/ModInfo.h Diff ] File ]
mod - rts/Sim/Misc/SmoothHeightMesh.cpp Diff ] File ]
mod - rts/Sim/Misc/SmoothHeightMesh.h Diff ] File ]
mod - rts/Sim/Misc/Wind.h Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.h Diff ] File ]
mod - rts/Sim/Path/Default/PathConstants.h Diff ] File ]
mod - rts/Sim/Path/Default/PathDataTypes.h Diff ] File ]
mod - rts/Sim/Path/Default/PathEstimator.cpp Diff ] File ]
mod - rts/Sim/Path/Default/PathFinder.cpp 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/Projectiles/Projectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Projectile.h Diff ] File ]
mod - rts/Sim/Projectiles/ProjectileHandler.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/AirCAI.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/Command.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/CommandAI.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/CommandQueue.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/FactoryCAI.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/TransportCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/TransportCAI.h Diff ] File ]
mod - rts/Sim/Units/Groups/Group.cpp Diff ] File ]
mod - rts/Sim/Units/Groups/Group.h Diff ] File ]
mod - rts/Sim/Units/Groups/GroupHandler.cpp Diff ] File ]
mod - rts/Sim/Units/Groups/GroupHandler.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/UnitLoader.cpp Diff ] File ]
mod - rts/Sim/Units/UnitLoader.h Diff ] File ]
mod - rts/Sim/Units/UnitSet.h Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Builder.cpp Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Builder.h Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Building.h Diff ] File ]
mod - rts/Sim/Units/UnitTypes/ExtractorBuilding.h Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Factory.h Diff ] File ]
mod - rts/Sim/Units/UnitTypes/TransportUnit.h Diff ] File ]
mod - rts/Sim/Weapons/Weapon.h Diff ] File ]
mod - rts/System/BaseNetProtocol.cpp Diff ] File ]
mod - rts/System/BaseNetProtocol.h Diff ] File ]
mod - rts/System/Main.cpp Diff ] File ]
mod - rts/System/Platform/Linux/X_MessageBox.cpp Diff ] File ]
mod - rts/System/Platform/Threading.cpp Diff ] File ]
mod - rts/System/float3.cpp Diff ] File ]
mod - rts/System/float3.h Diff ] File ]
mod - rts/build/cmake/Find7zip.cmake Diff ] File ]
mod - rts/build/cmake/FindAsciiDoc.cmake Diff ] File ]
mod - rts/build/cmake/FindFreetype.cmake Diff ] File ]
mod - rts/build/cmake/FindGLEW.cmake Diff ] File ]
mod - rts/build/cmake/FindJavaExtended.cmake Diff ] File ]
mod - rts/build/cmake/FindOpenAL.cmake Diff ] File ]
mod - rts/build/cmake/FindZLIB.cmake Diff ] File ]
mod - rts/build/cmake/Util.cmake Diff ] File ]