2025-08-11 10:28 CEST
  

spring: develop 925996c4 [ Diff ] [ Back to Repository ]
Author Committer Branch Timestamp Parent
Tobi Vollebregt Tobi Vollebregt develop 2009-05-03 20:32:38 develop 0c4aa760
Changeset Merge commit 'origin/master' into luacob

Conflicts:
    rts/Sim/Units/COB/CobInstance.cpp
    rts/Sim/Units/CommandAI/TransportCAI.cpp
    rts/Sim/Units/Unit.cpp
    rts/Sim/Units/UnitLoader.cpp
    rts/Sim/Units/UnitTypes/Builder.cpp
    rts/Sim/Units/UnitTypes/Factory.cpp
    rts/Sim/Weapons/BeamLaser.cpp
mod - AI/Interfaces/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Interfaces/Java/bin/build.xml [ Diff ] [ File ]
mod - AI/Interfaces/Java/bin/java_generateWrappers.bat [ Diff ] [ File ]
mod - AI/Interfaces/Java/bin/java_generateWrappers.sh [ Diff ] [ File ]
mod - AI/SConscript [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/AttackHandler.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/BuildUp.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/BuildUp.h [ Diff ] [ File ]
add - AI/Skirmish/KAIK/CommandTracker.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/Containers.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/Containers.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/IncGlobalAI.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/KAIK.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/PathFinder.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/PathFinder.h [ Diff ] [ File ]
rm - AI/Skirmish/KAIK/SunParser.cpp [ Diff ] [ File ]
rm - AI/Skirmish/KAIK/SunParser.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/UnitHandler.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/UnitTable.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/UnitTable.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp [ Diff ] [ File ]
mod - CMakeLists.txt [ Diff ] [ File ]
mod - game/LuaUI/widgets.lua [ Diff ] [ File ]
mod - game/uikeys.txt [ Diff ] [ File ]
mod - installer/builddata/springcontent/EngineOptions.lua [ Diff ] [ File ]
mod - installer/sections/springlobby.nsh [ Diff ] [ File ]
mod - installer/sections/tasclient.nsh [ Diff ] [ File ]
mod - installer/spring.nsi [ Diff ] [ File ]
mod - installer/springlobby_download.sh [ Diff ] [ File ]
mod - installer/springsettings.nsh [ Diff ] [ File ]
mod - installer/tasclient_download.sh [ Diff ] [ File ]
mod - rts/ExternalAI/AICallback.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/AICheats.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/AIInterfaceKey.h [ 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/IAICallback.h [ Diff ] [ File ]
mod - rts/ExternalAI/Interface/AISCommands.h [ Diff ] [ File ]
mod - rts/ExternalAI/Interface/SAIFloat3.h [ Diff ] [ File ]
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/SkirmishAIKey.h [ Diff ] [ File ]
mod - rts/Game/ConsoleHistory.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/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/Player.h [ Diff ] [ File ]
mod - rts/Game/PlayerBase.cpp [ Diff ] [ File ]
mod - rts/Game/PlayerBase.h [ 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/SelectedUnits.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.h [ Diff ] [ File ]
mod - rts/Game/UI/InfoConsole.cpp [ 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/MouseHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UI/ProfileDrawer.cpp [ Diff ] [ File ]
mod - rts/Game/UI/TooltipConsole.cpp [ Diff ] [ File ]
mod - rts/Game/WordCompletion.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaConstCMD.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaHandle.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaMaterial.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaRules.cpp [ 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/LuaUnsyncedCtrl.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUtils.cpp [ Diff ] [ File ]
mod - rts/Map/BaseGroundDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/MetalMap.h [ Diff ] [ File ]
mod - rts/Map/ReadMap.cpp [ Diff ] [ File ]
mod - rts/Map/ReadMap.h [ Diff ] [ File ]
mod - rts/Map/SM3/terrain/QuadRenderData.cpp [ Diff ] [ File ]
mod - rts/Map/SM3/terrain/Terrain.cpp [ Diff ] [ File ]
mod - rts/Map/SM3/terrain/TerrainTexEnvCombine.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/BaseTreeDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/DynWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/FartextureHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/GL/FBO.cpp [ Diff ] [ File ]
mod - rts/Rendering/GL/myGL.cpp [ Diff ] [ File ]
mod - rts/Rendering/GroundDecalHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/GroundDecalHandler.h [ Diff ] [ File ]
mod - rts/Rendering/GroundFlash.cpp [ Diff ] [ File ]
mod - rts/Rendering/GroundFlash.h [ Diff ] [ File ]
mod - rts/Rendering/IconHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/InMapDraw.cpp [ Diff ] [ File ]
mod - rts/Rendering/InMapDraw.h [ Diff ] [ File ]
mod - rts/Rendering/Textures/3DOTextureHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/ColorMap.h [ Diff ] [ File ]
mod - rts/Rendering/Textures/S3OTextureHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/TextureAtlas.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/TextureAtlas.h [ Diff ] [ File ]
mod - rts/Rendering/UnitModels/3DModel.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitModels/3DModel.h [ Diff ] [ File ]
mod - rts/Rendering/UnitModels/3DOParser.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitModels/IModelParser.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitModels/UnitDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitModels/s3oParser.cpp [ Diff ] [ File ]
mod - rts/Sim/Features/Feature.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 ]
add - rts/Sim/Misc/AllyTeam.cpp [ Diff ] [ File ]
add - rts/Sim/Misc/AllyTeam.h [ Diff ] [ File ]
mod - rts/Sim/Misc/CategoryHandler.h [ Diff ] [ File ]
mod - rts/Sim/Misc/CollisionHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/CollisionHandler.h [ Diff ] [ File ]
mod - rts/Sim/Misc/CollisionVolume.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/CollisionVolume.h [ Diff ] [ File ]
mod - rts/Sim/Misc/DamageArrayHandler.h [ Diff ] [ File ]
mod - rts/Sim/Misc/GeometricObjects.h [ Diff ] [ File ]
mod - rts/Sim/Misc/GlobalSynced.h [ Diff ] [ File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.h [ Diff ] [ File ]
mod - rts/Sim/Misc/LosHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/QuadField.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/QuadField.h [ Diff ] [ File ]
mod - rts/Sim/Misc/Resource.h [ Diff ] [ File ]
mod - rts/Sim/Misc/ResourceHandler.h [ Diff ] [ File ]
mod - rts/Sim/Misc/Team.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/Team.h [ Diff ] [ File ]
add - rts/Sim/Misc/TeamBase.cpp [ Diff ] [ File ]
add - rts/Sim/Misc/TeamBase.h [ Diff ] [ File ]
mod - rts/Sim/Misc/TeamHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/TeamHandler.h [ 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/MoveInfo.h [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveType.h [ Diff ] [ File ]
mod - rts/Sim/Path/PathManager.cpp [ Diff ] [ File ]
mod - rts/Sim/Path/PathManager.h [ Diff ] [ File ]
mod - rts/Sim/Projectiles/PieceProjectile.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/Projectile.cpp [ 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/GfxProjectile.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/MuzzleFlame.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile2.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/WakeProjectile.h [ Diff ] [ File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/EmgProjectile.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/LaserProjectile.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/LaserProjectile.h [ Diff ] [ File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.h [ 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/Units/COB/CobInstance.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/COB/UnitScript.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 ]
mod - rts/Sim/Units/CommandAI/CommandAI.h [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/CommandQueue.h [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/FactoryCAI.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/CommandAI/TransportCAI.h [ Diff ] [ File ]
mod - rts/Sim/Units/Groups/Group.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/Groups/GroupHandler.cpp [ 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/UnitDefImage.h [ Diff ] [ File ]
mod - rts/Sim/Units/UnitHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitLoader.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTracker.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/Builder.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/Factory.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/BeamLaser.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/LightningCannon.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/Weapon.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/WeaponDefHandler.h [ Diff ] [ File ]
mod - rts/System/DemoReader.cpp [ Diff ] [ File ]
mod - rts/System/EventHandler.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/FileHandler.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/FileSystem.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/FileSystem.h [ Diff ] [ File ]
mod - rts/System/LoadSaveHandler.cpp [ Diff ] [ File ]
mod - rts/System/LogOutput.cpp [ Diff ] [ File ]
mod - rts/System/Object.h [ Diff ] [ File ]
mod - rts/System/Option.cpp [ Diff ] [ File ]
mod - rts/System/Option.h [ Diff ] [ File ]
rm - rts/System/SFloat3.h [ Diff ] [ File ]
add - rts/System/Sound/AudioChannel.cpp [ Diff ] [ File ]
add - rts/System/Sound/AudioChannel.h [ Diff ] [ File ]
mod - rts/System/Sound/Sound.cpp [ Diff ] [ File ]
mod - rts/System/Sound/Sound.h [ Diff ] [ File ]
mod - rts/System/SpringApp.cpp [ Diff ] [ File ]
mod - rts/System/Sync/SyncedFloat3.h [ Diff ] [ File ]
mod - rts/System/TimeProfiler.cpp [ Diff ] [ File ]
mod - rts/System/TimeProfiler.h [ Diff ] [ File ]
mod - rts/System/creg/STL_Deque.h [ Diff ] [ File ]
mod - rts/System/creg/STL_List.h [ Diff ] [ File ]
mod - rts/System/creg/STL_Map.h [ Diff ] [ File ]
mod - rts/System/creg/Serializer.cpp [ Diff ] [ File ]
mod - rts/System/creg/VarTypes.h [ Diff ] [ File ]
mod - rts/System/creg/creg.cpp [ Diff ] [ File ]
mod - rts/System/creg/creg_cond.h [ Diff ] [ File ]
mod - rts/System/float3.h [ Diff ] [ File ]
mod - rts/build/vstudio8/rts.vcproj [ Diff ] [ File ]
mod - rts/lib/gml/gml.cpp [ Diff ] [ File ]
mod - rts/lib/gml/gml.h [ Diff ] [ File ]
mod - rts/lib/gml/gmlcls.h [ Diff ] [ File ]
mod - rts/lib/gml/gmlsrv.h [ Diff ] [ File ]
mod - rts/lib/hpiutil2/sqshstream.cpp [ Diff ] [ File ]
mod - rts/lib/lua/src/loslib.cpp [ Diff ] [ File ]
mod - rts/spring.exe.manifest [ Diff ] [ File ]
mod - tools/DedicatedServer/CMakeLists.txt [ Diff ] [ File ]
mod - tools/DemoAnalyser/CMakeLists.txt [ Diff ] [ File ]
mod - tools/DemoAnalyser/main.cpp [ Diff ] [ File ]
add - tools/DemoDumper/CMakeLists.txt [ Diff ] [ File ]
mod - tools/DemoDumper/DemoDumper.cpp [ Diff ] [ File ]
mod - tools/unitsync/unitsync.cpp [ Diff ] [ File ]
mod - tools/unitsync/unitsync_api.h [ Diff ] [ File ]