2025-08-26 02:00 CEST
  

spring: develop 552a2688 [ Diff ] [ Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2010-02-11 15:25:18 develop 00ed33bf
Changeset Merge remote branch 'originSpring/master' into pureint

Conflicts:
    AI/Interfaces/Java/CMakeLists.txt
    AI/Wrappers/LegacyCpp/AIAICallback.cpp
    installer/spring.nsi
    rts/ExternalAI/Interface/AISCommands.h
    rts/ExternalAI/Interface/SSkirmishAICallback.h
    rts/ExternalAI/SkirmishAILibrary.h
mod - AI/Interfaces/C/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Interfaces/Java/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAI.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIExecute.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIExecute.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/aidef.h [ Diff ] [ File ]
mod - AI/Skirmish/E323AI [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/BuildUp.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/Containers.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/Containers.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/EconomyTracker.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/KAIK.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/MetalMap.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/MetalMap.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/UnitTable.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/Util.cpp [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.h [ Diff ] [ File ]
mod - CMakeLists.txt [ Diff ] [ File ]
mod - Documentation/changelog.txt [ Diff ] [ File ]
mod - installer/builddata/maphelper/maphelper/mapdefaults.lua [ Diff ] [ File ]
mod - installer/builddata/maphelper/maphelper/parse_tdf_map.lua [ Diff ] [ File ]
mod - installer/builddata/springcontent/EngineOptions.lua [ Diff ] [ File ]
add - installer/builddata/springcontent/LuaGadgets/Gadgets/game_spawn.lua [ Diff ] [ File ]
mod - installer/builddata/springcontent/LuaGadgets/Gadgets/unit_script.lua [ Diff ] [ File ]
add - installer/builddata/springcontent/shaders/S3OFragProg.glsl [ Diff ] [ File ]
add - installer/builddata/springcontent/shaders/S3OVertProg.glsl [ Diff ] [ File ]
add - installer/builddata/springcontent/shaders/SMFFragProg.glsl [ Diff ] [ File ]
add - installer/builddata/springcontent/shaders/SMFVertProg.glsl [ Diff ] [ File ]
mod - installer/builddata/springcontent/shaders/bumpWaterFS.glsl [ Diff ] [ File ]
mod - installer/builddata/springcontent/shaders/bumpWaterVS.glsl [ Diff ] [ File ]
rm - installer/builddata/springcontent/shaders/unit.fp [ Diff ] [ File ]
mod - installer/make_installer.pl [ Diff ] [ File ]
mod - installer/make_source_package.sh [ Diff ] [ File ]
mod - installer/sections/main.nsh [ Diff ] [ File ]
mod - installer/sections/sectiondesc.nsh [ Diff ] [ File ]
mod - installer/sections/shortcuts.nsh [ Diff ] [ File ]
add - installer/sections/springDownloader.nsh [ Diff ] [ File ]
mod - installer/sections/springlobby.nsh [ Diff ] [ File ]
rm - installer/sections/tasclient.nsh [ Diff ] [ File ]
mod - installer/spring.nsi [ Diff ] [ File ]
mod - installer/springlobby_download.sh [ Diff ] [ File ]
rm - installer/tasclient_download.sh [ Diff ] [ File ]
mod - rts/CMakeLists.txt [ Diff ] [ File ]
mod - rts/ExternalAI/AICallback.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/AICallback.h [ Diff ] [ File ]
mod - rts/ExternalAI/AIInterfaceLibrary.h [ Diff ] [ File ]
mod - rts/ExternalAI/EngineOutHandler.h [ Diff ] [ File ]
mod - rts/ExternalAI/IAICallback.h [ Diff ] [ File ]
mod - rts/ExternalAI/Interface/AISEvents.h [ Diff ] [ File ]
mod - rts/ExternalAI/Interface/SSkirmishAICallback.h [ Diff ] [ File ]
mod - rts/ExternalAI/SkirmishAIHandler.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/SkirmishAIHandler.h [ Diff ] [ File ]
mod - rts/ExternalAI/SkirmishAILibrary.h [ 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 ]
mod - rts/Game/PreGame.cpp [ Diff ] [ File ]
rm - rts/Game/StartScripts/AirScript.cpp [ Diff ] [ File ]
rm - rts/Game/StartScripts/AirScript.h [ Diff ] [ File ]
rm - rts/Game/StartScripts/CommanderScript.cpp [ Diff ] [ File ]
rm - rts/Game/StartScripts/CommanderScript.h [ Diff ] [ File ]
rm - rts/Game/StartScripts/EmptyScript.cpp [ Diff ] [ File ]
rm - rts/Game/StartScripts/EmptyScript.h [ Diff ] [ File ]
rm - rts/Game/StartScripts/LoadScript.cpp [ Diff ] [ File ]
rm - rts/Game/StartScripts/LoadScript.h [ Diff ] [ File ]
rm - rts/Game/StartScripts/Script.cpp [ Diff ] [ File ]
rm - rts/Game/StartScripts/Script.h [ Diff ] [ File ]
rm - rts/Game/StartScripts/ScriptHandler.cpp [ Diff ] [ File ]
rm - rts/Game/StartScripts/ScriptHandler.h [ Diff ] [ File ]
rm - rts/Game/StartScripts/SkirmishAITestScript.cpp [ Diff ] [ File ]
rm - rts/Game/StartScripts/SkirmishAITestScript.h [ Diff ] [ File ]
rm - rts/Game/StartScripts/SpawnScript.cpp [ Diff ] [ File ]
rm - rts/Game/StartScripts/SpawnScript.h [ Diff ] [ File ]
rm - rts/Game/StartScripts/TestScript.cpp [ Diff ] [ File ]
rm - rts/Game/StartScripts/TestScript.h [ Diff ] [ File ]
mod - rts/Game/UI/GameInfo.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GameSetupDrawer.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaConstGame.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaOpenGL.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnitDefs.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaVFS.cpp [ Diff ] [ File ]
mod - rts/Map/BaseGroundDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/BaseGroundDrawer.h [ Diff ] [ File ]
mod - rts/Map/MapInfo.cpp [ Diff ] [ File ]
mod - rts/Map/MapInfo.h [ Diff ] [ File ]
mod - rts/Map/MapParser.cpp [ Diff ] [ File ]
mod - rts/Map/ReadMap.cpp [ Diff ] [ File ]
mod - rts/Map/ReadMap.h [ Diff ] [ File ]
mod - rts/Map/SM3/Sm3GroundDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/SM3/Sm3GroundDrawer.h [ Diff ] [ File ]
mod - rts/Map/SM3/Sm3Map.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/BFGroundDrawer.h [ Diff ] [ File ]
mod - rts/Map/SMF/BFGroundTextures.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/SmfMapFile.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/SmfMapFile.h [ Diff ] [ File ]
mod - rts/Map/SMF/SmfReadMap.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/SmfReadMap.h [ Diff ] [ File ]
mod - rts/Menu/LobbyConnection.cpp [ Diff ] [ File ]
add - rts/Menu/ScriptHandler.cpp [ Diff ] [ File ]
add - rts/Menu/ScriptHandler.h [ Diff ] [ File ]
mod - rts/Menu/SelectMenu.cpp [ Diff ] [ File ]
mod - rts/Menu/SelectionWidget.cpp [ Diff ] [ File ]
mod - rts/Menu/UpdaterWindow.cpp [ Diff ] [ File ]
mod - rts/Rendering/Colors.h [ Diff ] [ File ]
mod - rts/Rendering/Env/AdvWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/BumpWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/CubeMapHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/DynWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/GL/VertexArray.cpp [ Diff ] [ File ]
mod - rts/Rendering/GL/VertexArray.h [ Diff ] [ File ]
mod - rts/Rendering/GL/VertexArray.inl [ Diff ] [ File ]
mod - rts/Rendering/GL/myGL.cpp [ Diff ] [ File ]
mod - rts/Rendering/InMapDraw.cpp [ Diff ] [ File ]
mod - rts/Rendering/InMapDraw.h [ Diff ] [ File ]
mod - rts/Rendering/Screenshot.cpp [ Diff ] [ File ]
mod - rts/Rendering/Shaders/Shader.cpp [ Diff ] [ File ]
mod - rts/Rendering/Shaders/Shader.hpp [ Diff ] [ File ]
mod - rts/Rendering/ShadowHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/ShadowHandler.h [ Diff ] [ File ]
mod - rts/Rendering/Textures/Bitmap.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/nv_dds.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitModels/3DModel.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitModels/FeatureDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitModels/IModelParser.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/Rendering/glFont.h [ Diff ] [ File ]
mod - rts/Sim/Misc/DamageArray.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/DamageArray.h [ Diff ] [ File ]
mod - rts/Sim/Misc/ModInfo.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/QuadField.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/RadarHandler.h [ Diff ] [ File ]
mod - rts/Sim/Misc/SmoothHeightMesh.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/SmoothHeightMesh.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/MoveTypes/AAirMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/AirMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveInfo.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveInfo.h [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.cpp [ Diff ] [ File ]
mod - rts/Sim/Path/PathEstimator.cpp [ Diff ] [ File ]
mod - rts/Sim/Path/PathEstimator.h [ Diff ] [ File ]
mod - rts/Sim/Path/PathManager.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/Projectile.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/COB/CobThread.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.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/UnitHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/TransportUnit.cpp [ Diff ] [ File ]
mod - rts/System/BaseNetProtocol.cpp [ Diff ] [ File ]
mod - rts/System/BaseNetProtocol.h [ Diff ] [ File ]
mod - rts/System/ConfigHandler.cpp [ Diff ] [ File ]
mod - rts/System/ConfigHandler.h [ Diff ] [ File ]
mod - rts/System/DemoReader.cpp [ Diff ] [ File ]
mod - rts/System/DemoReader.h [ Diff ] [ File ]
mod - rts/System/FileSystem/Archive7Zip.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/Archive7Zip.h [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveBase.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveBase.h [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveBuffered.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveBuffered.h [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveDir.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveDir.h [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveFactory.cpp [ Diff ] [ File ]
rm - rts/System/FileSystem/ArchiveHPI.cpp [ Diff ] [ File ]
rm - rts/System/FileSystem/ArchiveHPI.h [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchivePool.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchivePool.h [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveScanner.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveScanner.h [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveZip.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveZip.h [ Diff ] [ File ]
mod - rts/System/FileSystem/CRC.h [ Diff ] [ File ]
mod - rts/System/FileSystem/DataDirLocater.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/DataDirLocater.h [ Diff ] [ File ]
mod - rts/System/FileSystem/FileSystemHandler.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/FileSystemHandler.h [ Diff ] [ File ]
mod - rts/System/FileSystem/VFSHandler.cpp [ 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/Net/UDPConnection.cpp [ Diff ] [ File ]
mod - rts/System/NetProtocol.cpp [ Diff ] [ File ]
mod - rts/System/NetProtocol.h [ Diff ] [ File ]
mod - rts/System/Platform/CrashHandler.cpp [ Diff ] [ File ]
mod - rts/System/Platform/Misc.cpp [ Diff ] [ File ]
mod - rts/System/Platform/Misc.h [ Diff ] [ File ]
mod - rts/System/Platform/Win/CrashHandler.cpp [ Diff ] [ File ]
mod - rts/System/Platform/Win/wsdl.cpp [ Diff ] [ File ]
mod - rts/System/Platform/errorhandler.cpp [ Diff ] [ File ]
mod - rts/System/Platform/errorhandler.h [ Diff ] [ File ]
mod - rts/System/SpringApp.cpp [ Diff ] [ File ]
mod - rts/System/maindefines.h [ Diff ] [ File ]
mod - rts/System/myMath.h [ Diff ] [ File ]
mod - rts/aGui/List.cpp [ Diff ] [ File ]
mod - rts/build/vstudio8/rts.vcproj [ Diff ] [ File ]
mod - rts/build/vstudio9/rts.vcproj [ Diff ] [ File ]
mod - rts/lib/CMakeLists.txt [ Diff ] [ File ]
rm - rts/lib/hpiutil2/README [ Diff ] [ File ]
rm - rts/lib/hpiutil2/hpientry.cpp [ Diff ] [ File ]
rm - rts/lib/hpiutil2/hpientry.h [ Diff ] [ File ]
rm - rts/lib/hpiutil2/hpifile.cpp [ Diff ] [ File ]
rm - rts/lib/hpiutil2/hpifile.h [ Diff ] [ File ]
rm - rts/lib/hpiutil2/hpiutil.cpp [ Diff ] [ File ]
rm - rts/lib/hpiutil2/hpiutil.h [ Diff ] [ File ]
rm - rts/lib/hpiutil2/scrambledfile.cpp [ Diff ] [ File ]
rm - rts/lib/hpiutil2/scrambledfile.h [ Diff ] [ File ]
rm - rts/lib/hpiutil2/sqshstream.cpp [ Diff ] [ File ]
rm - rts/lib/hpiutil2/sqshstream.h [ Diff ] [ File ]
rm - rts/lib/hpiutil2/substream.cpp [ Diff ] [ File ]
rm - rts/lib/hpiutil2/substream.h [ Diff ] [ File ]
mod - rts/lib/liblobby/Connection.cpp [ Diff ] [ File ]
mod - rts/lib/liblobby/Connection.h [ Diff ] [ File ]
mod - rts/lib/streflop/streflop.h [ Diff ] [ File ]
mod - tools/DedicatedServer/CMakeLists.txt [ Diff ] [ File ]
mod - tools/DedicatedServer/main.cpp [ Diff ] [ File ]
mod - tools/unitsync/CMakeLists.txt [ Diff ] [ File ]
mod - tools/unitsync/unitsync.cpp [ Diff ] [ File ]