2025-08-15 21:18 CEST

spring: develop b3be29cc Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2009-01-15 00:05:36 develop 5eb2beef
Changeset Merge commit 'origin/master' into caiinterface

Conflicts:

    AI/CMakeLists.txt
    installer/make_source_package.sh
    installer/spring.nsi
mod - AI/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/CMakeLists.txt Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - game/LuaUI/Widgets/unit_immobile_buider.lua Diff ] File ]
mod - installer/include/checkrunning.nsh Diff ] File ]
mod - installer/make_source_package.sh Diff ] File ]
mod - rts/CMakeLists.txt Diff ] File ]
mod - rts/Game/GameHelper.cpp Diff ] File ]
mod - rts/Game/GameSetup.cpp Diff ] File ]
mod - rts/Game/StartScripts/CommanderScript.cpp Diff ] File ]
mod - rts/Rendering/GL/FBO.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/3DModel.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/3DModel.h Diff ] File ]
mod - rts/Rendering/UnitModels/3DOParser.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/3DOParser.h Diff ] File ]
mod - rts/Rendering/glFont.cpp Diff ] File ]
mod - rts/Sim/Misc/Team.cpp Diff ] File ]
mod - rts/Sim/Units/COB/CobInstance.cpp Diff ] File ]
mod - rts/Sim/Units/COB/CobInstance.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp Diff ] File ]
mod - rts/Sim/Units/Unit.cpp Diff ] File ]
mod - rts/System/BaseNetProtocol.h 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/FileSystem/ArchiveScanner.cpp Diff ] File ]
mod - rts/System/Net/UDPConnection.cpp Diff ] File ]
mod - rts/System/NetProtocol.cpp Diff ] File ]