spring: develop 30a72ba3 | [ Diff ] [ Back to Repository ] | |||
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
hoijui | hoijui | develop | 2010-06-02 19:48:16 | develop 6299cd4f |
Changeset | Merge remote branch 'originSpring/master' into pureint Conflicts: AI/Wrappers/CUtils/SharedLibrary.c |
|||
mod - AI/Skirmish/KAIK/CMakeLists.txt | [ Diff ] [ File ] | |||
mod - AI/Wrappers/CUtils/SharedLibrary.c | [ Diff ] [ File ] | |||
mod - AI/Wrappers/CUtils/Util.c | [ Diff ] [ File ] | |||
mod - CMakeLists.txt | [ Diff ] [ File ] | |||
add - game/LuaUI/Widgets/headless_setup.lua | [ Diff ] [ File ] | |||
add - game/springrc-template-headless.txt | [ Diff ] [ File ] | |||
mod - rts/CMakeLists.txt | [ Diff ] [ File ] | |||
mod - rts/Game/Game.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/GameData.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/GameServer.h | [ Diff ] [ File ] | |||
mod - rts/Game/GameVersion.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | |||
mod - rts/Lua/LuaLobby.h | [ Diff ] [ File ] | |||
mod - rts/Map/BaseGroundDrawer.cpp | [ Diff ] [ File ] | |||
mod - rts/Map/BaseGroundDrawer.h | [ Diff ] [ File ] | |||
mod - rts/Map/HeightMapTexture.cpp | [ Diff ] [ File ] | |||
mod - rts/Map/HeightMapTexture.h | [ Diff ] [ File ] | |||
mod - rts/Menu/LobbyConnection.h | [ Diff ] [ File ] | |||
mod - rts/Menu/UpdaterWindow.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/MoveTypes/MoveInfo.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Path/PathFinder.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Path/PathFinder.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Path/PathManager.h | [ Diff ] [ File ] | |||
mod - rts/System/BaseNetProtocol.cpp | [ Diff ] [ File ] | |||
mod - rts/System/BaseNetProtocol.h | [ Diff ] [ File ] | |||
mod - rts/System/Net/UnpackPacket.cpp | [ Diff ] [ File ] | |||
mod - rts/System/Net/UnpackPacket.h | [ Diff ] [ File ] | |||
mod - rts/System/NetProtocol.cpp | [ Diff ] [ File ] | |||
mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | |||
mod - rts/build/cmake/FindWindres.cmake | [ Diff ] [ File ] | |||
mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | |||
add - rts/builds/CMakeLists.txt | [ Diff ] [ File ] | |||
add - rts/builds/GML/CMakeLists.txt | [ Diff ] [ File ] | |||
add - rts/builds/HL/CMakeLists.txt | [ Diff ] [ File ] | |||
add - rts/builds/HL/README.markdown | [ Diff ] [ File ] | |||
add - rts/lib/7z/CMakeLists.txt | [ Diff ] [ File ] | |||
mod - rts/lib/CMakeLists.txt | [ Diff ] [ File ] | |||
add - rts/lib/gml/CMakeLists.txt | [ Diff ] [ File ] | |||
mod - rts/lib/gml/gmlcls.h | [ Diff ] [ File ] | |||
mod - rts/lib/gml/gmlsrv.h | [ Diff ] [ File ] | |||
add - rts/lib/headlessStubs/CMakeLists.txt | [ Diff ] [ File ] | |||
add - rts/lib/headlessStubs/README.markdown | [ Diff ] [ File ] | |||
add - rts/lib/headlessStubs/glewstub.c | [ Diff ] [ File ] | |||
add - rts/lib/headlessStubs/glstub.c | [ Diff ] [ File ] | |||
add - rts/lib/headlessStubs/glustub.c | [ Diff ] [ File ] | |||
add - rts/lib/headlessStubs/sdlstub.c | [ Diff ] [ File ] | |||
add - rts/lib/headlessStubs/sdlstub_cppbit.cpp | [ Diff ] [ File ] | |||
rm - rts/lib/liblobby/CMakeLists.txt | [ Diff ] [ File ] | |||
rm - rts/lib/liblobby/Test/testapp.cpp | [ Diff ] [ File ] | |||
add - rts/lib/lobby/CMakeLists.txt | [ Diff ] [ File ] | |||
add - rts/lib/lobby/RawTextMessage.cpp | [ Diff ] [ File ] | |||
add - rts/lib/lobby/RawTextMessage.h | [ Diff ] [ File ] | |||
add - rts/lib/lobby/Test/CMakeLists.txt | [ Diff ] [ File ] | |||
add - rts/lib/lobby/Test/TestConnection.cpp | [ Diff ] [ File ] | |||
add - rts/lib/lobby/Test/TestConnection.h | [ Diff ] [ File ] | |||
add - rts/lib/lobby/Test/main.cpp | [ Diff ] [ File ] | |||
add - rts/lib/lua/CMakeLists.txt | [ Diff ] [ File ] | |||
add - rts/lib/md5/CMakeLists.txt | [ Diff ] [ File ] | |||
add - rts/lib/minizip/CMakeLists.txt | [ Diff ] [ File ] | |||
add - rts/lib/oscpack/CMakeLists.txt | [ Diff ] [ File ] | |||
mod - rts/lib/streflop/CMakeLists.txt | [ Diff ] [ File ] |