2025-08-03 10:55 CEST
  

spring: develop b135ca90 [ Diff ] [ Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2010-01-19 00:06:33 develop 43f0d996
Changeset Merge remote branch 'originSpring/master' into pureint

Conflicts:
    AI/Interfaces/Java/CMakeLists.txt
    AI/Skirmish/HughAI
    AI/Skirmish/KAIK/Defines.h
    AI/Skirmish/KAIK/KAIK.cpp
    rts/ExternalAI/Interface/SSkirmishAICallback.h
add - .mailmap [ Diff ] [ File ]
mod - AI/Interfaces/C/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Interfaces/Java/CMakeLists.txt [ Diff ] [ File ]
mod - AI/SConscript [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIBrain.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIMap.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/FAQ.txt [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/ReadMe.txt [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/cfg/general.cfg [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/cfg/help/example_general.cfg [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/cfg/help/example_mod.cfg [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/cfg/mod/AA5.0project.cfg [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/cfg/mod/AAIA10.cfg [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/cfg/mod/CA-BETA1.cfg [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/cfg/mod/KuroTA-v047.cfg [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/cfg/mod/StarWars01.cfg [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/cfg/mod/XTAPEV958.cfg [ Diff ] [ File ]
mod - AI/Skirmish/AAI/data/cfg/mod/XTAPEV9585.cfg [ Diff ] [ File ]
mod - AI/Skirmish/E323AI [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/AIExport.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/AttackGroup.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/AttackGroup.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/AttackHandler.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/BuildUp.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/DGunController.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/DefenseMatrix.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/Defines.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/EconomyTracker.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/EconomyTracker.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/KAIK.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/KAIK.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/MTRand.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/MTRand.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/MetalMaker.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/MetalMap.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/MicroPather.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/MicroPather.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/PathFinder.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/SpotFinder.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/ThreatMap.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/Unit.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/UnitHandler.cpp [ Diff ] [ File ]
mod - AI/Skirmish/NullAI/data/AIOptions.lua [ Diff ] [ File ]
mod - AI/Skirmish/RAI/Builder.h [ Diff ] [ File ]
mod - AI/Skirmish/RAI/BuilderPlacement.h [ Diff ] [ File ]
mod - AI/Skirmish/RAI/CombatManager.cpp [ Diff ] [ File ]
mod - AI/Skirmish/RAI/GResourceMap.h [ Diff ] [ File ]
mod - AI/Skirmish/RAI/UnitDefHandler.cpp [ Diff ] [ File ]
mod - AI/Wrappers/JavaOO/CMakeLists.txt [ Diff ] [ File ]
mod - CMakeLists.txt [ Diff ] [ File ]
mod - Documentation/changelog.txt [ Diff ] [ File ]
mod - game/uikeys.txt [ Diff ] [ File ]
mod - installer/builddata/springcontent/LuaGadgets/gadgets.lua [ Diff ] [ File ]
mod - installer/builddata/springcontent/gamedata/explosions.lua [ Diff ] [ File ]
mod - installer/builddata/springcontent/gamedata/featuredefs.lua [ Diff ] [ File ]
mod - installer/builddata/springcontent/gamedata/parse_fbi.lua [ Diff ] [ File ]
mod - installer/builddata/springcontent/gamedata/weapondefs.lua [ Diff ] [ File ]
mod - installer/builddata/springcontent/shaders/terrainFragmentShader.glsl [ Diff ] [ File ]
mod - installer/builddata/springcontent/shaders/terrainVertexShader.glsl [ Diff ] [ File ]
rm - installer/builddata/springcontent/shaders/unit_shadow.fp [ Diff ] [ File ]
mod - installer/make_source_package.sh [ Diff ] [ File ]
mod - installer/springlobby_download.sh [ Diff ] [ File ]
mod - rts/CMakeLists.txt [ Diff ] [ File ]
mod - rts/ExternalAI/AICallback.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/IGlobalAI.h [ Diff ] [ File ]
mod - rts/ExternalAI/Interface/aidefines.h [ Diff ] [ File ]
mod - rts/ExternalAI/SAIInterfaceCallbackImpl.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/SkirmishAIWrapper.cpp [ Diff ] [ File ]
mod - rts/Game/Camera.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/CameraController.h [ Diff ] [ File ]
mod - rts/Game/Camera/FPSController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/FPSController.h [ Diff ] [ File ]
mod - rts/Game/Camera/OverviewController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/SmoothController.cpp [ Diff ] [ File ]
mod - rts/Game/CameraHandler.cpp [ Diff ] [ File ]
mod - rts/Game/Game.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.cpp [ Diff ] [ File ]
add - rts/Game/PlayerStatistics.cpp [ Diff ] [ File ]
add - rts/Game/PlayerStatistics.h [ Diff ] [ File ]
mod - rts/Game/PreGame.cpp [ Diff ] [ File ]
mod - rts/Game/PreGame.h [ Diff ] [ File ]
mod - rts/Game/SelectedUnits.cpp [ Diff ] [ File ]
mod - rts/Game/Server/GameParticipant.cpp [ Diff ] [ File ]
mod - rts/Game/Server/GameParticipant.h [ Diff ] [ File ]
mod - rts/Game/Server/MsgStrings.h [ Diff ] [ File ]
mod - rts/Game/StartScripts/SkirmishAITestScript.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GameInfo.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GameSetupDrawer.cpp [ 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/MouseHandler.h [ Diff ] [ File ]
mod - rts/Game/WaitCommandsAI.cpp [ Diff ] [ File ]
mod - rts/Game/WordCompletion.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaHandle.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaMaterial.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaOpenGL.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedCtrl.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedCtrl.h [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedMoveCtrl.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedMoveCtrl.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/LuaUnsyncedRead.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaVFS.cpp [ Diff ] [ File ]
mod - rts/Map/Ground.cpp [ Diff ] [ File ]
mod - rts/Map/Ground.h [ Diff ] [ File ]
mod - rts/Map/MapInfo.cpp [ Diff ] [ File ]
mod - rts/Map/MapInfo.h [ Diff ] [ File ]
mod - rts/Map/ReadMap.cpp [ Diff ] [ File ]
mod - rts/Map/SM3/Sm3GroundDrawer.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/BFGroundTextures.h [ Diff ] [ File ]
mod - rts/Map/SMF/SmfMapFile.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/SmfMapFile.h [ Diff ] [ File ]
add - rts/Menu/LobbyConnection.cpp [ Diff ] [ File ]
add - rts/Menu/LobbyConnection.h [ Diff ] [ File ]
add - rts/Menu/UpdaterWindow.cpp [ Diff ] [ File ]
add - rts/Menu/UpdaterWindow.h [ Diff ] [ File ]
mod - rts/Rendering/Env/BumpWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/BumpWater.h [ Diff ] [ File ]
add - rts/Rendering/Env/CubeMapHandler.cpp [ Diff ] [ File ]
add - rts/Rendering/Env/CubeMapHandler.h [ Diff ] [ File ]
mod - rts/Rendering/GL/FBO.cpp [ Diff ] [ File ]
mod - rts/Rendering/GL/myGL.cpp [ Diff ] [ File ]
mod - rts/Rendering/HUDDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/HUDDrawer.h [ Diff ] [ File ]
mod - rts/Rendering/Screenshot.cpp [ Diff ] [ File ]
add - rts/Rendering/Shaders/Shader.cpp [ Diff ] [ File ]
add - rts/Rendering/Shaders/Shader.hpp [ Diff ] [ File ]
add - rts/Rendering/Shaders/ShaderHandler.cpp [ Diff ] [ File ]
add - rts/Rendering/Shaders/ShaderHandler.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/Bitmap.h [ Diff ] [ File ]
mod - rts/Rendering/Textures/ColorMap.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/TextureAtlas.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitModels/FeatureDrawer.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/FeatureHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Features/FeatureHandler.h [ Diff ] [ File ]
rm - rts/Sim/Features/FeatureSet.cpp [ Diff ] [ File ]
mod - rts/Sim/Features/FeatureSet.h [ Diff ] [ File ]
mod - rts/Sim/Misc/CategoryHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/CategoryHandler.h [ Diff ] [ File ]
mod - rts/Sim/Misc/GlobalSynced.h [ Diff ] [ File ]
add - rts/Sim/Misc/SmoothHeightMesh.cpp [ Diff ] [ File ]
add - 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 ]
add - rts/Sim/Misc/TeamStatistics.cpp [ Diff ] [ File ]
add - 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/AAirMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/AAirMoveType.h [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/AirMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/ScriptMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/TAAirMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/TAAirMoveType.h [ Diff ] [ File ]
mod - rts/Sim/Path/PathEstimator.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/ProjectileHandler.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/CommandAI.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/Groups/Group.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/Groups/Group.h [ Diff ] [ File ]
mod - rts/Sim/Units/Groups/GroupHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/Groups/GroupHandler.h [ 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/UnitLoader.cpp [ Diff ] [ File ]
rm - rts/Sim/Units/UnitSet.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitSet.h [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/Builder.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/Builder.h [ Diff ] [ File ]
mod - rts/System/BaseNetProtocol.cpp [ Diff ] [ File ]
mod - rts/System/DemoReader.cpp [ Diff ] [ File ]
mod - rts/System/DemoReader.h [ Diff ] [ File ]
mod - rts/System/DemoRecorder.cpp [ Diff ] [ File ]
mod - rts/System/DemoRecorder.h [ Diff ] [ File ]
mod - rts/System/FileSystem/Archive7Zip.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/Archive7Zip.h [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveBuffered.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveBuffered.h [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchivePool.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveScanner.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveScanner.h [ Diff ] [ File ]
mod - rts/System/FileSystem/DataDirLocater.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 ]
add - rts/System/FileSystem/FileSystemHandler.cpp [ Diff ] [ File ]
add - rts/System/FileSystem/FileSystemHandler.h [ Diff ] [ File ]
mod - rts/System/FileSystem/VFSHandler.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/VFSHandler.h [ Diff ] [ File ]
mod - rts/System/GlobalUnsynced.cpp [ Diff ] [ File ]
mod - rts/System/LoadSaveHandler.cpp [ Diff ] [ File ]
mod - rts/System/LogOutput.cpp [ Diff ] [ File ]
mod - rts/System/NetProtocol.cpp [ Diff ] [ File ]
mod - rts/System/Platform/CrashHandler.cpp [ Diff ] [ File ]
mod - rts/System/Platform/Win/CrashHandler.cpp [ Diff ] [ File ]
mod - rts/System/SpringApp.cpp [ Diff ] [ File ]
rm - rts/System/UpdaterWindow.cpp [ Diff ] [ File ]
rm - rts/System/UpdaterWindow.h [ Diff ] [ File ]
mod - rts/System/Util.cpp [ Diff ] [ File ]
mod - rts/System/Util.h [ Diff ] [ File ]
mod - rts/System/creg/STL_Set.h [ Diff ] [ File ]
mod - rts/System/maindefines.h [ Diff ] [ File ]
mod - rts/System/mmgr.cpp [ Diff ] [ File ]
mod - rts/aGui/Gui.cpp [ Diff ] [ File ]
mod - rts/aGui/Gui.h [ Diff ] [ File ]
mod - rts/aGui/GuiElement.cpp [ Diff ] [ File ]
mod - rts/aGui/GuiElement.h [ Diff ] [ File ]
mod - rts/aGui/HorizontalLayout.cpp [ Diff ] [ File ]
mod - rts/aGui/LineEdit.cpp [ Diff ] [ File ]
mod - rts/aGui/LineEdit.h [ Diff ] [ File ]
mod - rts/aGui/List.cpp [ Diff ] [ File ]
mod - rts/aGui/List.h [ Diff ] [ File ]
mod - rts/aGui/Picture.cpp [ Diff ] [ File ]
mod - rts/aGui/TextElement.cpp [ Diff ] [ File ]
mod - rts/aGui/Window.cpp [ Diff ] [ File ]
mod - rts/build/cmake/FindAsciiDoc.cmake [ Diff ] [ File ]
mod - rts/build/scons/filelist.py [ 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/gmlcnt.h [ Diff ] [ File ]
mod - rts/lib/gml/gmldef.h [ Diff ] [ File ]
mod - rts/lib/gml/gmlfun.h [ Diff ] [ File ]
mod - rts/lib/gml/gmlimp.h [ Diff ] [ File ]
mod - rts/lib/gml/gmlsrv.h [ Diff ] [ File ]
mod - rts/lib/liblobby/CMakeLists.txt [ Diff ] [ File ]
mod - rts/lib/liblobby/Connection.cpp [ Diff ] [ File ]
mod - rts/lib/liblobby/Connection.h [ Diff ] [ File ]
add - rts/lib/liblobby/UserCache.cpp [ Diff ] [ File ]
add - rts/lib/liblobby/UserCache.h [ Diff ] [ File ]
add - rts/lib/liblobby/md5/base64.cpp [ Diff ] [ File ]
add - rts/lib/liblobby/md5/base64.h [ Diff ] [ File ]
add - rts/lib/liblobby/md5/md5.c [ Diff ] [ File ]
add - rts/lib/liblobby/md5/md5.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 ]
rm - tools/DemoAnalyser/CMakeLists.txt [ Diff ] [ File ]
rm - tools/DemoAnalyser/main.cpp [ Diff ] [ File ]
rm - tools/DemoDumper/CMakeLists.txt [ Diff ] [ File ]
rm - tools/DemoDumper/DemoDumper.cpp [ Diff ] [ File ]
rm - tools/DemoDumper/DemoDumper.sln [ Diff ] [ File ]
rm - tools/DemoDumper/DemoDumper.vcproj [ Diff ] [ File ]
rm - tools/DemoDumper/README.txt [ Diff ] [ File ]
add - tools/DemoTool/CMakeLists.txt [ Diff ] [ File ]
add - tools/DemoTool/DemoTool.cpp [ Diff ] [ File ]
add - tools/DemoTool/StringSerializer.h [ Diff ] [ File ]
mod - tools/unitsync/unitsync.cpp [ Diff ] [ File ]