2025-07-31 18:59 CEST

spring: master 6181e6eb Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
Kloot Kloot master 2017-09-24 19:09:41 master 334b5f87
Changeset Merge branch 'develop'
add - .gitattributes Diff ] File ]
mod - .gitignore Diff ] File ]
mod - .gitmodules Diff ] File ]
mod - .travis.yml Diff ] File ]
mod - AI/Interfaces/C/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/C/src/Interface.cpp Diff ] File ]
mod - AI/Interfaces/C/src/SSkirmishAISpecifier.cpp Diff ] File ]
mod - AI/Interfaces/Java/data/jvm.properties Diff ] File ]
mod - AI/Interfaces/Java/src/main/native/JavaBridge.c Diff ] File ]
mod - AI/Interfaces/Java/src/main/native/JvmLocater_common.c Diff ] File ]
mod - AI/Interfaces/Java/src/main/native/JvmLocater_linux.c Diff ] File ]
mod - AI/Interfaces/Java/src/main/native/JvmLocater_windows.c Diff ] File ]
mod - AI/Skirmish/AAI/AAI.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/TA.cfg Diff ] File ]
mod - AI/Skirmish/E323AI Diff ] File ]
mod - AI/Skirmish/HughAI Diff ] File ]
mod - AI/Skirmish/KAIK Diff ] File ]
mod - AI/Skirmish/RAI/GResourceMap.cpp Diff ] File ]
mod - AI/Skirmish/RAI/GTerrainMap.cpp Diff ] File ]
mod - AI/Skirmish/RAI/LogFile.cpp Diff ] File ]
mod - AI/Skirmish/RAI/RAI.cpp Diff ] File ]
mod - AI/Skirmish/Shard Diff ] File ]
mod - AI/Wrappers/CUtils/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/CUtils/SharedLibrary.c Diff ] File ]
mod - AI/Wrappers/CUtils/SimpleLog.c Diff ] File ]
mod - AI/Wrappers/CUtils/SimpleLog.h Diff ] File ]
mod - AI/Wrappers/CUtils/SimpleProfiler.cpp Diff ] File ]
mod - AI/Wrappers/CUtils/Util.c Diff ] File ]
mod - AI/Wrappers/Cpp/bin/wrappCallback.awk Diff ] File ]
mod - AI/Wrappers/Cpp/src/AIColor.cpp Diff ] File ]
mod - AI/Wrappers/Cpp/src/CallbackAIException.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - LICENSE Diff ] File ]
mod - buildbot/master/cleanup.sh Diff ] File ]
mod - buildbot/master/master.cfg Diff ] File ]
mod - buildbot/master/public_html/default.css Diff ] File ]
mod - buildbot/master/public_html/robots.txt Diff ] File ]
mod - buildbot/slave/linux/linuxStatic.cmake Diff ] File ]
add - buildbot/slave/osx/macos_sierra_x64.cmake Diff ] File ]
mod - buildbot/slave/run-tests.sh Diff ] File ]
mod - buildbot/slave/source/make_source_package.sh Diff ] File ]
mod - buildbot/slave/validation/tests-prepare.sh Diff ] File ]
mod - buildbot/slave/validation/tests-run.sh Diff ] File ]
mod - buildbot/slave/win/make_installer.sh Diff ] File ]
mod - buildbot/stacktrace_translator/frontend/index.php Diff ] File ]
mod - buildbot/stacktrace_translator/stacktrace_translator.py Diff ] File ]
mod - cont/LuaUI/callins.lua Diff ] File ]
mod - cont/LuaUI/debug.lua Diff ] File ]
mod - cont/LuaUI/system.lua Diff ] File ]
mod - cont/LuaUI/widgets.lua Diff ] File ]
mod - cont/base/bitmaps/modinfo.lua Diff ] File ]
mod - cont/base/cursors/modinfo.lua Diff ] File ]
mod - cont/base/maphelper/maphelper/mapdefaults.lua Diff ] File ]
mod - cont/base/maphelper/modinfo.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/LuaGadgets/system.lua Diff ] File ]
mod - cont/base/springcontent/LuaHandler/Utilities/specialCallinHandlers.lua Diff ] File ]
mod - cont/base/springcontent/LuaHandler/handler.lua Diff ] File ]
mod - cont/base/springcontent/modinfo.lua Diff ] File ]
mod - 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/GroundDecalsFragProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/ModelFragProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/ModelVertProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/SMFVertProg.glsl Diff ] File ]
add - cont/base/springcontent/shaders/GLSL/ShadowGenFragProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/ShadowGenVertProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/TreeFragProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/TreeVertProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/bumpWaterFS.glsl Diff ] File ]
mod - cont/luaui.lua Diff ] File ]
mod - doc/changelog.txt Diff ] File ]
mod - doc/releasechecklist.txt 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/AIInterfaceLibraryInfo.cpp Diff ] File ]
mod - rts/ExternalAI/AILibraryManager.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/Interface/SAIInterfaceLibrary.h Diff ] File ]
mod - rts/ExternalAI/Interface/SSkirmishAILibrary.h Diff ] File ]
mod - rts/ExternalAI/Interface/aidefines.h Diff ] File ]
mod - rts/ExternalAI/LuaAIImplHandler.cpp 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/SkirmishAIBase.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIData.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAILibraryInfo.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.h Diff ] File ]
mod - rts/Game/AviVideoCapturing.cpp Diff ] File ]
mod - rts/Game/Benchmark.cpp 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/FPSController.cpp Diff ] File ]
mod - rts/Game/Camera/FPSController.h Diff ] File ]
mod - rts/Game/Camera/FreeController.cpp Diff ] File ]
mod - rts/Game/Camera/OverheadController.cpp Diff ] File ]
mod - rts/Game/Camera/OverheadController.h Diff ] File ]
mod - rts/Game/Camera/RotOverheadController.cpp Diff ] File ]
mod - rts/Game/Camera/SpringController.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/ChatMessage.h Diff ] File ]
add - rts/Game/ClientData.cpp Diff ] File ]
add - rts/Game/ClientData.h Diff ] File ]
mod - rts/Game/ClientSetup.cpp Diff ] File ]
mod - rts/Game/ClientSetup.h Diff ] File ]
mod - rts/Game/CommandMessage.cpp Diff ] File ]
mod - rts/Game/CommandMessage.h Diff ] File ]
mod - rts/Game/FPSUnitController.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/GameController.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 ]
mod - 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/IGameCommands.h Diff ] File ]
mod - rts/Game/IVideoCapturing.h Diff ] File ]
mod - rts/Game/InMapDraw.cpp Diff ] File ]
mod - rts/Game/InMapDraw.h Diff ] File ]
mod - rts/Game/InMapDrawModel.cpp Diff ] File ]
mod - rts/Game/InMapDrawModel.h Diff ] File ]
mod - rts/Game/LoadScreen.cpp Diff ] File ]
mod - rts/Game/LoadScreen.h Diff ] File ]
mod - rts/Game/Players/Player.cpp Diff ] File ]
mod - rts/Game/Players/Player.h Diff ] File ]
mod - rts/Game/Players/PlayerBase.h Diff ] File ]
mod - rts/Game/Players/PlayerHandler.cpp Diff ] File ]
mod - rts/Game/Players/TeamController.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/SelectedUnitsHandler.h 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/EndGameBox.cpp Diff ] File ]
mod - rts/Game/UI/GameInfo.cpp Diff ] File ]
mod - rts/Game/UI/GameSetupDrawer.cpp Diff ] File ]
mod - rts/Game/UI/Groups/Group.cpp Diff ] File ]
mod - rts/Game/UI/Groups/Group.h Diff ] File ]
mod - rts/Game/UI/Groups/GroupHandler.cpp Diff ] File ]
mod - rts/Game/UI/Groups/GroupHandler.h 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/HwMouseCursor.h Diff ] File ]
mod - rts/Game/UI/InfoConsole.cpp Diff ] File ]
mod - rts/Game/UI/InfoConsole.h Diff ] File ]
mod - rts/Game/UI/InputReceiver.cpp Diff ] File ]
mod - rts/Game/UI/InputReceiver.h Diff ] File ]
mod - rts/Game/UI/KeyBindings.cpp 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/MouseHandler.h Diff ] File ]
mod - rts/Game/UI/PlayerRoster.cpp Diff ] File ]
mod - rts/Game/UI/PlayerRoster.h Diff ] File ]
mod - rts/Game/UI/ProfileDrawer.cpp Diff ] File ]
mod - rts/Game/UI/ProfileDrawer.h Diff ] File ]
mod - rts/Game/UI/QuitBox.cpp Diff ] File ]
mod - rts/Game/UI/ResourceBar.cpp Diff ] File ]
mod - rts/Game/UI/SelectionKeyHandler.cpp Diff ] File ]
mod - rts/Game/UI/SelectionKeyHandler.h Diff ] File ]
mod - rts/Game/UI/TooltipConsole.cpp 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/WaitCommandsAI.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.h Diff ] File ]
mod - rts/Game/WordCompletion.cpp Diff ] File ]
mod - rts/Lua/CMakeLists.txt Diff ] File ]
mod - rts/Lua/LuaArchive.cpp Diff ] File ]
mod - rts/Lua/LuaArchive.h Diff ] File ]
mod - rts/Lua/LuaCallInCheck.h Diff ] File ]
mod - rts/Lua/LuaConstCMD.cpp Diff ] File ]
add - rts/Lua/LuaConstEngine.cpp Diff ] File ]
add - rts/Lua/LuaConstEngine.h Diff ] File ]
mod - rts/Lua/LuaConstGL.cpp Diff ] File ]
mod - rts/Lua/LuaConstGame.cpp Diff ] File ]
mod - rts/Lua/LuaConstGame.h Diff ] File ]
add - rts/Lua/LuaConstPlatform.cpp Diff ] File ]
add - rts/Lua/LuaConstPlatform.h Diff ] File ]
mod - rts/Lua/LuaContextData.h Diff ] File ]
mod - rts/Lua/LuaDefs.h Diff ] File ]
mod - rts/Lua/LuaDisplayLists.h Diff ] File ]
mod - rts/Lua/LuaFBOs.cpp Diff ] File ]
mod - rts/Lua/LuaFBOs.h 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/LuaGaia.h 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/LuaHandleSynced.h Diff ] File ]
mod - rts/Lua/LuaIO.cpp Diff ] File ]
mod - rts/Lua/LuaInputReceiver.cpp Diff ] File ]
mod - rts/Lua/LuaInputReceiver.h Diff ] File ]
mod - rts/Lua/LuaIntro.cpp Diff ] File ]
mod - rts/Lua/LuaIntro.h Diff ] File ]
mod - rts/Lua/LuaMaterial.cpp Diff ] File ]
mod - rts/Lua/LuaMaterial.h Diff ] File ]
add - rts/Lua/LuaMemPool.cpp Diff ] File ]
add - rts/Lua/LuaMemPool.h Diff ] File ]
add - rts/Lua/LuaMenu.cpp Diff ] File ]
add - rts/Lua/LuaMenu.h Diff ] File ]
mod - rts/Lua/LuaMetalMap.cpp Diff ] File ]
mod - rts/Lua/LuaObjectMaterial.h Diff ] File ]
mod - rts/Lua/LuaObjectRendering.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/LuaOpenGLUtils.h 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/LuaRBOs.h Diff ] File ]
mod - rts/Lua/LuaRules.cpp Diff ] File ]
mod - rts/Lua/LuaRules.h Diff ] File ]
mod - rts/Lua/LuaRulesParams.h Diff ] File ]
mod - rts/Lua/LuaScream.cpp Diff ] File ]
mod - rts/Lua/LuaScream.h Diff ] File ]
mod - rts/Lua/LuaShaders.cpp Diff ] File ]
mod - rts/Lua/LuaShaders.h 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/LuaTextures.cpp Diff ] File ]
mod - rts/Lua/LuaTextures.h Diff ] File ]
mod - rts/Lua/LuaUI.cpp Diff ] File ]
mod - rts/Lua/LuaUI.h Diff ] File ]
mod - rts/Lua/LuaUICommand.cpp Diff ] File ]
mod - rts/Lua/LuaUnitDefs.cpp 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.cpp Diff ] File ]
mod - rts/Lua/LuaUtils.h Diff ] File ]
mod - rts/Lua/LuaVFS.cpp Diff ] File ]
mod - rts/Lua/LuaVFSDownload.cpp Diff ] File ]
mod - rts/Lua/LuaVFSDownload.h 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/BasicMapDamage.cpp Diff ] File ]
mod - rts/Map/BasicMapDamage.h Diff ] File ]
mod - rts/Map/CMakeLists.txt Diff ] File ]
mod - rts/Map/Generation/MapGenerator.cpp Diff ] File ]
mod - rts/Map/Generation/MapGenerator.h Diff ] File ]
mod - rts/Map/Ground.cpp Diff ] File ]
mod - rts/Map/Ground.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/SM3/terrain/Lightcalc.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/Terrain.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTexture.cpp Diff ] File ]