| spring: develop 89102761 | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| hoijui | hoijui | develop | 2010-05-31 07:56:56 | develop 451f9aec |
| Changeset | Merge remote branch 'originSpring/master' into pureint Conflicts: AI/Skirmish/E323AI installer/sections/main.nsh installer/spring.nsi rts/Game/Game.cpp |
|||
| mod - .gitignore | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | |||
| mod - CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - buildbot/make_installer.sh | [ Diff ] [ File ] | |||
| mod - buildbot/rsync.sh | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl | [ Diff ] [ File ] | |||
| mod - doc/changelog.txt | [ Diff ] [ File ] | |||
| mod - installer/checkdotnet.nsh | [ Diff ] [ File ] | |||
| add - installer/include/echo.nsh | [ Diff ] [ File ] | |||
| mod - installer/make_installer.pl | [ Diff ] [ File ] | |||
| mod - installer/sections/archivemover.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/docs.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/main.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/sectiondesc.nsh | [ Diff ] [ File ] | |||
| add - installer/sections/selectionEditor.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/shortcuts.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/springDownloader.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/springlobby.nsh | [ Diff ] [ File ] | |||
| mod - installer/spring.nsi | [ Diff ] [ File ] | |||
| mod - installer/springsettings.nsh | [ Diff ] [ File ] | |||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameHelper.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaParser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/BFGroundTextures.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/BFGroundTextures.h | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/SmfReadMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/SmfReadMap.h | [ Diff ] [ File ] | |||
| add - rts/Rendering/GL/PBO.cpp | [ Diff ] [ File ] | |||
| add - rts/Rendering/GL/PBO.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GroundFlash.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GroundFlash.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/ProjectileDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Textures/TextureAtlas.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/Team.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/TeamHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/TeamHandler.h | [ Diff ] [ File ] | |||
| add - rts/Sim/Misc/TeamHighlight.cpp | [ Diff ] [ File ] | |||
| add - rts/Sim/Misc/TeamHighlight.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/MobileCAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/ConfigHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/ConfigHandler.h | [ Diff ] [ File ] | |||
| add - rts/System/GlobalConfig.cpp | [ Diff ] [ File ] | |||
| add - rts/System/GlobalConfig.h | [ Diff ] [ File ] | |||
| mod - rts/System/Input/Joystick.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Input/Joystick.h | [ Diff ] [ File ] | |||
| mod - rts/System/Input/MouseInput.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Input/MouseInput.h | [ Diff ] [ File ] | |||
| mod - rts/System/Net/UDPConnection.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Net/UDPConnection.h | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Win/wsdl.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Win/wsdl.h | [ Diff ] [ File ] | |||
| mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | |||
| mod - rts/aGui/Gui.cpp | [ Diff ] [ File ] | |||
| mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | |||
| mod - tools/DedicatedServer/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - tools/unitsync/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync.cpp | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync.h | [ Diff ] [ File ] | |||
