2025-08-16 12:37 CEST

spring: develop 1ab1fb90 Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
SpliFF SpliFF develop 2010-10-17 11:05:55 develop 721f326f
Changeset Merge branch 'master' of git://github.com/spring/spring
Merged official 0.86.2

Conflicts:
    rts/build/cmake/Find7zip.cmake
mod - AI/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/C/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/C/data/InterfaceInfo.lua 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 ]
mod - AI/Interfaces/Java/bin/ant.properties Diff ] File ]
mod - AI/Interfaces/Java/bin/build.xml 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 ]
add - AI/Interfaces/Java/bin/jni_wrappCallback.awk Diff ] File ]
add - AI/Interfaces/Java/bin/jni_wrappEvents.awk Diff ] File ]
mod - AI/Interfaces/Java/bin/native_createCallbackFPInitializations.awk Diff ] File ]
add - AI/Interfaces/Java/bin/native_wrappCallback.awk Diff ] File ]
add - AI/Interfaces/Java/bin/native_wrappCommands.awk Diff ] File ]
mod - AI/Interfaces/Java/data/InterfaceInfo.lua Diff ] File ]
rm - AI/Interfaces/Java/data/jlib/jna.jar Diff ] File ]
mod - AI/Interfaces/Java/data/jvm.properties 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 ]
add - AI/Interfaces/Java/src/main/java/com/springrts/ai/Util.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 ]
add - AI/Interfaces/Java/src/main/native/JniUtil.c Diff ] File ]
add - AI/Interfaces/Java/src/main/native/JniUtil.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/AAI.h 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/AAI/data/AIInfo.lua Diff ] File ]
mod - AI/Skirmish/CppTestAI/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/CppTestAI/data/AIInfo.lua 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/E323AI Diff ] File ]
mod - AI/Skirmish/HughAI 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/LuaParser.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/ThreatMap.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/ThreatMap.h Diff ] File ]
mod - AI/Skirmish/KAIK/data/AIInfo.lua Diff ] File ]
mod - AI/Skirmish/NullAI/data/AIInfo.lua 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 ]
rm - 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/Skirmish/RAI/BasicArray.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/GTerrainMap.h Diff ] File ]
mod - AI/Skirmish/RAI/README Diff ] File ]
mod - AI/Skirmish/RAI/data/AIInfo.lua 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 ]
add - AI/Wrappers/CUtils/SimpleProfiler.cpp Diff ] File ]
add - AI/Wrappers/CUtils/SimpleProfiler.h Diff ] File ]
add - AI/Wrappers/CUtils/TimeUtil.cpp Diff ] File ]
add - AI/Wrappers/CUtils/TimeUtil.h 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 ]
mod - AI/Wrappers/Cpp/CMakeLists.txt Diff ] File ]
add - AI/Wrappers/Cpp/bin/combine_wrappCallback.awk Diff ] File ]
add - AI/Wrappers/Cpp/bin/combine_wrappCommands.awk Diff ] File ]
mod - AI/Wrappers/Cpp/bin/wrappCallback.awk Diff ] File ]
mod - AI/Wrappers/Cpp/bin/wrappEvents.awk Diff ] File ]
add - AI/Wrappers/Cpp/src/AIColor.cpp Diff ] File ]
add - AI/Wrappers/Cpp/src/AIColor.h Diff ] File ]
add - AI/Wrappers/Cpp/src/AIEvent.cpp Diff ] File ]
add - AI/Wrappers/Cpp/src/AIEvent.h Diff ] File ]
add - AI/Wrappers/Cpp/src/AIException.cpp Diff ] File ]
add - AI/Wrappers/Cpp/src/AIException.h Diff ] File ]
add - AI/Wrappers/Cpp/src/AIFloat3.cpp Diff ] File ]
add - AI/Wrappers/Cpp/src/AIFloat3.h Diff ] File ]
add - AI/Wrappers/Cpp/src/CallbackAIException.cpp Diff ] File ]
add - AI/Wrappers/Cpp/src/CallbackAIException.h Diff ] File ]
add - AI/Wrappers/Cpp/src/EventAIException.cpp Diff ] File ]
add - AI/Wrappers/Cpp/src/EventAIException.h Diff ] File ]
add - AI/Wrappers/JavaOO/CMakeLists.txt Diff ] File ]
add - AI/Wrappers/JavaOO/bin/ant.properties Diff ] File ]
add - AI/Wrappers/JavaOO/bin/build.xml Diff ] File ]
add - AI/Wrappers/JavaOO/bin/wrappCallback.awk Diff ] File ]
add - AI/Wrappers/JavaOO/bin/wrappEvents.awk Diff ] File ]
add - AI/Wrappers/JavaOO/jlib/vecmath-src.jar Diff ] File ]
add - AI/Wrappers/JavaOO/src/main/java/com/springrts/ai/oo/CallbackAIException.java Diff ] File ]
add - AI/Wrappers/JavaOO/src/main/java/com/springrts/ai/oo/EventAIException.java 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 - buildbot/slave/create-build-dirs.sh Diff ] File ]
mod - buildbot/stacktrace_translator/stacktrace_translator.py Diff ] File ]
mod - cont/CMakeLists.txt Diff ] File ]
mod - cont/LuaUI/widgets.lua Diff ] File ]
mod - doc/StartScriptFormat.txt Diff ] File ]
mod - doc/changelog.txt Diff ] File ]
mod - doc/releasechecklist.txt Diff ] File ]
mod - doc/userdocs/FAQ.html Diff ] File ]
mod - doc/userdocs/GettingStarted.html Diff ] File ]
mod - doc/userdocs/MoreInfo.html Diff ] File ]
add - installer/include/aiHelpers.nsh Diff ] File ]
mod - installer/make_installer.pl Diff ] File ]
add - installer/make_portable_archive.sh Diff ] File ]
mod - installer/make_source_package.sh Diff ] File ]
mod - installer/sections/ensureDotNet.nsh Diff ] File ]
mod - installer/sections/main.nsh Diff ] File ]
mod - installer/sections/sectiondesc.nsh Diff ] File ]
rm - installer/sections/selectionEditor.nsh Diff ] File ]
mod - installer/sections/shortcuts_desktop.nsh Diff ] File ]
mod - installer/sections/shortcuts_startMenu.nsh Diff ] File ]
rm - installer/sections/springDownloader.nsh Diff ] File ]
add - installer/sections/zeroK.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/GameHelper.cpp Diff ] File ]
mod - rts/Game/GameHelper.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/LoadScreen.cpp Diff ] File ]
mod - rts/Game/LoadScreen.h Diff ] File ]
mod - rts/Game/NetCommands.cpp Diff ] File ]
mod - rts/Game/Player.cpp Diff ] File ]
mod - rts/Game/Player.h Diff ] File ]
mod - rts/Game/PlayerBase.cpp Diff ] File ]
mod - rts/Game/PlayerBase.h Diff ] File ]
mod - rts/Game/PlayerHandler.h Diff ] File ]
mod - rts/Game/PlayerStatistics.cpp Diff ] File ]
mod - rts/Game/PlayerStatistics.h Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/SelectedUnits.cpp Diff ] File ]
mod - rts/Game/SelectedUnitsAI.cpp Diff ] File ]
mod - rts/Game/SyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/TeamController.h Diff ] File ]
mod - rts/Game/UI/CursorIcons.cpp Diff ] File ]
mod - rts/Game/UI/EndGameBox.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.h Diff ] File ]
mod - rts/Game/UI/InfoConsole.cpp Diff ] File ]
mod - rts/Game/UI/InputReceiver.cpp Diff ] File ]
mod - rts/Game/UI/InputReceiver.h Diff ] File ]
mod - rts/Game/UI/KeyAutoBinder.cpp Diff ] File ]
mod - rts/Game/UI/KeyAutoBinder.h Diff ] File ]
mod - rts/Game/UI/QuitBox.cpp Diff ] File ]
mod - rts/Game/UI/ShareBox.cpp Diff ] File ]
mod - rts/Game/UI/ShareBox.h Diff ] File ]
mod - rts/Game/UnsyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.h Diff ] File ]
mod - rts/Game/WordCompletion.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.h Diff ] File ]
mod - rts/Lua/LuaOpenGL.cpp Diff ] File ]
mod - rts/Lua/LuaPathFinder.cpp Diff ] File ]
mod - rts/Lua/LuaPathFinder.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/Lua/LuaUnitDefs.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedRead.cpp Diff ] File ]
mod - rts/Map/BaseGroundDrawer.cpp Diff ] File ]
mod - rts/Map/BaseGroundDrawer.h 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.cpp Diff ] File ]
mod - rts/Map/ReadMap.h Diff ] File ]
mod - rts/Map/SM3/Sm3Map.cpp Diff ] File ]
mod - rts/Map/SM3/Sm3Map.h Diff ] File ]
mod - rts/Map/SM3/terrain/Lightcalc.h Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTexEnvCombine.h Diff ] File ]
mod - rts/Map/SM3/terrain/Textures.cpp Diff ] File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp Diff ] File ]
mod - rts/Menu/LobbyConnection.cpp Diff ] File ]
mod - rts/Menu/LobbyConnection.h Diff ] File ]
mod - rts/Menu/SelectionWidget.cpp Diff ] File ]
mod - rts/Rendering/DefaultPathDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BaseSky.cpp Diff ] File ]
mod - rts/Rendering/Env/BaseSky.h Diff ] File ]
mod - rts/Rendering/Env/BaseTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BaseTreeDrawer.h Diff ] File ]
mod - rts/Rendering/GL/FBO.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/InMapDraw.cpp Diff ] File ]
mod - rts/Rendering/Models/3DModel.h Diff ] File ]
mod - rts/Rendering/Textures/ColorMap.cpp Diff ] File ]
mod - rts/Rendering/Textures/NamedTextures.cpp Diff ] File ]
mod - rts/Rendering/UnitDrawer.cpp Diff ] File ]
mod - rts/Rendering/glFont.cpp Diff ] File ]
mod - rts/Sim/Features/Feature.cpp Diff ] File ]
mod - rts/Sim/Features/Feature.h 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/DamageArrayHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/DamageArrayHandler.h Diff ] File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.cpp Diff ] File ]
mod - rts/Sim/Misc/GuiSoundSet.h Diff ] File ]