2025-08-25 21:22 CEST

spring: develop 704df9bf Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
Tobi Vollebregt Tobi Vollebregt develop 2009-05-29 00:32:10 develop 90ce4ab2
Changeset Merge branch 'master' into luacob

Conflicts:
    rts/Sim/Units/COB/CobInstance.cpp
mod - AI/Interfaces/Java/bin/java_wrappCallbackOO.awk Diff ] File ]
mod - AI/Skirmish/AAI/AAI.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAI.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIAirForceManager.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIAttack.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIAttack.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIAttackManager.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIAttackManager.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIBrain.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIBrain.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIBuildTable.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIBuildTable.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIBuildTask.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIConfig.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIConfig.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIConstructor.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIConstructor.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIExecute.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIExecute.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIGroup.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIGroup.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIMap.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIMap.h Diff ] File ]
mod - AI/Skirmish/AAI/AAISector.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAISector.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIUnitTable.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIUnitTable.h Diff ] File ]
mod - AI/Skirmish/AAI/Interface.cpp Diff ] File ]
mod - AI/Skirmish/AAI/VERSION Diff ] File ]
mod - AI/Skirmish/AAI/aidef.h Diff ] File ]
mod - AI/Skirmish/AAI/data/AIInfo.lua Diff ] File ]
mod - AI/Skirmish/AAI/data/ReadMe.txt Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/BA681.cfg Diff ] File ]
mod - AI/Skirmish/KAIK/AIExport.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/CommandTracker.cpp Diff ] File ]
add - AI/Skirmish/KAIK/CommandTracker.h Diff ] File ]
mod - AI/Skirmish/KAIK/Containers.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/Containers.h Diff ] File ]
mod - AI/Skirmish/KAIK/DGunController.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/IncGlobalAI.h Diff ] File ]
mod - AI/Skirmish/KAIK/KAIK.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/KAIK.h Diff ] File ]
mod - AI/Skirmish/KAIK/MetalMaker.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/MetalMaker.h Diff ] File ]
mod - AI/Skirmish/KAIK/Unit.cpp Diff ] File ]
mod - AI/Skirmish/NTai/AI/NTai/Core/CNTai.cpp Diff ] File ]
mod - AI/Skirmish/NTai/AI/NTai/Core/CNTai.h Diff ] File ]
mod - AI/Skirmish/NullLegacyCppAI/TestGlobalAI.cpp Diff ] File ]
mod - AI/Skirmish/NullLegacyCppAI/TestGlobalAI.h Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/data/AIInfo.lua Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/src/nulloojavaai/NullOOJavaAI.java Diff ] File ]
mod - AI/Skirmish/RAI/Builder.cpp Diff ] File ]
mod - AI/Skirmish/RAI/RAI.cpp Diff ] File ]
mod - AI/Skirmish/RAI/RAI.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEnemyDamagedEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEnemyDestroyedEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEnemyEnterLOSEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEnemyEnterRadarEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEnemyLeaveLOSEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEnemyLeaveRadarEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEvents.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIMessageEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AINullEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIPlayerCommandEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIReleaseEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AISeismicPingEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIUnitCapturedEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIUnitCreatedEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIUnitDamagedEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIUnitDestroyedEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIUnitFinishedEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIUnitGivenEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIUnitIdleEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIUnitMoveFailedEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIUpdateEvent.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Event/AIWeaponFiredEvent.h Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - SConstruct Diff ] File ]
mod - installer/builddata/maphelper/maphelper/mapinfo.lua Diff ] File ]
mod - installer/builddata/springcontent/shaders/units3o.fp Diff ] File ]
mod - installer/make_portable.sh Diff ] File ]
mod - rts/CMakeLists.txt Diff ] File ]
mod - rts/ExternalAI/AILibraryManager.cpp 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/IGlobalAI.h Diff ] File ]
mod - rts/ExternalAI/Interface/AISCommands.h Diff ] File ]
mod - rts/ExternalAI/Interface/AISEvents.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIData.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.h Diff ] File ]
mod - rts/Game/ClientSetup.cpp Diff ] File ]
mod - rts/Game/ClientSetup.h 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/GameSetup.cpp Diff ] File ]
mod - rts/Game/GameSetup.h Diff ] File ]
mod - rts/Game/GameVersion.cpp Diff ] File ]
mod - rts/Game/Player.cpp Diff ] File ]
mod - rts/Game/PlayerHandler.cpp Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/SelectedUnits.cpp Diff ] File ]
mod - rts/Game/StartScripts/CommanderScript.cpp Diff ] File ]
mod - rts/Game/StartScripts/SkirmishAITestScript.cpp Diff ] File ]
mod - rts/Game/UI/LuaUI.cpp Diff ] File ]
mod - rts/Lua/LuaCallInCheck.h Diff ] File ]
mod - rts/Lua/LuaFeatureDefs.cpp Diff ] File ]
mod - rts/Lua/LuaGaia.cpp Diff ] File ]
mod - rts/Lua/LuaIO.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.h Diff ] File ]
mod - rts/Lua/LuaUtils.cpp Diff ] File ]
mod - rts/Lua/LuaUtils.h Diff ] File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp Diff ] File ]
mod - rts/Map/SMF/BFGroundDrawer.h Diff ] File ]
mod - rts/Rendering/GL/VertexArray.cpp Diff ] File ]
mod - rts/Rendering/GroundDecalHandler.cpp 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/Feature.h 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/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/GlobalConstants.h Diff ] File ]
mod - rts/Sim/Misc/GlobalSynced.h Diff ] File ]
mod - rts/Sim/Misc/RadarHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/TeamHandler.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/AirMoveType.cpp Diff ] File ]
mod - rts/Sim/Path/PathEstimator.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ExplosionGenerator.h Diff ] File ]
mod - rts/Sim/Projectiles/FireProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/PieceProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/PieceProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Projectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ProjectileHandler.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ProjectileHandler.h Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/ExplosiveProjectile.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/COB/UnitScript.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/CommandAI.cpp 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/Unit.cpp Diff ] File ]
mod - rts/Sim/Units/Unit.h Diff ] File ]
mod - rts/Sim/Units/UnitDefHandler.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/System/ConfigHandler.cpp Diff ] File ]
mod - rts/System/DemoReader.cpp Diff ] File ]
mod - rts/System/FileSystem/ArchivePool.cpp Diff ] File ]
mod - rts/System/FileSystem/DataDirLocater.cpp Diff ] File ]
mod - rts/System/FileSystem/VFSHandler.cpp Diff ] File ]
mod - rts/System/FileSystem/VFSHandler.h Diff ] File ]
mod - rts/System/LogOutput.cpp Diff ] File ]
mod - rts/System/LogOutput.h Diff ] File ]
mod - rts/System/Main.cpp Diff ] File ]
mod - rts/System/Platform/BaseCmd.cpp Diff ] File ]
mod - rts/System/Platform/Linux/X_MessageBox.cpp Diff ] File ]
add - rts/System/Platform/Misc.cpp Diff ] File ]
add - rts/System/Platform/Misc.h Diff ] File ]
mod - rts/System/Sound/Sound.cpp Diff ] File ]
mod - rts/System/Sound/Sound.h Diff ] File ]
mod - rts/System/Sound/SoundBuffer.cpp Diff ] File ]
mod - rts/System/Sound/SoundBuffer.h Diff ] File ]
mod - rts/System/SpringApp.cpp Diff ] File ]
mod - rts/System/Util.h Diff ] File ]
mod - rts/System/myMath.cpp Diff ] File ]
mod - rts/System/myMath.h Diff ] File ]
mod - rts/build/scons/rts.py Diff ] File ]
mod - rts/icon.rc 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/gmlfun.h Diff ] File ]
mod - rts/lib/lua/COPYRIGHT Diff ] File ]
mod - rts/lib/lua/Makefile Diff ] File ]
mod - rts/lib/lua/README_SPRING Diff ] File ]
rm - rts/lib/lua/doc/amazon.gif.gz Diff ] File ]
rm - rts/lib/lua/doc/contents.html.gz Diff ] File ]
rm - rts/lib/lua/doc/cover.png.gz Diff ] File ]
rm - rts/lib/lua/doc/logo.gif.gz Diff ] File ]
rm - rts/lib/lua/doc/lua.1.gz Diff ] File ]
rm - rts/lib/lua/doc/lua.css.gz Diff ] File ]
rm - rts/lib/lua/doc/lua.html.gz Diff ] File ]
rm - rts/lib/lua/doc/luac.1.gz Diff ] File ]
rm - rts/lib/lua/doc/luac.html.gz Diff ] File ]
rm - rts/lib/lua/doc/manual.css.gz Diff ] File ]
rm - rts/lib/lua/doc/manual.html.gz Diff ] File ]
rm - rts/lib/lua/doc/readme.html.gz Diff ] File ]
rm - rts/lib/lua/etc/Makefile.gz Diff ] File ]
rm - rts/lib/lua/etc/README.gz Diff ] File ]
rm - rts/lib/lua/etc/all.c.gz Diff ] File ]
rm - rts/lib/lua/etc/lua.hpp.gz Diff ] File ]
rm - rts/lib/lua/etc/lua.ico.gz Diff ] File ]
rm - rts/lib/lua/etc/lua.pc.gz Diff ] File ]
rm - rts/lib/lua/etc/luavs.bat.gz Diff ] File ]
rm - rts/lib/lua/etc/min.c.gz Diff ] File ]
rm - rts/lib/lua/etc/noparser.c.gz Diff ] File ]
rm - rts/lib/lua/etc/strict.lua.gz Diff ] File ]
mod - rts/lib/lua/include/lauxlib.h Diff ] File ]
mod - rts/lib/lua/include/lua.h Diff ] File ]
mod - rts/lib/lua/include/luaconf.h Diff ] File ]
mod - rts/lib/lua/include/lualib.h Diff ] File ]
mod - rts/lib/lua/src/Makefile Diff ] File ]
mod - rts/lib/lua/src/lapi.cpp Diff ] File ]
mod - rts/lib/lua/src/lapi.h Diff ] File ]
mod - rts/lib/lua/src/lauxlib.cpp Diff ] File ]
mod - rts/lib/lua/src/lbaselib.cpp Diff ] File ]
mod - rts/lib/lua/src/lcode.cpp Diff ] File ]
mod - rts/lib/lua/src/lcode.h Diff ] File ]
mod - rts/lib/lua/src/ldblib.cpp Diff ] File ]
mod - rts/lib/lua/src/ldebug.cpp Diff ] File ]
mod - rts/lib/lua/src/ldebug.h Diff ] File ]
mod - rts/lib/lua/src/ldo.cpp Diff ] File ]
mod - rts/lib/lua/src/ldo.h Diff ] File ]
mod - rts/lib/lua/src/ldump.cpp Diff ] File ]
mod - rts/lib/lua/src/lfunc.cpp Diff ] File ]
mod - rts/lib/lua/src/lfunc.h Diff ] File ]
mod - rts/lib/lua/src/lgc.cpp Diff ] File ]
mod - rts/lib/lua/src/lgc.h Diff ] File ]
mod - rts/lib/lua/src/linit.cpp Diff ] File ]
mod - rts/lib/lua/src/liolib.cpp Diff ] File ]
mod - rts/lib/lua/src/llex.cpp Diff ] File ]
mod - rts/lib/lua/src/llex.h Diff ] File ]
mod - rts/lib/lua/src/llimits.h Diff ] File ]
mod - rts/lib/lua/src/lmathlib.cpp Diff ] File ]
mod - rts/lib/lua/src/lmem.cpp Diff ] File ]
mod - rts/lib/lua/src/lmem.h Diff ] File ]
mod - rts/lib/lua/src/loadlib.cpp Diff ] File ]
mod - rts/lib/lua/src/lobject.cpp Diff ] File ]
mod - rts/lib/lua/src/lobject.h Diff ] File ]
mod - rts/lib/lua/src/lopcodes.cpp Diff ] File ]
mod - rts/lib/lua/src/lopcodes.h Diff ] File ]
mod - rts/lib/lua/src/loslib.cpp Diff ] File ]
mod - rts/lib/lua/src/lparser.cpp Diff ] File ]
mod - rts/lib/lua/src/lparser.h Diff ] File ]
mod - rts/lib/lua/src/lstate.cpp Diff ] File ]
mod - rts/lib/lua/src/lstate.h Diff ] File ]
mod - rts/lib/lua/src/lstring.cpp Diff ] File ]
mod - rts/lib/lua/src/lstring.h Diff ] File ]
mod - rts/lib/lua/src/lstrlib.cpp Diff ] File ]
mod - rts/lib/lua/src/ltable.cpp Diff ] File ]
mod - rts/lib/lua/src/ltable.h Diff ] File ]
mod - rts/lib/lua/src/ltablib.cpp Diff ] File ]
mod - rts/lib/lua/src/ltm.cpp Diff ] File ]
mod - rts/lib/lua/src/ltm.h Diff ] File ]
rm - rts/lib/lua/src/lua.cpp.gz Diff ] File ]
rm - rts/lib/lua/src/luac.cpp.gz Diff ] File ]
mod - rts/lib/lua/src/lundump.cpp Diff ] File ]
mod - rts/lib/lua/src/lundump.h Diff ] File ]
mod - rts/lib/lua/src/lvm.cpp Diff ] File ]
mod - rts/lib/lua/src/lvm.h Diff ] File ]
mod - rts/lib/lua/src/lzio.cpp Diff ] File ]
mod - rts/lib/lua/src/lzio.h Diff ] File ]
rm - rts/lib/lua/test/README.gz Diff ] File ]
rm - rts/lib/lua/test/bisect.lua.gz Diff ] File ]
rm - rts/lib/lua/test/cf.lua.gz Diff ] File ]
rm - rts/lib/lua/test/echo.lua.gz Diff ] File ]
rm - rts/lib/lua/test/env.lua.gz Diff ] File ]
rm - rts/lib/lua/test/factorial.lua.gz Diff ] File ]
rm - rts/lib/lua/test/fib.lua.gz Diff ] File ]
rm - rts/lib/lua/test/fibfor.lua.gz Diff ] File ]
rm - rts/lib/lua/test/globals.lua.gz Diff ] File ]
rm - rts/lib/lua/test/hello.lua.gz Diff ] File ]
rm - rts/lib/lua/test/life.lua.gz Diff ] File ]
rm - rts/lib/lua/test/luac.lua.gz Diff ] File ]
rm - rts/lib/lua/test/printf.lua.gz Diff ] File ]
rm - rts/lib/lua/test/readonly.lua.gz Diff ] File ]
rm - rts/lib/lua/test/sieve.lua.gz Diff ] File ]
rm - rts/lib/lua/test/sort.lua.gz Diff ] File ]
rm - rts/lib/lua/test/table.lua.gz Diff ] File ]
rm - rts/lib/lua/test/trace-calls.lua.gz Diff ] File ]
rm - rts/lib/lua/test/trace-globals.lua.gz Diff ] File ]
rm - rts/lib/lua/test/xd.lua.gz Diff ] File ]
mod - tools/DedicatedServer/CMakeLists.txt Diff ] File ]
mod - tools/DedicatedServer/main.cpp Diff ] File ]
mod - tools/DemoAnalyser/CMakeLists.txt Diff ] File ]
mod - tools/DemoAnalyser/main.cpp Diff ] File ]
mod - tools/unitsync/CMakeLists.txt Diff ] File ]
mod - tools/unitsync/javabind.cpp Diff ] File ]
mod - tools/unitsync/pybind.cpp Diff ] File ]
mod - tools/unitsync/unitsync.cpp Diff ] File ]
mod - tools/unitsync/unitsync_api.h Diff ] File ]