spring: develop 64a22cb6 | [ Diff ] [ Back to Repository ] | |||
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
hoijui | hoijui | develop | 2009-01-14 22:16:06 | develop 5217d443 |
Changeset | Merge commit 'origin/master' into caiinterface Conflicts: .gitignore rts/Game/GameSetup.cpp rts/Game/StartScripts/GlobalAITestScript.cpp rts/build/kdevelop/rts.kdevelop rts/build/scons/config.py rts/build/scons/rts.py |
|||
mod - .gitignore | [ Diff ] [ File ] | |||
mod - CMakeLists.txt | [ Diff ] [ File ] | |||
mod - Documentation/changelog.txt | [ Diff ] [ File ] | |||
mod - Documentation/releasechecklist.txt | [ 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/shortcuts.nsh | [ Diff ] [ File ] | |||
mod - installer/sections/springlobby.nsh | [ Diff ] [ File ] | |||
mod - installer/sections/tasclient.nsh | [ Diff ] [ File ] | |||
mod - installer/spring.nsi | [ Diff ] [ File ] | |||
add - installer/springlobby_download.sh | [ Diff ] [ File ] | |||
add - installer/tasclient_download.sh | [ Diff ] [ File ] | |||
mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/GameSetup.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/GameVersion.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/UI/GuiHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | |||
mod - rts/Lua/LuaOpenGL.h | [ Diff ] [ File ] | |||
mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | |||
mod - rts/Lua/LuaUnsyncedRead.cpp | [ Diff ] [ File ] | |||
mod - rts/Rendering/Env/AdvSky.cpp | [ Diff ] [ File ] | |||
mod - rts/Rendering/Env/AdvSky.h | [ Diff ] [ File ] | |||
mod - rts/Rendering/Env/BasicSky.cpp | [ Diff ] [ File ] | |||
mod - rts/Rendering/Env/BasicSky.h | [ Diff ] [ File ] | |||
mod - rts/Rendering/UnitModels/UnitDrawer.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Features/FeatureHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Misc/AirBaseHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/MoveTypes/MoveType.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/CobEngine.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/CobEngine.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/CobInstance.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/CobThread.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/CobThread.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/CommandAI/AirCAI.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/Unit.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/Unit.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Weapons/Weapon.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Weapons/WeaponDefHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/System/Net/Socket.cpp | [ Diff ] [ File ] | |||
mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | |||
mod - rts/System/Sync/Logger.cpp | [ Diff ] [ File ] | |||
rm - rts/build/kdevelop/rts.kdevelop | [ Diff ] [ File ] | |||
mod - rts/build/scons/config.py | [ Diff ] [ File ] | |||
mod - rts/build/scons/rts.py | [ Diff ] [ File ] | |||
mod - tools/unitsync/CMakeLists.txt | [ Diff ] [ File ] |