2025-08-26 22:46 CEST

spring: develop 229b3797 Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2010-07-26 10:18:16 develop dc2a80f0
Changeset Merge remote branch 'origin/master' into pureint

Conflicts:
    AI/Skirmish/E323AI
    AI/Skirmish/HughAI
    AI/Wrappers/LegacyCpp/AIAICallback.cpp
    rts/ExternalAI/AICallback.cpp
    rts/ExternalAI/Interface/SSkirmishAICallback.h
    rts/ExternalAI/SSkirmishAICallbackImpl.cpp
    rts/ExternalAI/SSkirmishAICallbackImpl.h
    rts/Sim/Units/CommandAI/Command.h
    rts/Sim/Units/UnitDef.h
    rts/Sim/Units/UnitDefHandler.cpp
mod - AI/Interfaces/Python Diff ] File ]
mod - AI/Skirmish/AAI/aidef.h Diff ] File ]
mod - AI/Skirmish/E323AI Diff ] File ]
mod - AI/Skirmish/HughAI Diff ] File ]
mod - AI/Skirmish/KAIK/AIClasses.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/AIClasses.hpp Diff ] File ]
mod - AI/Skirmish/KAIK/AttackGroup.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/AttackHandler.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/BuildUp.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/CommandTracker.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/DGunController.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/Defines.h Diff ] File ]
mod - AI/Skirmish/KAIK/IncEngine.h Diff ] File ]
mod - AI/Skirmish/KAIK/IncExternAI.h Diff ] File ]
mod - AI/Skirmish/KAIK/KAIK.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/Unit.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/Unit.h Diff ] File ]
mod - AI/Skirmish/KAIK/UnitHandler.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/UnitTable.cpp Diff ] File ]
mod - AI/Skirmish/RAI/Builder.cpp Diff ] File ]
mod - AI/Skirmish/RAI/Builder.h Diff ] File ]
mod - AI/Skirmish/RAI/BuilderPlacement.cpp Diff ] File ]
mod - AI/Skirmish/RAI/GTerrainMap.h Diff ] File ]
mod - AI/Skirmish/RAI/PowerManager.cpp Diff ] File ]
mod - AI/Skirmish/RAI/RAI.cpp Diff ] File ]
mod - AI/Skirmish/RAI/UnitDefHandler.h Diff ] File ]
mod - AI/Skirmish/RAI/UnitManager.h Diff ] File ]
mod - AI/Wrappers/CUtils/Util.c Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/CMakeLists.txt Diff ] File ]
add - AI/Wrappers/LegacyCpp/UnitDef.cpp Diff ] File ]
add - AI/Wrappers/LegacyCpp/UnitDef.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/aibase.h Diff ] File ]
mod - buildbot/make_installer.sh Diff ] File ]
mod - buildbot/rsync.sh Diff ] File ]
mod - cont/LuaUI/selector.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/Gadgets/game_spawn.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/Gadgets/unit_script.lua Diff ] File ]
mod - directories.txt Diff ] File ]
mod - doc/changelog.txt Diff ] File ]
add - installer/include/Registry.nsh Diff ] File ]
add - installer/include/checkDotNetInstalled.nsh Diff ] File ]
mod - installer/include/checkrunning.nsh Diff ] File ]
add - installer/nsis_plugins/registry.dll Diff ] File ]
add - installer/sections/ensureDotNet.nsh Diff ] File ]
mod - installer/sections/sectiondesc.nsh Diff ] File ]
mod - installer/sections/shortcuts.nsh Diff ] File ]
mod - installer/sections/springDownloader.nsh Diff ] File ]
mod - installer/spring.nsi Diff ] File ]
mod - rts/ExternalAI/AICallback.cpp Diff ] File ]
mod - rts/ExternalAI/Interface/SSkirmishAICallback.h Diff ] File ]
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp Diff ] File ]
mod - rts/ExternalAI/SSkirmishAICallbackImpl.h Diff ] File ]
mod - rts/Game/Camera.cpp Diff ] File ]
mod - rts/Game/Camera.h Diff ] File ]
mod - rts/Game/CameraHandler.cpp Diff ] File ]
mod - rts/Game/CameraHandler.h 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/PlayerHandler.cpp Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/SelectedUnitsAI.cpp Diff ] File ]
mod - rts/Game/SelectedUnitsAI.h Diff ] File ]
mod - rts/Game/Server/GameParticipant.cpp Diff ] File ]
mod - rts/Game/Server/GameParticipant.h Diff ] File ]
mod - rts/Game/TeamController.h Diff ] File ]
mod - rts/Game/UI/EndGameBox.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.h Diff ] File ]
mod - rts/Game/UI/MiniMap.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.h Diff ] File ]
mod - rts/Game/UI/SelectionKeyHandler.cpp Diff ] File ]
mod - rts/Game/UI/SelectionKeyHandler.h Diff ] File ]
mod - rts/Game/WordCompletion.cpp Diff ] File ]
mod - rts/Lua/LuaGaia.cpp Diff ] File ]
mod - rts/Lua/LuaGaia.h Diff ] File ]
mod - rts/Lua/LuaHandleSynced.cpp Diff ] File ]
mod - rts/Lua/LuaHandleSynced.h Diff ] File ]
mod - rts/Lua/LuaOpenGL.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGL.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/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUtils.cpp Diff ] File ]
mod - rts/Map/Ground.cpp Diff ] File ]
mod - rts/Map/MapInfo.cpp Diff ] File ]
mod - rts/Map/ReadMap.h Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainBase.h Diff ] File ]
mod - rts/Map/SM3/terrain/Textures.cpp Diff ] File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp Diff ] File ]
mod - rts/Rendering/DebugDrawerAI.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BasicTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BumpWater.cpp Diff ] File ]
mod - rts/Rendering/FeatureDrawer.cpp Diff ] File ]
mod - rts/Rendering/Models/3DModel.h Diff ] File ]
mod - rts/Rendering/Models/IModelParser.cpp Diff ] File ]
mod - rts/Rendering/Models/IModelParser.h Diff ] File ]
mod - rts/Rendering/Models/OBJParser.h Diff ] File ]
mod - rts/Rendering/Models/S3OParser.cpp Diff ] File ]
mod - rts/Rendering/PathDrawer.cpp Diff ] File ]
mod - rts/Rendering/ProjectileDrawer.cpp Diff ] File ]
mod - rts/Rendering/ShadowHandler.cpp Diff ] File ]
mod - rts/Rendering/ShadowHandler.h 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/UnitDrawer.cpp Diff ] File ]
mod - rts/Sim/Features/FeatureDef.h Diff ] File ]
mod - rts/Sim/Misc/GlobalSynced.cpp Diff ] File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.cpp Diff ] File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.h Diff ] File ]
mod - rts/Sim/Misc/LosHandler.h Diff ] File ]
mod - rts/Sim/Misc/ModInfo.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/TeamHandler.cpp Diff ] File ]
mod - 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/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/ScriptMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/ScriptMoveType.h Diff ] File ]
mod - rts/Sim/MoveTypes/TAAirMoveType.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/PathFinder.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ExplosionGenerator.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ExplosionGenerator.h Diff ] File ]
mod - rts/Sim/Projectiles/Projectile.h Diff ] File ]
mod - rts/Sim/Projectiles/ProjectileHandler.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/BitmapMuzzleFlame.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/BitmapMuzzleFlame.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/ExploSpikeProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/ExploSpikeProjectile.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/RepulseGfx.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SpherePartProjectile.h 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/Units/COB/CobThread.cpp 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/UnitScript.cpp Diff ] File ]
mod - rts/Sim/Units/COB/UnitScript.h 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/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/LineDrawer.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/Unit.cpp Diff ] File ]
mod - rts/Sim/Units/Unit.h Diff ] File ]
mod - rts/Sim/Units/UnitDef.cpp Diff ] File ]
mod - rts/Sim/Units/UnitDef.h Diff ] File ]
mod - rts/Sim/Units/UnitDefHandler.cpp Diff ] File ]
mod - rts/Sim/Units/UnitDefHandler.h Diff ] File ]
mod - rts/Sim/Units/UnitHandler.cpp Diff ] File ]
mod - rts/Sim/Units/UnitHandler.h Diff ] File ]
mod - rts/Sim/Units/UnitLoader.cpp Diff ] File ]
add - rts/Sim/Units/UnitSet.cpp Diff ] File ]
mod - rts/Sim/Units/UnitSet.h Diff ] File ]
mod - rts/Sim/Weapons/Cannon.cpp Diff ] File ]
mod - rts/Sim/Weapons/Weapon.cpp Diff ] File ]
mod - rts/Sim/Weapons/WeaponDef.h Diff ] File ]
mod - rts/System/BaseNetProtocol.cpp Diff ] File ]
mod - rts/System/BaseNetProtocol.h Diff ] File ]
mod - rts/System/GlobalUnsynced.cpp Diff ] File ]
mod - rts/System/GlobalUnsynced.h Diff ] File ]
mod - rts/System/Input/MouseInput.cpp Diff ] File ]
mod - rts/System/LoadSave/DemoReader.cpp Diff ] File ]
mod - rts/System/LoadSave/DemoReader.h Diff ] File ]
mod - rts/System/LoadSave/DemoRecorder.cpp Diff ] File ]
mod - rts/System/Platform/Win/CrashHandler.cpp Diff ] File ]
mod - rts/System/Platform/Win/wsdl.cpp Diff ] File ]
mod - rts/System/Platform/Win/wsdl.h Diff ] File ]
mod - rts/System/Sound/OggStream.cpp Diff ] File ]
mod - rts/System/Sound/OggStream.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/UnsyncedRNG.cpp Diff ] File ]
mod - rts/System/myMath.h Diff ] File ]
mod - rts/aGui/GuiElement.h Diff ] File ]
mod - rts/aGui/List.cpp Diff ] File ]
mod - rts/aGui/List.h Diff ] File ]
mod - rts/build/cmake/Find7zip.cmake Diff ] File ]
mod - rts/build/vstudio8/rts.vcproj Diff ] File ]
mod - rts/builds/CMakeLists.txt Diff ] File ]
mod - rts/builds/DS/main.cpp Diff ] File ]
mod - rts/builds/GML/CMakeLists.txt Diff ] File ]
mod - rts/builds/HL/CMakeLists.txt Diff ] File ]
mod - rts/builds/HL/README.markdown Diff ] File ]
mod - rts/builds/default/CMakeLists.txt Diff ] File ]
mod - rts/lib/gml/gml.cpp Diff ] File ]
mod - rts/lib/gml/gml.h Diff ] File ]
mod - rts/lib/headlessStubs/CMakeLists.txt Diff ] File ]
mod - tools/unitsync/CMakeLists.txt Diff ] File ]
mod - tools/unitsync/unitsync.cpp Diff ] File ]