2025-08-12 13:59 CEST

spring: develop ec59e302 Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
Tobi Vollebregt Tobi Vollebregt develop 2009-05-12 22:38:45 develop 5e7c5d42
Changeset Merge commit 'origin/master' into luacob

Conflicts:
    rts/Sim/Units/UnitLoader.cpp
mod - AI/Interfaces/Java/bin/ant.properties Diff ] File ]
mod - AI/Interfaces/Java/bin/build.xml Diff ] File ]
mod - AI/Skirmish/NullJavaAI/bin/ant.dependent.properties Diff ] File ]
mod - AI/Skirmish/NullJavaAI/bin/ant.independent.properties Diff ] File ]
mod - AI/Skirmish/NullJavaAI/bin/build.xml Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/bin/ant.dependent.properties Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/bin/ant.independent.properties Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/bin/build.xml Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp Diff ] File ]
mod - rts/ExternalAI/AICallback.cpp Diff ] File ]
mod - rts/ExternalAI/IAICallback.h Diff ] File ]
mod - rts/ExternalAI/Interface/AISCommands.h Diff ] File ]
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.cpp Diff ] File ]
mod - rts/Rendering/GL/FBO.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/UnitDrawer.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/FactoryCAI.cpp Diff ] File ]
mod - rts/Sim/Units/Unit.cpp Diff ] File ]
mod - rts/Sim/Units/UnitLoader.cpp Diff ] File ]
mod - rts/Sim/Units/UnitLoader.h Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Builder.cpp Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Builder.h Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Factory.cpp Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Factory.h Diff ] File ]
mod - rts/System/BaseNetProtocol.h Diff ] File ]
mod - rts/System/Sound/SoundSource.cpp Diff ] File ]
mod - rts/System/SpringApp.cpp Diff ] File ]
mod - rts/build/cmake/FindDevil.cmake Diff ] File ]
mod - rts/build/scons/rts.py Diff ] File ]