2025-08-12 20:58 CEST

spring: develop 5d15de95 Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2009-11-14 10:08:40 develop 1c9524dd
Changeset Merge commit 'spring/master' into springheadless

Conflicts:
    rts/Game/Game.cpp
mod - AI/Interfaces/Java/src/main/native/JvmLocater_windows.c Diff ] File ]
mod - AI/Skirmish/AAI/data/AIInfo.lua Diff ] File ]
add - AI/Skirmish/AAI/data/cfg/mod/BA704.cfg Diff ] File ]
mod - AI/Skirmish/E323AI Diff ] File ]
mod - AI/Skirmish/KAIK/DGunController.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/PathFinder.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/PathFinder.h Diff ] File ]
mod - AI/Skirmish/KAIK/ThreatMap.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/Unit.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/data/AIInfo.lua Diff ] File ]
mod - AI/Skirmish/NullAI/data/AIInfo.lua Diff ] File ]
mod - AI/Skirmish/RAI/data/AIInfo.lua Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - Documentation/changelog.txt Diff ] File ]
mod - SConstruct Diff ] File ]
mod - installer/freedesktop/applications/spring.desktop Diff ] File ]
mod - installer/make_gamedata_arch.bat Diff ] File ]
mod - installer/make_gamedata_arch.sh Diff ] File ]
mod - installer/make_source_package.sh Diff ] File ]
add - installer/sections/AIs/E323AI.nsh Diff ] File ]
mod - installer/sections/sectiondesc.nsh Diff ] File ]
mod - installer/spring.nsi Diff ] File ]
mod - rts/CMakeLists.txt Diff ] File ]
mod - rts/ExternalAI/AICallback.cpp Diff ] File ]
mod - rts/ExternalAI/EngineOutHandler.h Diff ] File ]
mod - rts/ExternalAI/Interface/SAIInterfaceCallback.h Diff ] File ]
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIHandler.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIHandler.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.h Diff ] File ]
mod - rts/Game/Console.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/GameVersion.cpp Diff ] File ]
mod - rts/Game/OSCStatsSender.cpp Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/PreGame.h Diff ] File ]
mod - rts/Game/SelectMenu.cpp Diff ] File ]
mod - rts/Game/SelectMenu.h Diff ] File ]
mod - rts/Game/SelectedUnits.cpp Diff ] File ]
mod - rts/Game/SelectionWidget.cpp Diff ] File ]
mod - rts/Game/SelectionWidget.h Diff ] File ]
mod - rts/Game/Server/GameParticipant.cpp Diff ] File ]
mod - rts/Game/Server/GameParticipant.h Diff ] File ]
mod - rts/Game/UI/GameInfo.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/TooltipConsole.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/LuaSyncedRead.cpp Diff ] File ]
mod - rts/Map/BasicMapDamage.cpp Diff ] File ]
mod - rts/Map/BasicMapDamage.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/terrain/Terrain.h Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTexture.cpp Diff ] File ]
mod - rts/Rendering/GL/myGL.cpp Diff ] File ]
mod - rts/Rendering/Textures/Bitmap.cpp Diff ] File ]
mod - rts/Rendering/glFont.cpp Diff ] File ]
mod - rts/Rendering/glFont.h Diff ] File ]
mod - rts/Sim/Features/FeatureHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/Team.cpp Diff ] File ]
mod - rts/Sim/Misc/Team.h Diff ] File ]
mod - rts/Sim/Misc/TeamBase.h 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/Units/CommandAI/BuilderCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.h Diff ] File ]
mod - rts/Sim/Units/UnitDefHandler.h Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Builder.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/EventHandler.cpp Diff ] File ]
mod - rts/System/FileSystem/FileSystem.cpp Diff ] File ]
mod - rts/System/FileSystem/FileSystem.h Diff ] File ]
mod - rts/System/MouseInput.h Diff ] File ]
mod - rts/System/Net/UDPConnection.cpp Diff ] File ]
mod - rts/System/Net/UDPConnection.h Diff ] File ]
mod - rts/System/NetProtocol.cpp Diff ] File ]
mod - rts/System/Option.cpp Diff ] File ]
mod - rts/System/Option.h Diff ] File ]
mod - rts/System/Platform/Win/CrashHandler.cpp Diff ] File ]
mod - rts/System/SpringApp.cpp Diff ] File ]
mod - rts/System/creg/Serializer.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/Window.h Diff ] File ]
add - rts/build/cmake/Find7zip.cmake Diff ] File ]
mod - rts/build/cmake/FindZLIB.cmake Diff ] File ]
mod - rts/build/vstudio8/rts.vcproj Diff ] File ]
mod - rts/lib/gml/gml.h Diff ] File ]