2025-08-03 14:22 CEST

spring: master 8bc986c2 Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
abma abma master 2015-06-25 17:51:26 develop f954404a
Changeset Merge branch 'develop'
mod - .mailmap Diff ] File ]
mod - .travis.yml Diff ] File ]
mod - AI/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/Java/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/Java/bin/jni_wrappCallback.awk Diff ] File ]
mod - AI/Interfaces/Java/src/main/native/JavaBridge.c Diff ] File ]
mod - AI/Skirmish/AAI/AAIBrain.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIBuildTable.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIExecute.cpp Diff ] File ]
mod - AI/Skirmish/AAI/aidef.h Diff ] File ]
mod - AI/Skirmish/E323AI Diff ] File ]
mod - AI/Skirmish/HughAI Diff ] File ]
mod - AI/Skirmish/KAIK Diff ] File ]
mod - AI/Skirmish/Shard Diff ] File ]
mod - AI/Wrappers/CUtils/bin/common.awk Diff ] File ]
mod - AI/Wrappers/Cpp/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/Cpp/bin/wrappCallback.awk Diff ] File ]
mod - AI/Wrappers/JavaOO/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/JavaOO/bin/wrappCallback.awk Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/DamageArray.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/DamageArray.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/IAICallback.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/MoveData.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/MoveData.h Diff ] File ]
mod - AUTHORS Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - Doxyfile Diff ] File ]
add - buildbot/master/.gitignore Diff ] File ]
mod - buildbot/master/cleanup.sh Diff ] File ]
mod - buildbot/master/master.cfg Diff ] File ]
add - buildbot/master/passwords.py.template Diff ] File ]
mod - buildbot/master/public_html/default.css Diff ] File ]
mod - buildbot/master/public_html/robots.txt Diff ] File ]
rm - buildbot/master/templates/forms.html Diff ] File ]
mod - buildbot/slave/create-build-dirs.sh Diff ] File ]
mod - buildbot/slave/linux/create_linux_static_bundle.sh Diff ] File ]
mod - buildbot/slave/prepare.sh Diff ] File ]
mod - buildbot/slave/rsync.sh Diff ] File ]
mod - buildbot/slave/validation/tests-install.sh Diff ] File ]
mod - buildbot/slave/validation/tests-prepare.sh Diff ] File ]
mod - buildbot/slave/wiki/update_springsettings_page.sh Diff ] File ]
mod - buildbot/slave/wiki/update_weapondefs_page.sh Diff ] File ]
mod - buildbot/slave/win/make_installer.sh Diff ] File ]
mod - buildbot/stacktrace_translator/stacktrace_translator.py Diff ] File ]
mod - buildbot/version_list/list.php Diff ] File ]
mod - cont/CMakeLists.txt Diff ] File ]
mod - cont/LuaUI/widgets.lua Diff ] File ]
mod - cont/base/springcontent/CMakeLists.txt Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/callins.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/gadgets.lua Diff ] File ]
mod - cont/base/springcontent/LuaIntro/Addons/loadprogress.lua 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/bumpWaterFS.glsl Diff ] File ]
add - cont/base/springcontent/shaders/GLSL/infoHeight.lua Diff ] File ]
add - cont/base/springcontent/shaders/GLSL/infoLOS.lua Diff ] File ]
add - cont/base/springcontent/shaders/GLSL/infoMetal.lua Diff ] File ]
add - cont/base/springcontent/shaders/GLSL/infoPath.lua Diff ] File ]
mod - cont/cmdcolors.txt Diff ] File ]
rm - cont/springrc-template-headless.txt Diff ] File ]
mod - doc/StartScriptFormat.txt Diff ] File ]
mod - doc/changelog.txt Diff ] File ]
mod - doc/manpages/spring.6.txt Diff ] File ]
mod - doc/releasechecklist.txt Diff ] File ]
mod - doc/uikeys.txt Diff ] File ]
mod - installer/make_installer.sh Diff ] File ]
mod - installer/sections/deprecated.nsh Diff ] File ]
mod - installer/sections/sectiondesc.nsh Diff ] File ]
mod - installer/sections/setupSections.nsh Diff ] File ]
mod - installer/sections/shortcuts_desktop.nsh Diff ] File ]
mod - installer/sections/shortcuts_startMenu.nsh Diff ] File ]
rm - installer/sections/zeroK.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/AIInterfaceLibrary.cpp Diff ] File ]
mod - rts/ExternalAI/EngineOutHandler.cpp Diff ] File ]
mod - rts/ExternalAI/EngineOutHandler.h 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/SSkirmishAICallback.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/SkirmishAIData.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIHandler.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIHandler.h Diff ] File ]
mod - rts/Game/Benchmark.cpp Diff ] File ]
mod - rts/Game/Benchmark.h Diff ] File ]
mod - rts/Game/CMakeLists.txt Diff ] File ]
mod - rts/Game/Camera.cpp Diff ] File ]
mod - rts/Game/Camera.h 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/FPSController.h Diff ] File ]
mod - rts/Game/Camera/FreeController.cpp Diff ] File ]
mod - rts/Game/Camera/FreeController.h Diff ] File ]
rm - rts/Game/Camera/OrbitController.cpp Diff ] File ]
rm - rts/Game/Camera/OrbitController.h Diff ] File ]
mod - rts/Game/Camera/OverheadController.cpp Diff ] File ]
mod - rts/Game/Camera/OverheadController.h Diff ] File ]
mod - rts/Game/Camera/OverviewController.cpp Diff ] File ]
mod - rts/Game/Camera/OverviewController.h Diff ] File ]
mod - rts/Game/Camera/RotOverheadController.cpp Diff ] File ]
mod - rts/Game/Camera/RotOverheadController.h Diff ] File ]
rm - rts/Game/Camera/SmoothController.cpp Diff ] File ]
rm - rts/Game/Camera/SmoothController.h Diff ] File ]
add - rts/Game/Camera/SpringController.cpp Diff ] File ]
rm - rts/Game/Camera/TWController.cpp Diff ] File ]
mod - rts/Game/CameraHandler.cpp Diff ] File ]
mod - rts/Game/CameraHandler.h Diff ] File ]
mod - rts/Game/ClientSetup.cpp Diff ] File ]
mod - rts/Game/Console.cpp Diff ] File ]
mod - rts/Game/Console.h Diff ] File ]
mod - rts/Game/FPSUnitController.cpp Diff ] File ]
mod - rts/Game/GUI/PlayerRosterDrawer.cpp Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/Game.h 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 ]
add - rts/Game/GameJobDispatcher.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/GameVersion.h 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/Players/Player.cpp Diff ] File ]
mod - rts/Game/Players/PlayerHandler.cpp Diff ] File ]
mod - rts/Game/Players/PlayerHandler.h Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/PreGame.h Diff ] File ]
mod - rts/Game/SelectedUnitsAI.cpp Diff ] File ]
mod - rts/Game/SelectedUnitsHandler.cpp Diff ] File ]
mod - rts/Game/SyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/TraceRay.cpp Diff ] File ]
mod - rts/Game/UI/GameInfo.cpp Diff ] File ]
mod - rts/Game/UI/GameInfo.h Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/HwMouseCursor.cpp Diff ] File ]
mod - rts/Game/UI/KeyBindings.cpp Diff ] File ]
mod - rts/Game/UI/KeyCodes.cpp Diff ] File ]
mod - rts/Game/UI/MiniMap.cpp 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/TooltipConsole.h Diff ] File ]
mod - rts/Game/UI/UnitTracker.cpp Diff ] File ]
mod - rts/Game/UI/UnitTracker.h Diff ] File ]
mod - rts/Game/UnsyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/WordCompletion.cpp Diff ] File ]
mod - rts/Game/WordCompletion.h Diff ] File ]
mod - rts/Lua/LuaConstCOB.cpp Diff ] File ]
mod - rts/Lua/LuaConstGame.cpp Diff ] File ]
mod - rts/Lua/LuaContextData.h Diff ] File ]
mod - rts/Lua/LuaDefs.h Diff ] File ]
mod - rts/Lua/LuaFBOs.cpp Diff ] File ]
mod - rts/Lua/LuaFeatureDefs.cpp Diff ] File ]
mod - rts/Lua/LuaFeatureDefs.h Diff ] File ]
mod - rts/Lua/LuaFonts.cpp 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/LuaIO.cpp Diff ] File ]
mod - rts/Lua/LuaIO.h Diff ] File ]
mod - rts/Lua/LuaIntro.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGL.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGLUtils.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGLUtils.h Diff ] File ]
mod - rts/Lua/LuaPathFinder.cpp Diff ] File ]
mod - rts/Lua/LuaRules.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/LuaUI.cpp Diff ] File ]
mod - rts/Lua/LuaUnitDefs.cpp Diff ] File ]
mod - rts/Lua/LuaUnitDefs.h Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.h Diff ] File ]
mod - rts/Lua/LuaUnsyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedRead.h Diff ] File ]
mod - rts/Lua/LuaUtils.h Diff ] File ]
mod - rts/Lua/LuaWeaponDefs.cpp Diff ] File ]
mod - rts/Lua/LuaWeaponDefs.h Diff ] File ]
mod - rts/Map/BaseGroundDrawer.cpp Diff ] File ]
mod - rts/Map/BaseGroundDrawer.h Diff ] File ]
mod - rts/Map/BasicMapDamage.cpp Diff ] File ]
mod - rts/Map/Ground.cpp Diff ] File ]
mod - rts/Map/Ground.h Diff ] File ]
mod - rts/Map/HeightLinePalette.cpp Diff ] File ]
mod - rts/Map/HeightLinePalette.h Diff ] File ]
mod - rts/Map/HeightMapTexture.cpp Diff ] File ]
mod - rts/Map/MapInfo.cpp Diff ] File ]
mod - rts/Map/MapInfo.h Diff ] File ]
mod - rts/Map/MapParser.cpp Diff ] File ]
mod - rts/Map/MetalMap.cpp 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/SMF/Legacy/LegacyMeshDrawer.cpp Diff ] File ]
mod - rts/Map/SMF/ROAM/Patch.cpp Diff ] File ]
mod - rts/Map/SMF/ROAM/RoamMeshDrawer.cpp Diff ] File ]
mod - rts/Map/SMF/SMFFormat.h Diff ] File ]
mod - rts/Map/SMF/SMFGroundDrawer.cpp Diff ] File ]
mod - rts/Map/SMF/SMFGroundTextures.cpp Diff ] File ]
mod - rts/Map/SMF/SMFGroundTextures.h Diff ] File ]
mod - rts/Map/SMF/SMFMapFile.cpp Diff ] File ]
mod - rts/Map/SMF/SMFMapFile.h Diff ] File ]
mod - rts/Map/SMF/SMFReadMap.cpp Diff ] File ]
mod - rts/Map/SMF/SMFReadMap.h Diff ] File ]
mod - rts/Map/SMF/SMFRenderState.cpp Diff ] File ]
mod - rts/Menu/SelectMenu.cpp Diff ] File ]
mod - rts/Net/GameParticipant.cpp Diff ] File ]
mod - rts/Net/GameServer.cpp Diff ] File ]
mod - rts/Net/GameServer.h Diff ] File ]
mod - rts/Net/NetCommands.cpp Diff ] File ]
mod - rts/Net/Protocol/BaseNetProtocol.cpp Diff ] File ]
mod - rts/Net/Protocol/BaseNetProtocol.h Diff ] File ]
mod - rts/Net/Protocol/NetProtocol.cpp Diff ] File ]
mod - rts/Net/Protocol/NetProtocol.h Diff ] File ]
mod - rts/Rendering/CMakeLists.txt Diff ] File ]
mod - rts/Rendering/CommandDrawer.cpp Diff ] File ]
mod - rts/Rendering/CommandDrawer.h Diff ] File ]
mod - rts/Rendering/DebugColVolDrawer.cpp Diff ] File ]
mod - rts/Rendering/DefaultPathDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvSky.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvWater.cpp Diff ] File ]
mod - rts/Rendering/Env/BasicSky.cpp Diff ] File ]
mod - rts/Rendering/Env/BasicSky.h Diff ] File ]
mod - rts/Rendering/Env/BasicTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BasicWater.cpp Diff ] File ]
mod - rts/Rendering/Env/BumpWater.cpp Diff ] File ]
mod - rts/Rendering/Env/CubeMapHandler.cpp Diff ] File ]
mod - rts/Rendering/Env/Decals/DecalsDrawerGL4.cpp Diff ] File ]
mod - rts/Rendering/Env/Decals/GroundDecalHandler.cpp Diff ] File ]
mod - rts/Rendering/Env/DynWater.cpp Diff ] File ]
mod - rts/Rendering/Env/GrassDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/IGroundDecalDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/ISky.cpp Diff ] File ]
mod - rts/Rendering/Env/ITreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/IWater.cpp Diff ] File ]
mod - rts/Rendering/Env/RefractWater.cpp Diff ] File ]
mod - rts/Rendering/FarTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/FeatureDrawer.cpp Diff ] File ]
mod - rts/Rendering/FeatureDrawer.h Diff ] File ]
mod - rts/Rendering/Fonts/CFontTexture.cpp Diff ] File ]
mod - rts/Rendering/GL/VBO.cpp Diff ] File ]
mod - rts/Rendering/GL/glExtra.cpp Diff ] File ]
mod - rts/Rendering/GL/myGL.cpp Diff ] File ]
mod - rts/Rendering/GL/myGL.h Diff ] File ]
mod - rts/Rendering/GlobalRendering.cpp Diff ] File ]
mod - rts/Rendering/GlobalRendering.h Diff ] File ]
mod - rts/Rendering/GroundFlash.cpp Diff ] File ]
mod - rts/Rendering/HUDDrawer.cpp Diff ] File ]
mod - rts/Rendering/IPathDrawer.cpp Diff ] File ]
mod - rts/Rendering/InMapDrawView.cpp Diff ] File ]
add - rts/Rendering/Map/InfoTexture/IInfoTextureHandler.cpp Diff ] File ]
add - rts/Rendering/Map/InfoTexture/IInfoTextureHandler.h Diff ] File ]
add - rts/Rendering/Map/InfoTexture/InfoTexture.cpp Diff ] File ]
add - rts/Rendering/Map/InfoTexture/InfoTexture.h Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Legacy/LegacyInfoTextureHandler.cpp Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Legacy/LegacyInfoTextureHandler.h Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Modern/AirLos.cpp Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Modern/AirLos.h Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Modern/Combiner.cpp Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Modern/Combiner.h Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Modern/Height.cpp Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Modern/Height.h Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Modern/InfoTextureHandler.cpp Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Modern/InfoTextureHandler.h Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Modern/Los.cpp Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Modern/Los.h Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Modern/Metal.cpp Diff ] File ]
add - rts/Rendering/Map/InfoTexture/Modern/Metal.h Diff ] File ]