2025-08-24 17:10 CEST
  

spring: develop 97e3a86b [ Diff ] [ Back to Repository ]
Author Committer Branch Timestamp Parent
jK jK develop 2013-02-11 22:53:28 develop 54c69a4a
Changeset Merge branch 'release'

Conflicts:
    rts/Game/GameServer.cpp
    rts/Sim/Path/QTPFS/PathDefines.hpp
    rts/Sim/Path/QTPFS/PathManager.hpp
mod - .gitignore [ Diff ] [ File ]
mod - .gitmodules [ Diff ] [ File ]
mod - AI/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Interfaces/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Interfaces/Java/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Interfaces/Java/bin/build.xml [ Diff ] [ File ]
add - AI/Interfaces/Java/bin/jni_wrappCommands.awk [ Diff ] [ File ]
mod - AI/Interfaces/Java/src/main/java/com/springrts/ai/Util.java [ 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/JvmLocater.h [ 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/Interfaces/Python [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAI.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAI.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIAirForceManager.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIAirForceManager.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIAttack.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIAttackManager.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIAttackManager.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIBrain.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIBrain.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIBuildTable.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIBuildTable.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIBuildTask.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIBuildTask.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIConfig.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIConstructor.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIConstructor.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIExecute.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIExecute.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIGroup.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIGroup.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIMap.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIMap.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAISector.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAISector.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIUnitTable.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIUnitTable.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AIExport.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AIExport.h [ Diff ] [ File ]
add - AI/Skirmish/AAI/data/README.md [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/ReadMe.txt [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/mod/BOTA_14.cfg [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/cfg/mod/XTA.cfg [ Diff ] [ File ]
mod - AI/Skirmish/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Skirmish/E323AI [ Diff ] [ File ]
mod - AI/Skirmish/KAIK [ Diff ] [ File ]
mod - AI/Skirmish/Shard [ Diff ] [ File ]
mod - AI/Wrappers/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Wrappers/CUtils/SimpleLog.h [ Diff ] [ File ]
mod - AI/Wrappers/CUtils/TimeUtil.cpp [ Diff ] [ File ]
mod - AI/Wrappers/CUtils/TimeUtil.h [ Diff ] [ File ]
mod - AI/Wrappers/CUtils/Util.h [ Diff ] [ File ]
mod - AI/Wrappers/JavaOO/bin/build.xml [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIAI.cpp [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/Command.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/CommandQueue.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEvent.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/IAICallback.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/MoveData.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/WeaponDef.h [ Diff ] [ File ]
mod - CMakeLists.txt [ Diff ] [ File ]
mod - Doxyfile [ Diff ] [ File ]
mod - LICENSE [ Diff ] [ File ]
add - buildbot/README [ Diff ] [ File ]
rm - buildbot/README.markdown [ Diff ] [ File ]
mod - buildbot/master/cleanup.sh [ Diff ] [ File ]
mod - buildbot/master/master.cfg [ Diff ] [ File ]
rm - buildbot/slave/cppcheck.sh [ Diff ] [ File ]
add - buildbot/slave/cppcheck/cppcheck.sh [ Diff ] [ File ]
mod - buildbot/slave/create-build-dirs.sh [ Diff ] [ File ]
add - buildbot/slave/linux/create_linux_static_bundle.sh [ Diff ] [ File ]
add - buildbot/slave/linux/linuxStatic.cmake [ Diff ] [ File ]
add - buildbot/slave/linux/static-show-used-dynamic-libraries.sh [ Diff ] [ File ]
rm - buildbot/slave/linuxStatic.cmake [ Diff ] [ File ]
mod - buildbot/slave/prepare.sh [ Diff ] [ File ]
mod - buildbot/slave/rsync.sh [ Diff ] [ File ]
add - buildbot/slave/safe-exec.sh [ Diff ] [ File ]
rm - buildbot/slave/update-mingwlibs.sh [ Diff ] [ File ]
add - buildbot/slave/validation/tests-analyze.sh [ Diff ] [ File ]
add - buildbot/slave/validation/upload.sh [ Diff ] [ File ]
add - buildbot/slave/win/update-mingwlibs.sh [ Diff ] [ File ]
add - buildbot/version_list/list.php [ Diff ] [ File ]
mod - cont/CMakeLists.txt [ Diff ] [ File ]
mod - cont/base/make_gamedata_arch.sh [ Diff ] [ File ]
mod - cont/base/springcontent/LuaGadgets/gadgets.lua [ Diff ] [ File ]
mod - cont/base/springcontent/gamedata/weapondefs_post.lua [ Diff ] [ File ]
add - cont/base/springcontent/mapgenerator/mapinfo_template.lua [ Diff ] [ File ]
add - cont/base/springcontent/shaders/GLSL/DecalsFragGL4.glsl [ Diff ] [ File ]
add - cont/base/springcontent/shaders/GLSL/DecalsVertGL4.glsl [ Diff ] [ File ]
add - cont/base/springcontent/shaders/GLSL/GrassFragProg.glsl [ Diff ] [ File ]
mod - cont/base/springcontent/shaders/GLSL/GrassVertProg.glsl [ Diff ] [ File ]
mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl [ Diff ] [ File ]
mod - cont/base/springcontent/shaders/GLSL/bumpWaterCoastBlurFS.glsl [ Diff ] [ File ]
mod - cont/base/springcontent/shaders/GLSL/bumpWaterFS.glsl [ Diff ] [ File ]
mod - cont/base/springcontent/shaders/GLSL/bumpWaterVS.glsl [ Diff ] [ File ]
rm - cont/examples/Widgets/ingame_lobby.example.lua [ Diff ] [ File ]
mod - cont/examples/Widgets/luasocket.lua [ Diff ] [ File ]
mod - cont/examples/Widgets/luasocket_console.lua [ Diff ] [ File ]
mod - cont/examples/Widgets/watchdog.lua [ Diff ] [ File ]
mod - cont/springrc-template-headless.txt [ Diff ] [ File ]
mod - doc/CMakeLists.txt [ Diff ] [ File ]
mod - doc/changelog.txt [ Diff ] [ File ]
mod - doc/cmds.txt [ Diff ] [ File ]
mod - doc/manpages/spring.6.txt [ Diff ] [ File ]
mod - doc/releasechecklist.txt [ Diff ] [ File ]
mod - include/GL/glew.h [ Diff ] [ File ]
mod - installer/include/Registry.nsh [ Diff ] [ File ]
mod - installer/make_installer.sh [ Diff ] [ File ]
mod - installer/make_uninstall_nsh.py [ Diff ] [ File ]
mod - installer/sections/deprecated.nsh [ Diff ] [ File ]
mod - installer/sections/shortcuts_desktop.nsh [ Diff ] [ File ]
mod - installer/sections/shortcuts_startMenu.nsh [ Diff ] [ File ]
rm - installer/sections/springsettings.nsh [ Diff ] [ File ]
mod - installer/spring.nsi [ Diff ] [ File ]
mod - rts/CMakeLists.txt [ Diff ] [ File ]
mod - rts/ExternalAI/AICallback.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/AICheats.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/AISCommands.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/Interface/AISCommands.h [ Diff ] [ File ]
mod - rts/ExternalAI/Interface/AISEvents.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/SkirmishAIWrapper.cpp [ Diff ] [ File ]
mod - rts/Game/Action.cpp [ Diff ] [ File ]
add - rts/Game/Benchmark.cpp [ Diff ] [ File ]
add - rts/Game/Benchmark.h [ Diff ] [ File ]
mod - rts/Game/CMakeLists.txt [ Diff ] [ File ]
mod - rts/Game/Camera.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/CameraController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/CameraController.h [ Diff ] [ File ]
mod - rts/Game/Camera/FPSController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/FreeController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OrbitController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverheadController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverviewController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/RotOverheadController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/SmoothController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/SmoothController.h [ Diff ] [ File ]
mod - rts/Game/Camera/TWController.cpp [ Diff ] [ File ]
mod - rts/Game/CameraHandler.cpp [ Diff ] [ File ]
mod - rts/Game/CameraHandler.h [ Diff ] [ File ]
mod - rts/Game/ChatMessage.cpp [ Diff ] [ File ]
mod - rts/Game/CommandMessage.cpp [ Diff ] [ File ]
mod - rts/Game/Console.cpp [ Diff ] [ File ]
mod - rts/Game/ConsoleHistory.cpp [ Diff ] [ File ]
mod - rts/Game/Game.cpp [ Diff ] [ File ]
mod - rts/Game/Game.h [ Diff ] [ File ]
mod - rts/Game/GameController.cpp [ Diff ] [ File ]
mod - rts/Game/GameData.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/GameVersion.cpp [ Diff ] [ File ]
mod - rts/Game/GlobalUnsynced.cpp [ Diff ] [ File ]
mod - rts/Game/GlobalUnsynced.h [ Diff ] [ File ]
mod - rts/Game/InMapDraw.cpp [ Diff ] [ File ]
mod - rts/Game/InMapDrawModel.cpp [ Diff ] [ File ]
mod - rts/Game/LoadScreen.cpp [ Diff ] [ File ]
mod - rts/Game/LoadScreen.h [ Diff ] [ File ]
mod - rts/Game/Messages.cpp [ Diff ] [ File ]
mod - rts/Game/NetCommands.cpp [ Diff ] [ File ]
rm - rts/Game/OSCStatsSender.cpp [ Diff ] [ File ]
rm - rts/Game/OSCStatsSender.h [ Diff ] [ File ]
mod - rts/Game/Player.cpp [ Diff ] [ File ]
mod - rts/Game/Player.h [ Diff ] [ File ]
mod - rts/Game/PlayerHandler.cpp [ Diff ] [ File ]
mod - rts/Game/PlayerHandler.h [ Diff ] [ File ]
mod - rts/Game/PlayerRoster.cpp [ Diff ] [ File ]
mod - rts/Game/PlayerRosterDrawer.cpp [ 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/TraceRay.cpp [ Diff ] [ File ]
mod - rts/Game/TraceRay.h [ Diff ] [ File ]
mod - rts/Game/UI/CommandColors.cpp [ Diff ] [ File ]
mod - rts/Game/UI/CursorIcons.cpp [ Diff ] [ File ]
mod - rts/Game/UI/EndGameBox.cpp [ Diff ] [ File ]
mod - rts/Game/UI/EndGameBox.h [ Diff ] [ File ]
mod - rts/Game/UI/GameInfo.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GameInfo.h [ Diff ] [ File ]
mod - rts/Game/UI/GameSetupDrawer.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.h [ Diff ] [ File ]
mod - rts/Game/UI/HwMouseCursor.cpp [ 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/KeyBindings.cpp [ Diff ] [ File ]
mod - rts/Game/UI/KeyBindings.h [ Diff ] [ File ]
mod - rts/Game/UI/KeyCodes.cpp [ Diff ] [ File ]
mod - rts/Game/UI/KeySet.cpp [ Diff ] [ File ]
mod - rts/Game/UI/MiniMap.cpp [ Diff ] [ File ]
mod - rts/Game/UI/MiniMap.h [ Diff ] [ File ]
mod - rts/Game/UI/MouseCursor.cpp [ Diff ] [ File ]
mod - rts/Game/UI/MouseCursor.h [ Diff ] [ File ]
mod - rts/Game/UI/MouseHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UI/ProfileDrawer.cpp [ Diff ] [ File ]
mod - rts/Game/UI/QuitBox.cpp [ Diff ] [ File ]
mod - rts/Game/UI/QuitBox.h [ Diff ] [ File ]
mod - rts/Game/UI/ResourceBar.cpp [ Diff ] [ File ]
mod - rts/Game/UI/SelectionKeyHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UI/ShareBox.cpp [ Diff ] [ File ]
mod - rts/Game/UI/StartPosSelecter.cpp [ Diff ] [ File ]
mod - rts/Game/UI/TooltipConsole.cpp [ Diff ] [ File ]
mod - rts/Game/UI/UnitTracker.cpp [ Diff ] [ File ]
mod - rts/Game/UnsyncedGameCommands.cpp [ Diff ] [ File ]
mod - rts/Game/WaitCommandsAI.cpp [ Diff ] [ File ]
mod - rts/Game/WordCompletion.cpp [ Diff ] [ File ]
mod - rts/Lua/CMakeLists.txt [ Diff ] [ File ]
mod - rts/Lua/LuaBitOps.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaCallInCheck.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaCallInCheck.h [ Diff ] [ File ]
mod - rts/Lua/LuaConstCMD.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaConstCMDTYPE.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaConstCOB.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaConstGL.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaConstGame.cpp [ Diff ] [ File ]
add - rts/Lua/LuaContextData.h [ Diff ] [ File ]
mod - rts/Lua/LuaDefs.h [ Diff ] [ File ]
mod - rts/Lua/LuaDisplayLists.h [ Diff ] [ File ]
mod - rts/Lua/LuaEventBatch.h [ Diff ] [ File ]
mod - rts/Lua/LuaFBOs.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaFeatureDefs.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaFonts.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaFonts.h [ Diff ] [ File ]
mod - rts/Lua/LuaGaia.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaHandle.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaHandle.h [ Diff ] [ File ]
mod - rts/Lua/LuaHandleSynced.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaHelper.h [ Diff ] [ File ]
mod - rts/Lua/LuaIO.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaIO.h [ Diff ] [ File ]
mod - rts/Lua/LuaInputReceiver.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaIntro.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaIntro.h [ Diff ] [ File ]
rm - rts/Lua/LuaLobby.cpp [ Diff ] [ File ]
rm - rts/Lua/LuaLobby.h [ Diff ] [ File ]
mod - rts/Lua/LuaMaterial.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaMetalMap.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaOpenGL.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaOpenGL.h [ Diff ] [ File ]
mod - rts/Lua/LuaOpenGLUtils.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaParser.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaParser.h [ Diff ] [ File ]
mod - rts/Lua/LuaPathFinder.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaRBOs.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaRules.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaScream.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaShaders.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedCall.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedCtrl.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedCtrl.h [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedMoveCtrl.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedRead.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedRead.h [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedTable.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaTextures.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUI.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnitDefs.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnitMaterial.h [ Diff ] [ File ]
mod - rts/Lua/LuaUnitRendering.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedCall.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedRead.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedRead.h [ Diff ] [ File ]
mod - rts/Lua/LuaUtils.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaVFS.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaWeaponDefs.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaZip.cpp [ Diff ] [ File ]
mod - rts/Map/BaseGroundDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/BaseGroundDrawer.h [ Diff ] [ File ]
mod - rts/Map/BaseGroundTextures.h [ Diff ] [ File ]
mod - rts/Map/BasicMapDamage.cpp [ Diff ] [ File ]
mod - rts/Map/CMakeLists.txt [ Diff ] [ File ]
add - rts/Map/Generation/MapGenerator.cpp [ Diff ] [ File ]
add - rts/Map/Generation/MapGenerator.h [ Diff ] [ File ]