2025-08-04 02:51 CEST

spring: develop 508dc44a Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2010-01-19 19:09:08 develop cdb02269
Changeset Merge commit '0.81.0' into springheadless

Conflicts:
    rts/CMakeLists.txt
mod - .gitmodules Diff ] File ]
add - .mailmap Diff ] File ]
mod - AI/Interfaces/C/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/Java/CMakeLists.txt Diff ] File ]
mod - AI/SConscript Diff ] File ]
mod - AI/Skirmish/AAI/AAIBrain.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIMap.cpp Diff ] File ]
mod - AI/Skirmish/AAI/data/FAQ.txt Diff ] File ]
mod - AI/Skirmish/AAI/data/ReadMe.txt Diff ] File ]
mod - AI/Skirmish/AAI/data/cfg/general.cfg Diff ] File ]
mod - AI/Skirmish/AAI/data/cfg/help/example_general.cfg Diff ] File ]
mod - AI/Skirmish/AAI/data/cfg/help/example_mod.cfg Diff ] File ]
mod - AI/Skirmish/AAI/data/cfg/mod/AA5.0project.cfg Diff ] File ]
mod - AI/Skirmish/AAI/data/cfg/mod/AAIA10.cfg Diff ] File ]
mod - AI/Skirmish/AAI/data/cfg/mod/CA-BETA1.cfg Diff ] File ]
mod - AI/Skirmish/AAI/data/cfg/mod/KuroTA-v047.cfg Diff ] File ]
mod - AI/Skirmish/AAI/data/cfg/mod/StarWars01.cfg Diff ] File ]
mod - AI/Skirmish/AAI/data/cfg/mod/XTAPEV958.cfg Diff ] File ]
mod - AI/Skirmish/AAI/data/cfg/mod/XTAPEV9585.cfg Diff ] File ]
mod - AI/Skirmish/E323AI Diff ] File ]
mod - AI/Skirmish/HughAI Diff ] File ]
mod - AI/Skirmish/KAIK/AIExport.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/AttackGroup.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/AttackGroup.h Diff ] File ]
mod - AI/Skirmish/KAIK/AttackHandler.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/BuildUp.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/KAIK/DGunController.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/DefenseMatrix.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/Defines.h Diff ] File ]
mod - AI/Skirmish/KAIK/EconomyTracker.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/EconomyTracker.h Diff ] File ]
mod - AI/Skirmish/KAIK/KAIK.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/KAIK.h Diff ] File ]
mod - AI/Skirmish/KAIK/MTRand.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/MTRand.h Diff ] File ]
mod - AI/Skirmish/KAIK/MetalMaker.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/MetalMap.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/MicroPather.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/MicroPather.h Diff ] File ]
mod - AI/Skirmish/KAIK/PathFinder.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/SpotFinder.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/ThreatMap.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/Unit.h Diff ] File ]
mod - AI/Skirmish/KAIK/UnitHandler.cpp Diff ] File ]
rm - AI/Skirmish/NTai Diff ] File ]
mod - AI/Skirmish/NullAI/data/AIOptions.lua Diff ] File ]
rm - AI/Skirmish/NullLegacyCppAI/CMakeLists.txt Diff ] File ]
rm - AI/Skirmish/NullLegacyCppAI/VERSION Diff ] File ]
rm - AI/Skirmish/NullLegacyCppAI/data/AIInfo.lua Diff ] File ]
rm - AI/Skirmish/NullLegacyCppAI/data/AIOptions.lua Diff ] File ]
rm - AI/Skirmish/NullLegacyCppAI/src/AIExport.cpp Diff ] File ]
rm - AI/Skirmish/NullLegacyCppAI/src/AIExport.h Diff ] File ]
rm - AI/Skirmish/NullLegacyCppAI/src/TestGlobalAI.cpp Diff ] File ]
rm - AI/Skirmish/NullLegacyCppAI/src/TestGlobalAI.h Diff ] File ]
mod - AI/Skirmish/RAI/Builder.h Diff ] File ]
mod - AI/Skirmish/RAI/BuilderPlacement.h Diff ] File ]
mod - AI/Skirmish/RAI/CombatManager.cpp Diff ] File ]
mod - AI/Skirmish/RAI/GResourceMap.cpp Diff ] File ]
mod - AI/Skirmish/RAI/GResourceMap.h Diff ] File ]
mod - AI/Skirmish/RAI/GTerrainMap.cpp Diff ] File ]
mod - AI/Skirmish/RAI/LogFile.cpp Diff ] File ]
mod - AI/Skirmish/RAI/LogFile.h Diff ] File ]
mod - AI/Skirmish/RAI/RAI.cpp Diff ] File ]
mod - AI/Skirmish/RAI/RAI.h Diff ] File ]
mod - AI/Skirmish/RAI/UnitDefHandler.cpp Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - Documentation/changelog.txt Diff ] File ]
add - Documentation/manpages/make_manpages.sh Diff ] File ]
add - Documentation/manpages/spring-dedicated.6.txt Diff ] File ]
add - Documentation/manpages/spring.6.txt Diff ] File ]
mod - game/uikeys.txt Diff ] File ]
mod - installer/builddata/springcontent/LuaGadgets/gadgets.lua Diff ] File ]
mod - installer/builddata/springcontent/gamedata/explosions.lua Diff ] File ]
mod - installer/builddata/springcontent/gamedata/featuredefs.lua Diff ] File ]
mod - installer/builddata/springcontent/gamedata/parse_fbi.lua Diff ] File ]
mod - installer/builddata/springcontent/gamedata/weapondefs.lua Diff ] File ]
mod - installer/builddata/springcontent/shaders/terrainCommon.glsl Diff ] File ]
mod - installer/builddata/springcontent/shaders/terrainFragmentShader.glsl Diff ] File ]
mod - installer/builddata/springcontent/shaders/terrainSimpleCopyFS.glsl Diff ] File ]
mod - installer/builddata/springcontent/shaders/terrainVertexShader.glsl Diff ] File ]
rm - installer/builddata/springcontent/shaders/unit_shadow.fp Diff ] File ]
rm - installer/make_portable.sh Diff ] File ]
mod - installer/make_source_package.sh Diff ] File ]
rm - installer/pkzip.exe Diff ] File ]
mod - installer/sections/sectiondesc.nsh Diff ] File ]
mod - installer/spring.nsi Diff ] File ]
mod - installer/springlobby_download.sh Diff ] File ]
mod - rts/CMakeLists.txt Diff ] File ]
mod - rts/ExternalAI/AICallback.cpp Diff ] File ]
mod - rts/ExternalAI/IGlobalAI.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/SkirmishAIWrapper.cpp Diff ] File ]
mod - rts/Game/Camera.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/OverviewController.cpp Diff ] File ]
mod - rts/Game/Camera/SmoothController.cpp Diff ] File ]
mod - rts/Game/CameraHandler.cpp Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/GameHelper.cpp 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/Player.h Diff ] File ]
mod - rts/Game/PlayerBase.cpp Diff ] File ]
mod - rts/Game/PlayerBase.h Diff ] File ]
mod - rts/Game/PlayerHandler.cpp Diff ] File ]
add - rts/Game/PlayerStatistics.cpp Diff ] File ]
add - rts/Game/PlayerStatistics.h Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/PreGame.h Diff ] File ]
mod - rts/Game/SelectedUnits.cpp Diff ] File ]
mod - rts/Game/Server/GameParticipant.cpp Diff ] File ]
mod - rts/Game/Server/GameParticipant.h Diff ] File ]
mod - rts/Game/Server/MsgStrings.h Diff ] File ]
mod - rts/Game/StartScripts/SkirmishAITestScript.cpp Diff ] File ]
mod - rts/Game/UI/GameInfo.cpp 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/KeyBindings.cpp Diff ] File ]
mod - rts/Game/UI/LuaUI.cpp Diff ] File ]
mod - rts/Game/UI/MiniMap.cpp Diff ] File ]
mod - rts/Game/UI/MouseCursor.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.h Diff ] File ]
mod - rts/Game/UI/QuitBox.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.cpp Diff ] File ]
mod - rts/Game/WordCompletion.cpp Diff ] File ]
mod - rts/Lua/LuaConstGL.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.h Diff ] File ]
mod - rts/Lua/LuaMaterial.cpp 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/LuaSyncedMoveCtrl.h Diff ] File ]
mod - rts/Lua/LuaSyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedRead.h 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/LuaUnsyncedRead.h Diff ] File ]
mod - rts/Lua/LuaVFS.cpp Diff ] File ]
mod - rts/Map/BaseGroundDrawer.cpp 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/MapInfo.cpp Diff ] File ]
mod - rts/Map/MapInfo.h Diff ] File ]
mod - rts/Map/ReadMap.cpp Diff ] File ]
mod - rts/Map/ReadMap.h Diff ] File ]
mod - rts/Map/SM3/Sm3GroundDrawer.cpp Diff ] File ]
mod - rts/Map/SM3/Sm3Map.cpp Diff ] File ]
mod - rts/Map/SM3/Sm3Map.h Diff ] File ]
mod - rts/Map/SM3/terrain/Terrain.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/Terrain.h Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTexture.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTexture.h Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTextureGLSL.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTextureGLSL.h Diff ] File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp Diff ] File ]
mod - rts/Map/SMF/BFGroundTextures.cpp Diff ] File ]
mod - rts/Map/SMF/BFGroundTextures.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 ]
add - rts/Menu/LobbyConnection.cpp Diff ] File ]
add - rts/Menu/LobbyConnection.h Diff ] File ]
add - rts/Menu/UpdaterWindow.cpp Diff ] File ]
add - rts/Menu/UpdaterWindow.h Diff ] File ]
mod - rts/Rendering/Env/AdvTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvWater.cpp Diff ] File ]
mod - rts/Rendering/Env/BaseTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BaseTreeDrawer.h Diff ] File ]
mod - rts/Rendering/Env/BasicTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BumpWater.cpp Diff ] File ]
mod - rts/Rendering/Env/BumpWater.h Diff ] File ]
add - rts/Rendering/Env/CubeMapHandler.cpp Diff ] File ]
add - rts/Rendering/Env/CubeMapHandler.h Diff ] File ]
mod - rts/Rendering/Env/DynWater.cpp Diff ] File ]
mod - rts/Rendering/FartextureHandler.cpp Diff ] File ]
mod - rts/Rendering/FartextureHandler.h Diff ] File ]
mod - rts/Rendering/GL/FBO.cpp Diff ] File ]
mod - rts/Rendering/GL/myGL.cpp Diff ] File ]
mod - rts/Rendering/GL/myGL.h Diff ] File ]
mod - rts/Rendering/GroundDecalHandler.cpp Diff ] File ]
mod - rts/Rendering/HUDDrawer.cpp Diff ] File ]
mod - rts/Rendering/HUDDrawer.h Diff ] File ]
mod - rts/Rendering/InMapDraw.cpp Diff ] File ]
mod - rts/Rendering/InMapDraw.h Diff ] File ]
add - rts/Rendering/Screenshot.cpp Diff ] File ]
add - rts/Rendering/Screenshot.h Diff ] File ]
add - rts/Rendering/Shaders/Shader.cpp Diff ] File ]
add - rts/Rendering/Shaders/Shader.hpp Diff ] File ]
add - rts/Rendering/Shaders/ShaderHandler.cpp Diff ] File ]
add - rts/Rendering/Shaders/ShaderHandler.hpp Diff ] File ]
mod - rts/Rendering/ShadowHandler.cpp Diff ] File ]
mod - rts/Rendering/ShadowHandler.h Diff ] File ]
mod - rts/Rendering/Textures/3DOTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/Textures/Bitmap.cpp Diff ] File ]
mod - rts/Rendering/Textures/Bitmap.h Diff ] File ]
mod - rts/Rendering/Textures/ColorMap.cpp Diff ] File ]
mod - rts/Rendering/Textures/S3OTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/Textures/TAPalette.cpp Diff ] File ]
mod - rts/Rendering/Textures/TAPalette.h Diff ] File ]
mod - rts/Rendering/Textures/TextureAtlas.cpp Diff ] File ]
add - rts/Rendering/UnitModels/FeatureDrawer.cpp Diff ] File ]
add - rts/Rendering/UnitModels/FeatureDrawer.h Diff ] File ]
mod - rts/Rendering/UnitModels/UnitDrawer.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/UnitDrawer.h Diff ] File ]
mod - rts/Rendering/glFont.cpp Diff ] File ]
mod - rts/Sim/Features/Feature.cpp Diff ] File ]
mod - rts/Sim/Features/FeatureHandler.cpp Diff ] File ]
mod - rts/Sim/Features/FeatureHandler.h Diff ] File ]
rm - rts/Sim/Features/FeatureSet.cpp Diff ] File ]
mod - rts/Sim/Features/FeatureSet.h Diff ] File ]
mod - rts/Sim/Misc/CategoryHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/CategoryHandler.h Diff ] File ]
mod - rts/Sim/Misc/GlobalSynced.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 ]
add - rts/Sim/Misc/SmoothHeightMesh.cpp Diff ] File ]
add - rts/Sim/Misc/SmoothHeightMesh.h Diff ] File ]
mod - rts/Sim/Misc/Team.cpp Diff ] File ]
mod - rts/Sim/Misc/Team.h Diff ] File ]
mod - rts/Sim/Misc/TeamBase.cpp Diff ] File ]
mod - rts/Sim/Misc/TeamBase.h Diff ] File ]
add - rts/Sim/Misc/TeamStatistics.cpp Diff ] File ]
add - rts/Sim/Misc/TeamStatistics.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/AirMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/GroundMoveMath.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/GroundMoveMath.h Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/HoverMoveMath.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/HoverMoveMath.h 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/MoveMath/ShipMoveMath.h Diff ] File ]
mod - rts/Sim/MoveTypes/MoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveType.h Diff ] File ]
mod - rts/Sim/MoveTypes/ScriptMoveType.cpp Diff ] File ]
add - rts/Sim/MoveTypes/StaticMoveType.cpp Diff ] File ]
add - rts/Sim/MoveTypes/StaticMoveType.h Diff ] File ]
mod - rts/Sim/MoveTypes/TAAirMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/TAAirMoveType.h Diff ] File ]
mod - rts/Sim/Path/PathEstimator.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ProjectileHandler.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/Command.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/CommandAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/TransportCAI.cpp Diff ] File ]
mod - rts/Sim/Units/Groups/Group.cpp Diff ] File ]
mod - rts/Sim/Units/Groups/Group.h Diff ] File ]
mod - rts/Sim/Units/Groups/GroupHandler.cpp Diff ] File ]
mod - rts/Sim/Units/Groups/GroupHandler.h Diff ] File ]
mod - rts/Sim/Units/Unit.cpp Diff ] File ]
mod - rts/Sim/Units/Unit.h Diff ] File ]
mod - rts/Sim/Units/UnitDef.h Diff ] File ]
mod - rts/Sim/Units/UnitDefHandler.cpp Diff ] File ]
mod - rts/Sim/Units/UnitHandler.cpp Diff ] File ]
mod - rts/Sim/Units/UnitLoader.cpp Diff ] File ]
rm - rts/Sim/Units/UnitSet.cpp Diff ] File ]
mod - rts/Sim/Units/UnitSet.h Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Builder.cpp Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Builder.h Diff ] File ]
mod - rts/Sim/Units/UnitTypes/TransportUnit.cpp Diff ] File ]
mod - rts/System/BaseNetProtocol.cpp Diff ] File ]
mod - rts/System/BaseNetProtocol.h Diff ] File ]
mod - rts/System/DemoReader.cpp Diff ] File ]
mod - rts/System/DemoReader.h Diff ] File ]
mod - rts/System/DemoRecorder.cpp Diff ] File ]
mod - rts/System/DemoRecorder.h Diff ] File ]
mod - rts/System/EventClient.cpp Diff ] File ]
mod - rts/System/EventClient.h Diff ] File ]
mod - rts/System/EventHandler.cpp Diff ] File ]
mod - rts/System/EventHandler.h Diff ] File ]