2025-09-09 21:36 CEST

spring: develop 3613dea2 Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
abma abma develop 2015-09-06 18:07:58 develop 721529de
Changeset Merge branch 'develop' into pr-downloader

Conflicts:
    rts/System/EventBatchHandler.cpp
    rts/System/EventBatchHandler.h
    tools/pr-downloader
mod - .gitignore Diff ] File ]
mod - .travis.yml Diff ] File ]
mod - AI/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/C/src/Interface.cpp 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/InterfaceExport.c Diff ] File ]
mod - AI/Interfaces/Java/src/main/native/JavaBridge.c Diff ] File ]
mod - AI/Interfaces/Java/src/main/native/JniUtil.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/AAIBuildTable.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIConfig.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIConfig.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIConstructor.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIExecute.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIMap.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AIExport.cpp Diff ] File ]
mod - AI/Skirmish/AAI/aidef.h Diff ] File ]
mod - AI/Skirmish/E323AI Diff ] File ]
mod - AI/Skirmish/KAIK Diff ] File ]
mod - AI/Skirmish/RAI/AIExport.cpp Diff ] File ]
mod - AI/Skirmish/Shard Diff ] File ]
mod - AI/Wrappers/CUtils/SimpleLog.c Diff ] File ]
mod - AI/Wrappers/CUtils/SimpleLog.h 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/IAICallback.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/UnitDef.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/UnitDef.h Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - buildbot/master/cleanup.sh Diff ] File ]
mod - buildbot/master/master.cfg Diff ] File ]
mod - buildbot/slave/create-build-dirs.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/stacktrace_translator/stacktrace_translator.py Diff ] File ]
mod - cont/CMakeLists.txt Diff ] File ]
mod - cont/LuaUI/callins.lua Diff ] File ]
mod - cont/LuaUI/widgets.lua 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/gamedata/weapondefs_post.lua Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/infoLOS.lua 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 - 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/Interface/AISCommands.h Diff ] File ]
mod - rts/ExternalAI/Interface/SAIInterfaceCallback.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/SAIInterfaceCallbackImpl.h Diff ] File ]
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp Diff ] File ]
mod - rts/ExternalAI/SSkirmishAICallbackImpl.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIHandler.h Diff ] File ]
mod - rts/Game/Benchmark.cpp Diff ] File ]
mod - rts/Game/Camera/FreeController.cpp Diff ] File ]
mod - rts/Game/Camera/SpringController.cpp 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 ]
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/InMapDraw.cpp Diff ] File ]
mod - rts/Game/Players/PlayerHandler.cpp Diff ] File ]
mod - rts/Game/Players/PlayerHandler.h Diff ] File ]
mod - rts/Game/Players/TeamController.h Diff ] File ]
mod - rts/Game/PreGame.cpp 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/UI/EndGameBox.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/HwMouseCursor.cpp Diff ] File ]
mod - rts/Game/UI/KeyCodes.cpp Diff ] File ]
mod - rts/Game/UI/MiniMap.cpp Diff ] File ]
mod - rts/Game/UI/MiniMap.h Diff ] File ]
mod - rts/Game/UI/MouseHandler.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.h Diff ] File ]
mod - rts/Game/UI/ProfileDrawer.cpp Diff ] File ]
mod - rts/Game/UI/SelectionKeyHandler.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/UnsyncedGameCommands.cpp Diff ] File ]
mod - rts/Lua/LuaConstCOB.cpp Diff ] File ]
mod - rts/Lua/LuaContextData.h Diff ] File ]
mod - rts/Lua/LuaDisplayLists.h Diff ] File ]
rm - 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/LuaHandle.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.h Diff ] File ]
mod - rts/Lua/LuaHandleSynced.cpp Diff ] File ]
mod - rts/Lua/LuaHashString.h Diff ] File ]
mod - rts/Lua/LuaIO.cpp Diff ] File ]
mod - rts/Lua/LuaIO.h Diff ] File ]
mod - rts/Lua/LuaOpenGL.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/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaUtils.h Diff ] File ]
mod - rts/Lua/LuaVFSDownload.cpp Diff ] File ]
mod - rts/Lua/LuaWeaponDefs.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/Ground.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/ReadMap.cpp Diff ] File ]
mod - rts/Map/ReadMap.h 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/Menu/SelectionWidget.cpp Diff ] File ]
mod - rts/Menu/SelectionWidget.h Diff ] File ]
mod - rts/Net/GameParticipant.cpp Diff ] File ]
mod - rts/Net/GameParticipant.h 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/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/AdvTreeDrawer.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/Decals/GroundDecalHandler.h Diff ] File ]
mod - rts/Rendering/Env/DynWater.cpp Diff ] File ]
mod - rts/Rendering/Env/IGroundDecalDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/ITreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/ITreeDrawer.h Diff ] File ]
mod - rts/Rendering/FeatureDrawer.cpp Diff ] File ]
mod - rts/Rendering/FeatureDrawer.h Diff ] File ]
mod - rts/Rendering/Fonts/glFont.cpp Diff ] File ]
mod - rts/Rendering/Fonts/glFont.h Diff ] File ]
mod - rts/Rendering/GL/VBO.cpp Diff ] File ]
mod - rts/Rendering/GL/glExtra.cpp Diff ] File ]
add - rts/Rendering/GL/glStateDebug.cpp Diff ] File ]
add - rts/Rendering/GL/glStateDebug.h Diff ] File ]
mod - rts/Rendering/GL/myGL.h Diff ] File ]
mod - rts/Rendering/GroundFlash.h Diff ] File ]
mod - rts/Rendering/HUDDrawer.cpp Diff ] File ]
mod - rts/Rendering/Map/InfoTexture/IInfoTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/Map/InfoTexture/Legacy/LegacyInfoTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/Map/InfoTexture/Modern/AirLos.cpp Diff ] File ]
mod - rts/Rendering/Map/InfoTexture/Modern/Combiner.cpp Diff ] File ]
mod - rts/Rendering/Map/InfoTexture/Modern/Height.cpp Diff ] File ]
mod - rts/Rendering/Map/InfoTexture/Modern/Los.cpp Diff ] File ]
mod - rts/Rendering/Map/InfoTexture/Modern/MetalExtraction.cpp Diff ] File ]
mod - rts/Rendering/Map/InfoTexture/Modern/Path.cpp Diff ] File ]
mod - rts/Rendering/Map/InfoTexture/Modern/Radar.cpp Diff ] File ]
mod - rts/Rendering/Map/InfoTexture/Modern/Radar.h Diff ] File ]
mod - rts/Rendering/Models/3DModel.h Diff ] File ]
mod - rts/Rendering/Models/3DOParser.cpp Diff ] File ]
mod - rts/Rendering/Models/AssParser.cpp Diff ] File ]
mod - rts/Rendering/Models/ModelDrawer.cpp Diff ] File ]
mod - rts/Rendering/Models/ModelDrawer.h Diff ] File ]
mod - rts/Rendering/Models/WorldObjectModelRenderer.cpp Diff ] File ]
mod - rts/Rendering/Models/WorldObjectModelRenderer.h Diff ] File ]
mod - rts/Rendering/ProjectileDrawer.cpp Diff ] File ]
mod - rts/Rendering/ProjectileDrawer.h Diff ] File ]
mod - rts/Rendering/QTPFSPathDrawer.cpp Diff ] File ]
mod - rts/Rendering/Screenshot.cpp Diff ] File ]
mod - rts/Rendering/Shaders/GLSLCopyState.cpp Diff ] File ]
mod - rts/Rendering/Shaders/Shader.cpp Diff ] File ]
mod - rts/Rendering/Shaders/Shader.h Diff ] File ]
mod - rts/Rendering/Shaders/ShaderHandler.cpp Diff ] File ]
mod - rts/Rendering/Shaders/ShaderHandler.h Diff ] File ]
mod - rts/Rendering/ShadowHandler.cpp Diff ] File ]
mod - rts/Rendering/TeamHighlight.cpp Diff ] File ]
mod - rts/Rendering/Textures/Bitmap.cpp Diff ] File ]
mod - rts/Rendering/Textures/Bitmap.h Diff ] File ]
mod - rts/Rendering/Textures/nv_dds.cpp Diff ] File ]
mod - rts/Rendering/UnitDrawer.cpp Diff ] File ]
mod - rts/Rendering/UnitDrawer.h Diff ] File ]
mod - rts/Rendering/WorldDrawer.cpp Diff ] File ]
mod - rts/Sim/CMakeLists.txt Diff ] File ]
mod - rts/Sim/Features/Feature.cpp Diff ] File ]
mod - rts/Sim/Features/Feature.h Diff ] File ]
mod - rts/Sim/Features/FeatureHandler.cpp Diff ] File ]
mod - rts/Sim/Features/FeatureHandler.h Diff ] File ]
rm - rts/Sim/Misc/AirBaseHandler.cpp Diff ] File ]
rm - rts/Sim/Misc/AirBaseHandler.h Diff ] File ]
mod - rts/Sim/Misc/CollisionHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/DefinitionTag.cpp Diff ] File ]
mod - rts/Sim/Misc/DefinitionTag.h Diff ] File ]
mod - rts/Sim/Misc/GlobalConstants.h Diff ] File ]
mod - rts/Sim/Misc/GlobalSynced.cpp Diff ] File ]
mod - rts/Sim/Misc/GlobalSynced.h Diff ] File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.cpp Diff ] File ]
mod - rts/Sim/Misc/InterceptHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/InterceptHandler.h Diff ] File ]
mod - rts/Sim/Misc/LosHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/LosHandler.h Diff ] File ]
mod - rts/Sim/Misc/LosMap.cpp Diff ] File ]
mod - rts/Sim/Misc/LosMap.h Diff ] File ]
mod - rts/Sim/Misc/ModInfo.cpp Diff ] File ]
mod - rts/Sim/Misc/ModInfo.h Diff ] File ]
mod - rts/Sim/Misc/QuadField.cpp Diff ] File ]
mod - rts/Sim/Misc/QuadField.h Diff ] File ]
rm - rts/Sim/Misc/RadarHandler.cpp Diff ] File ]
rm - rts/Sim/Misc/RadarHandler.h Diff ] File ]
mod - rts/Sim/Misc/SimObjectIDPool.cpp Diff ] File ]
mod - rts/Sim/Misc/SimObjectIDPool.h Diff ] File ]
mod - rts/Sim/Misc/Team.cpp Diff ] File ]
mod - rts/Sim/Misc/Team.h Diff ] File ]
mod - rts/Sim/Misc/TeamHandler.h Diff ] File ]
mod - rts/Sim/Misc/Wind.cpp Diff ] File ]
mod - rts/Sim/Misc/Wind.h Diff ] File ]
mod - rts/Sim/MoveTypes/AAirMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/AAirMoveType.h Diff ] File ]
mod - rts/Sim/MoveTypes/ClassicGroundMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.h Diff ] File ]
mod - rts/Sim/MoveTypes/HoverAirMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/HoverAirMoveType.h Diff ] File ]
mod - rts/Sim/MoveTypes/MoveDefHandler.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveDefHandler.h Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/GroundMoveMath.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/HoverMoveMath.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.h Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/ShipMoveMath.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveType.h Diff ] File ]
mod - rts/Sim/MoveTypes/StrafeAirMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/StrafeAirMoveType.h Diff ] File ]
mod - rts/Sim/Objects/SolidObject.cpp Diff ] File ]
mod - rts/Sim/Objects/SolidObject.h Diff ] File ]
mod - rts/Sim/Objects/WorldObject.cpp Diff ] File ]
mod - rts/Sim/Objects/WorldObject.h Diff ] File ]
mod - rts/Sim/Path/Default/IPathFinder.cpp Diff ] File ]
mod - rts/Sim/Path/Default/IPathFinder.h Diff ] File ]
mod - rts/Sim/Path/Default/PathCache.cpp 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/PathEstimator.h Diff ] File ]
mod - rts/Sim/Path/Default/PathFinder.cpp Diff ] File ]
mod - rts/Sim/Path/Default/PathFinder.h Diff ] File ]
mod - rts/Sim/Path/Default/PathFinderDef.h Diff ] File ]
mod - rts/Sim/Path/Default/PathFlowMap.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/Path/QTPFS/Node.cpp Diff ] File ]
mod - rts/Sim/Path/QTPFS/Node.hpp Diff ] File ]
mod - rts/Sim/Path/QTPFS/NodeLayer.cpp Diff ] File ]
mod - rts/Sim/Path/QTPFS/PathDefines.hpp Diff ] File ]
mod - rts/Sim/Path/QTPFS/PathManager.cpp Diff ] File ]
mod - rts/Sim/Path/QTPFS/PathManager.hpp Diff ] File ]
mod - rts/Sim/Path/QTPFS/PathSearch.cpp Diff ] File ]
mod - rts/Sim/Path/QTPFS/PathSearch.hpp Diff ] File ]
mod - rts/Sim/Projectiles/ExpGenSpawner.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ExpGenSpawner.h Diff ] File ]
mod - rts/Sim/Projectiles/ExplosionGenerator.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ExplosionGenerator.h Diff ] File ]