2025-08-24 01:22 CEST

spring: develop f8ef6b38 Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2010-09-11 10:14:24 develop 1cebc6da
Changeset Merge remote branch 'origin/master' into pureint

Conflicts:
    AI/CMakeLists.txt
    AI/Skirmish/E323AI
    AI/Wrappers/LegacyCpp/AIAICallback.cpp
    rts/ExternalAI/AICallback.cpp
    rts/ExternalAI/Interface/AISCommands.h
    rts/ExternalAI/Interface/SSkirmishAICallback.h
    rts/ExternalAI/SSkirmishAICallbackImpl.cpp
    rts/ExternalAI/SSkirmishAICallbackImpl.h
    rts/Game/Game.cpp
    rts/Game/NetCommands.cpp
    rts/Sim/Units/UnitDef.h
    rts/System/BaseNetProtocol.h
    rts/System/Platform/Linux/X_MessageBox.cpp
mod - AI/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/Python Diff ] File ]
mod - AI/Skirmish/AAI/AAI.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIConfig.cpp Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/BA701.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/BA704.cfg Diff ] File ]
add - AI/Skirmish/AAI/data/cfg/mod/BOTA.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/Balanced_Annihilation_V7.1.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/Balanced_Annihilation_V7.11.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/Balanced_Annihilation_V7.12.cfg Diff ] File ]
mod - AI/Skirmish/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/E323AI Diff ] File ]
mod - AI/Skirmish/RAI/RAI.cpp Diff ] File ]
mod - AI/Skirmish/RAI/RAI.h 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 ]
add - buildbot/master/buildbot.mk Diff ] File ]
add - buildbot/slave/ld Diff ] File ]
mod - cont/LuaUI/Widgets/unit_metal_maker.lua Diff ] File ]
mod - cont/LuaUI/selector.lua Diff ] File ]
mod - cont/base/make_gamedata_arch.bat Diff ] File ]
mod - cont/base/make_gamedata_arch.sh Diff ] File ]
mod - cont/base/maphelper/maphelper/mapdefaults.lua Diff ] File ]
mod - cont/base/springcontent/EngineOptions.lua Diff ] File ]
add - cont/base/springcontent/LuaGadgets/Gadgets/game_end.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/Gadgets/game_spawn.lua Diff ] File ]
add - cont/base/springcontent/LuaGadgets/Gadgets/object_statusbars_default.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/Gadgets/share_delayed.lua Diff ] File ]
add - cont/base/springcontent/LuaGadgets/Gadgets/unit_limit_dgun.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/Gadgets/unit_script.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/callins.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/gadgets.lua Diff ] File ]
mod - doc/changelog.txt Diff ] File ]
mod - doc/manpages/spring-dedicated.6.txt Diff ] File ]
add - doc/manpages/spring-headless.6.txt Diff ] File ]
add - doc/manpages/spring-multithreaded.6.txt Diff ] File ]
mod - doc/manpages/spring.6.txt Diff ] File ]
mod - doc/releasechecklist.txt Diff ] File ]
rm - installer/checkdotnet.nsh Diff ] File ]
mod - installer/include/checkDotNetInstalled.nsh Diff ] File ]
add - installer/include/fileMisc.nsh Diff ] File ]
mod - installer/make_source_package.sh Diff ] File ]
mod - installer/sections/ensureDotNet.nsh Diff ] File ]
mod - installer/sections/main.nsh Diff ] File ]
add - installer/sections/portable.nsh Diff ] File ]
mod - installer/sections/sectiondesc.nsh Diff ] File ]
add - installer/sections/shortcuts_desktop.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/AIInterfaceLibraryInfo.cpp Diff ] File ]
mod - rts/ExternalAI/AILegacySupport.h Diff ] File ]
mod - rts/ExternalAI/EngineOutHandler.cpp Diff ] File ]
mod - rts/ExternalAI/IAILibraryManager.cpp Diff ] File ]
mod - rts/ExternalAI/Interface/AISCommands.h Diff ] File ]
mod - rts/ExternalAI/Interface/SSkirmishAICallback.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/SkirmishAILibraryInfo.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.cpp Diff ] File ]
mod - rts/Game/Action.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/GameVersion.cpp Diff ] File ]
add - rts/Game/LoadScreen.cpp Diff ] File ]
add - rts/Game/LoadScreen.h Diff ] File ]
add - rts/Game/NetCommands.cpp Diff ] File ]
mod - rts/Game/OSCStatsSender.cpp Diff ] File ]
mod - rts/Game/Player.cpp Diff ] File ]
mod - rts/Game/PlayerBase.cpp 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/SelectedUnits.cpp Diff ] File ]
mod - rts/Game/SelectedUnitsAI.cpp Diff ] File ]
mod - rts/Game/Server/GameParticipant.cpp Diff ] File ]
mod - rts/Game/Server/GameParticipant.h Diff ] File ]
add - rts/Game/SyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/UI/CommandColors.cpp Diff ] File ]
mod - rts/Game/UI/EndGameBox.cpp Diff ] File ]
mod - rts/Game/UI/EndGameBox.h Diff ] File ]
mod - rts/Game/UI/GameInfo.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/MiniMap.cpp Diff ] File ]
mod - rts/Game/UI/MouseCursor.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.cpp Diff ] File ]
mod - rts/Game/UI/QuitBox.cpp Diff ] File ]
add - rts/Game/UnsyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.cpp Diff ] File ]
mod - rts/Lua/LuaConstGame.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/LuaParser.cpp Diff ] File ]
mod - rts/Lua/LuaPathFinder.cpp 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/LuaUnitRendering.h 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/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/Ground.h Diff ] File ]
mod - rts/Map/MapDamage.cpp Diff ] File ]
mod - rts/Map/MapDamage.h Diff ] File ]
mod - rts/Map/MapInfo.cpp Diff ] File ]
mod - rts/Map/NoMapDamage.h Diff ] File ]
mod - rts/Map/ReadMap.cpp Diff ] File ]
mod - rts/Map/ReadMap.h Diff ] File ]
mod - rts/Map/SM3/Frustum.cpp Diff ] File ]
mod - rts/Map/SM3/Sm3Map.cpp Diff ] File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp Diff ] File ]
mod - rts/Map/SMF/BFGroundTextures.cpp Diff ] File ]
mod - rts/Map/SMF/SmfReadMap.cpp Diff ] File ]
mod - rts/Menu/SelectMenu.cpp Diff ] File ]
mod - rts/Menu/SelectionWidget.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvSky.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvSky.h Diff ] File ]
mod - rts/Rendering/Env/AdvTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvTreeGenerator.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvTreeGenerator.h Diff ] File ]
mod - rts/Rendering/Env/BaseSky.cpp Diff ] File ]
mod - rts/Rendering/Env/BaseTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BasicSky.cpp Diff ] File ]
mod - rts/Rendering/Env/BasicTreeDrawer.h Diff ] File ]
mod - rts/Rendering/Env/BumpWater.cpp Diff ] File ]
mod - rts/Rendering/Env/CubeMapHandler.cpp Diff ] File ]
mod - rts/Rendering/Env/CubeMapHandler.h Diff ] File ]
mod - rts/Rendering/Env/GrassDrawer.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/GL/myGL.cpp Diff ] File ]
mod - rts/Rendering/GL/myGL.h Diff ] File ]
mod - rts/Rendering/GroundFlash.cpp Diff ] File ]
add - rts/Rendering/IPathDrawer.cpp Diff ] File ]
add - rts/Rendering/IPathDrawer.h Diff ] File ]
mod - rts/Rendering/IconHandler.cpp Diff ] File ]
mod - rts/Rendering/InMapDraw.cpp Diff ] File ]
mod - rts/Rendering/Models/3DModel.cpp Diff ] File ]
mod - rts/Rendering/Models/3DModel.h Diff ] File ]
mod - rts/Rendering/Models/3DOParser.cpp Diff ] File ]
mod - rts/Rendering/Models/3DOParser.h Diff ] File ]
mod - rts/Rendering/Models/OBJParser.cpp Diff ] File ]
mod - rts/Rendering/Models/OBJParser.h Diff ] File ]
mod - rts/Rendering/Models/S3OParser.cpp Diff ] File ]
mod - rts/Rendering/Models/S3OParser.h Diff ] File ]
mod - rts/Rendering/ProjectileDrawer.cpp Diff ] File ]
mod - rts/Rendering/TeamHighlight.cpp Diff ] File ]
mod - rts/Rendering/Textures/3DOTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/Textures/ColorMap.cpp Diff ] File ]
mod - rts/Rendering/Textures/ColorMap.h 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/UnitDrawer.cpp Diff ] File ]
mod - rts/Rendering/UnitDrawer.h Diff ] File ]
mod - rts/Rendering/glFont.cpp 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/Misc/CategoryHandler.h Diff ] File ]
mod - rts/Sim/Misc/CollisionHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/CollisionVolume.cpp Diff ] File ]
mod - rts/Sim/Misc/CollisionVolume.h Diff ] File ]
mod - rts/Sim/Misc/GeometricObjects.cpp Diff ] File ]
mod - rts/Sim/Misc/GeometricObjects.h Diff ] File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.cpp 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/QuadField.cpp Diff ] File ]
mod - rts/Sim/Misc/RadarHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/SideParser.cpp Diff ] File ]
mod - rts/Sim/Misc/SideParser.h Diff ] File ]
mod - rts/Sim/Misc/SmoothHeightMesh.cpp Diff ] File ]
mod - rts/Sim/Misc/Team.cpp Diff ] File ]
mod - rts/Sim/Misc/Team.h Diff ] File ]
mod - rts/Sim/Misc/TeamHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/TeamHandler.h Diff ] File ]
mod - rts/Sim/MoveTypes/AirMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.h Diff ] File ]
mod - rts/Sim/MoveTypes/MoveInfo.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/ScriptMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/TAAirMoveType.cpp Diff ] File ]
mod - rts/Sim/Objects/WorldObject.h Diff ] File ]
add - rts/Sim/Path/Default/PathFinderDef.h Diff ] File ]
add - rts/Sim/Path/IPathManager.cpp Diff ] File ]
add - rts/Sim/Path/IPathManager.h 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 ]
mod - rts/Sim/Projectiles/FireProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/FireProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/FlareProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/FlareProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/PieceProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/PieceProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Projectile.h Diff ] File ]
mod - rts/Sim/Projectiles/ProjectileHandler.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ProjectileHandler.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/BubbleProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/DirtProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/DirtProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.hpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GenericParticleProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GenericParticleProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GeoSquareProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GeoSquareProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GeoThermSmokeProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GeoThermSmokeProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GfxProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/HeatCloudProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/MuzzleFlame.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/MuzzleFlame.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/RepulseGfx.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/RepulseGfx.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/ShieldPartProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/ShieldPartProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile2.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile2.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SpherePartProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/TracerProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/TracerProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/WakeProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/WreckProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/WreckProjectile.h Diff ] File ]
mod - rts/Sim/Units/COB/CobEngine.cpp Diff ] File ]
mod - rts/Sim/Units/COB/LuaUnitScript.cpp Diff ] File ]
mod - rts/Sim/Units/COB/UnitScript.cpp Diff ] File ]
mod - rts/Sim/Units/COB/UnitScriptEngine.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/AirCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/Command.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/CommandAI.cpp Diff ] File ]