2025-08-25 03:39 CEST

spring: develop dc209781 Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2009-10-04 18:07:34 develop 371fbd66
Changeset Merge commit 'origin/master' into cppintnew

Conflicts:
    AI/Interfaces/C/CMakeLists.txt
    AI/Interfaces/Java/CMakeLists.txt
    AI/SConscript
    AI/Wrappers/LegacyCpp/CMakeLists.txt
    AI/Wrappers/Cpp/CMakeLists.txt
    CMakeLists.txt
mod - .gitmodules Diff ] File ]
mod - AI/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/C/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 ]
mod - AI/Interfaces/Java/bin/java_wrappCallbackOO.awk Diff ] File ]
mod - AI/Interfaces/Java/bin/jna_wrappCallback.awk Diff ] File ]
mod - AI/Interfaces/Java/bin/jna_wrappCommands.awk Diff ] File ]
mod - AI/Interfaces/Java/bin/jna_wrappEvents.awk Diff ] File ]
mod - AI/Interfaces/Java/data/jvm.properties Diff ] File ]
mod - AI/Interfaces/Java/src/native/InterfaceDefines.h Diff ] File ]
mod - AI/Interfaces/Java/src/native/JavaBridge.c Diff ] File ]
mod - AI/Interfaces/Java/src/native/JavaBridge.h Diff ] File ]
mod - AI/SConscript Diff ] File ]
mod - AI/Skirmish/AAI/AAI ReadMe.txt Diff ] File ]
mod - AI/Skirmish/AAI/AAIExecute.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIMap.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIMap.h Diff ] File ]
mod - AI/Skirmish/AAI/data/ReadMe.txt Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/A-A-SBetaPack1.9B.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/AA3.2.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/BOTA_13.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/Expand&Exterminate v0.163.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/OTA_Classic_TA.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/OTA_Shiny_TA.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/OTA_with_Evolva_models.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/OTA_with_UTASP_BP.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/S44_Installer_Version.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/SmallMod.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/SpringWD5B65.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/TABFForSPRINGv15.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/TBT12.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/TLLv104.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/XTAPE.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/XTA_Installer_Version.cfg Diff ] File ]
mod - AI/Skirmish/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/E323AI Diff ] File ]
add - AI/Skirmish/HughAI Diff ] File ]
mod - AI/Skirmish/KAIK/KAIK.cpp Diff ] File ]
mod - AI/Wrappers/CUtils/bin/commonDoc.awk Diff ] File ]
mod - AI/Wrappers/Cpp/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/CMakeLists.txt Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
add - Documentation/SelectionKeys.txt Diff ] File ]
mod - Documentation/SpringStartScript.txt Diff ] File ]
mod - Documentation/changelog.txt Diff ] File ]
mod - Documentation/cmds.txt Diff ] File ]
mod - Doxyfile Diff ] File ]
mod - SConstruct Diff ] File ]
mod - game/LuaUI/callins.lua Diff ] File ]
mod - game/LuaUI/widgets.lua Diff ] File ]
add - installer/7za.exe Diff ] File ]
mod - installer/builddata/bitmaps/modinfo.lua Diff ] File ]
mod - installer/builddata/maphelper/modinfo.lua Diff ] File ]
mod - installer/builddata/springcontent/LuaGadgets/Gadgets/unit_script.lua Diff ] File ]
rm - installer/builddata/springcontent/LuaGadgets/Gadgets/unit_script_library.lua Diff ] File ]
mod - installer/builddata/springcontent/LuaGadgets/system.lua Diff ] File ]
mod - installer/builddata/springcontent/gamedata/VFSUtils.lua Diff ] File ]
mod - installer/builddata/springcontent/gamedata/unit_script_header.lua Diff ] File ]
rm - installer/builddata/springcontent/gamedata/unit_script_library_header.lua Diff ] File ]
mod - installer/builddata/springcontent/modinfo.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/terrainSimpleCopyVS.glsl Diff ] File ]
mod - installer/builddata/springcontent/shaders/terrainVertexShader.glsl Diff ] File ]
mod - installer/builddata/springcontent/shaders/waterRefractT2D.fp Diff ] File ]
mod - installer/builddata/springcontent/shaders/waterRefractTR.fp Diff ] File ]
add - installer/dos2unix.exe Diff ] File ]
mod - installer/freedesktop/applications/spring.desktop Diff ] File ]
mod - installer/make_gamedata_arch.bat Diff ] File ]
mod - installer/make_gamedata_arch.sh Diff ] File ]
mod - installer/sections/docs.nsh Diff ] File ]
mod - rts/ExternalAI/AICallback.cpp Diff ] File ]
mod - rts/ExternalAI/AICallback.h Diff ] File ]
mod - rts/ExternalAI/AICheats.cpp Diff ] File ]
mod - rts/ExternalAI/AIInterfaceLibrary.cpp Diff ] File ]
mod - rts/ExternalAI/AIInterfaceLibrary.h Diff ] File ]
mod - rts/ExternalAI/AIInterfaceLibraryInfo.cpp Diff ] File ]
mod - rts/ExternalAI/AIInterfaceLibraryInfo.h Diff ] File ]
mod - rts/ExternalAI/AILibraryManager.cpp Diff ] File ]
mod - rts/ExternalAI/AILibraryManager.h Diff ] File ]
mod - rts/ExternalAI/AISCommands.cpp Diff ] File ]
mod - rts/ExternalAI/EngineOutHandler.cpp Diff ] File ]
mod - rts/ExternalAI/EngineOutHandler.h Diff ] File ]
mod - rts/ExternalAI/IAICallback.h Diff ] File ]
rm - rts/ExternalAI/IAIInterfaceLibrary.h Diff ] File ]
mod - rts/ExternalAI/IAILibraryManager.h Diff ] File ]
rm - rts/ExternalAI/ISkirmishAI.h Diff ] File ]
rm - rts/ExternalAI/ISkirmishAILibrary.h Diff ] File ]
mod - rts/ExternalAI/Interface/AISCommands.h Diff ] File ]
mod - rts/ExternalAI/Interface/SSkirmishAICallback.h Diff ] File ]
add - rts/ExternalAI/LuaAIImplHandler.cpp Diff ] File ]
add - rts/ExternalAI/LuaAIImplHandler.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/SkirmishAI.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAI.h Diff ] File ]
add - rts/ExternalAI/SkirmishAIBase.h Diff ] File ]
add - rts/ExternalAI/SkirmishAIData.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIData.h Diff ] File ]
add - rts/ExternalAI/SkirmishAIHandler.cpp Diff ] File ]
add - rts/ExternalAI/SkirmishAIHandler.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAILibrary.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAILibrary.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAILibraryInfo.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAILibraryInfo.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.h 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 ]
rm - rts/Game/Camera/LuaCameraCtrl.cpp Diff ] File ]
rm - rts/Game/Camera/LuaCameraCtrl.h 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/RotOverheadController.h 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/Camera/TWController.h Diff ] File ]
mod - rts/Game/CameraHandler.cpp Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/Game.h 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/Player.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 ]
mod - rts/Game/PlayerHandler.h Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/SelectMenu.cpp Diff ] File ]
mod - rts/Game/SelectMenu.h Diff ] File ]
mod - rts/Game/SelectedUnits.cpp Diff ] File ]
mod - rts/Game/SelectedUnits.h Diff ] File ]
add - rts/Game/Server/GameSkirmishAI.h Diff ] File ]
mod - rts/Game/Server/MsgStrings.h Diff ] File ]
mod - rts/Game/StartScripts/AirScript.cpp Diff ] File ]
mod - rts/Game/StartScripts/CommanderScript.cpp Diff ] File ]
rm - rts/Game/StartScripts/CommanderScript2.cpp Diff ] File ]
rm - rts/Game/StartScripts/CommanderScript2.h Diff ] File ]
mod - rts/Game/StartScripts/ScriptHandler.cpp Diff ] File ]
mod - rts/Game/StartScripts/SkirmishAITestScript.cpp Diff ] File ]
mod - rts/Game/StartScripts/SkirmishAITestScript.h Diff ] File ]
mod - rts/Game/StartScripts/SpawnScript.cpp Diff ] File ]
add - rts/Game/TeamController.h Diff ] File ]
mod - rts/Game/UI/CursorIcons.cpp Diff ] File ]
mod - rts/Game/UI/GameSetupDrawer.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/KeyAutoBinder.cpp Diff ] File ]
mod - rts/Game/UI/KeyBindings.cpp Diff ] File ]
mod - rts/Game/UI/MouseCursor.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.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/StartPosSelecter.cpp Diff ] File ]
mod - rts/Game/UI/TooltipConsole.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/LuaConstCOB.h 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/LuaMaterial.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGL.cpp Diff ] File ]
mod - rts/Lua/LuaParser.cpp Diff ] File ]
mod - rts/Lua/LuaParser.h Diff ] File ]
mod - rts/Lua/LuaRules.cpp Diff ] File ]
mod - rts/Lua/LuaRules.h Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.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/LuaUnitRendering.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/LuaUtils.h Diff ] File ]
mod - rts/Lua/LuaVFS.cpp Diff ] File ]
mod - rts/Lua/LuaVFS.h Diff ] File ]
mod - rts/Map/BaseGroundDrawer.cpp Diff ] File ]
mod - rts/Map/BasicMapDamage.cpp Diff ] File ]
mod - rts/Map/ReadMap.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTexture.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTextureGLSL.cpp Diff ] File ]
mod - rts/Map/SMF/SmfReadMap.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvTreeDrawer.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/BumpWater.cpp Diff ] File ]
mod - rts/Rendering/Env/GrassDrawer.cpp Diff ] File ]
mod - rts/Rendering/InMapDraw.cpp Diff ] File ]
mod - rts/Rendering/ShadowHandler.cpp Diff ] File ]
mod - rts/Rendering/Textures/TextureAtlas.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/3DModel.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/3DModel.h Diff ] File ]
mod - rts/Rendering/UnitModels/UnitDrawer.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/UnitDrawer.h Diff ] File ]
mod - rts/Sim/Features/Feature.cpp Diff ] File ]
mod - rts/Sim/Features/Feature.h Diff ] File ]
mod - rts/Sim/Features/FeatureDef.cpp Diff ] File ]
mod - rts/Sim/Features/FeatureDef.h Diff ] File ]
mod - rts/Sim/Features/FeatureHandler.cpp Diff ] File ]
mod - rts/Sim/Features/FeatureHandler.h Diff ] File ]
mod - rts/Sim/Features/FeatureSet.h Diff ] File ]
mod - rts/Sim/Misc/CollisionHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/CommonDefHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/GeometricObjects.cpp Diff ] File ]
mod - rts/Sim/Misc/GlobalConstants.h Diff ] File ]
mod - rts/Sim/Misc/GlobalSynced.cpp Diff ] File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.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 ]
mod - rts/Sim/Misc/ResourceMapAnalyzer.cpp Diff ] File ]
mod - rts/Sim/Misc/ResourceMapAnalyzer.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 ]
mod - rts/Sim/Misc/TeamHandler.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/Objects/SolidObject.cpp Diff ] File ]
mod - rts/Sim/Objects/SolidObject.h Diff ] File ]
mod - rts/Sim/Objects/WorldObject.h Diff ] File ]
mod - rts/Sim/Path/PathEstimator.cpp Diff ] File ]
mod - rts/Sim/Path/PathManager.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ExpGenSpawner.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ExplosionGenerator.cpp Diff ] File ]
mod - rts/Sim/Projectiles/FireProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/FlareProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/PieceProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ProjectileHandler.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/BeamLaserProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/EmgProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/ExplosiveProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/FireBallProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/FlameProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/LargeBeamLaserProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/LaserProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/LightningProjectile.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/TorpedoProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.h Diff ] File ]
mod - rts/Sim/Units/COB/CobDefines.h Diff ] File ]
mod - rts/Sim/Units/COB/CobFile.cpp Diff ] File ]
mod - rts/Sim/Units/COB/CobFile.h Diff ] File ]
mod - rts/Sim/Units/COB/CobInstance.cpp Diff ] File ]
mod - rts/Sim/Units/COB/CobInstance.h Diff ] File ]
mod - rts/Sim/Units/COB/CobThread.cpp Diff ] File ]
add - rts/Sim/Units/COB/LuaScriptNames.cpp Diff ] File ]
add - rts/Sim/Units/COB/LuaScriptNames.h Diff ] File ]
mod - rts/Sim/Units/COB/LuaUnitScript.cpp Diff ] File ]
mod - rts/Sim/Units/COB/LuaUnitScript.h Diff ] File ]
mod - rts/Sim/Units/COB/NullUnitScript.cpp Diff ] File ]
mod - rts/Sim/Units/COB/NullUnitScript.h Diff ] File ]
mod - rts/Sim/Units/COB/UnitScript.cpp Diff ] File ]
mod - rts/Sim/Units/COB/UnitScript.h Diff ] File ]
mod - rts/Sim/Units/COB/UnitScriptFactory.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/AirCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/AirCAI.h 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/CommandAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/CommandAI.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/FactoryCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/FactoryCAI.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/TransportCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/TransportCAI.h Diff ] File ]