| spring: develop 6dd6cd71 | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| zerver | zerver | develop | 2011-01-20 19:34:53 | develop 0d570e29 |
| Changeset | Merge branch 'master' of github.com:spring/spring Conflicts: rts/Map/BaseGroundDrawer.h rts/Rendering/UnitDrawer.cpp |
|||
| mod - AI/Skirmish/KAIK/AIClasses.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/DefenseMatrix.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/DefenseMatrix.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/KAIK.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/PathFinder.cpp | [ Diff ] [ File ] | |||
| mod - Doxyfile | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/GroundDecalsFragProg.glsl | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/GroundDecalsVertProg.glsl | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/ModelFragProg.glsl | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/ModelVertProg.glsl | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/SMFVertProg.glsl | [ Diff ] [ File ] | |||
| mod - doc/StartScriptFormat.txt | [ Diff ] [ File ] | |||
| mod - doc/releasechecklist.txt | [ Diff ] [ File ] | |||
| mod - installer/make_installer.pl | [ Diff ] [ File ] | |||
| mod - installer/make_portable_archive.sh | [ Diff ] [ File ] | |||
| mod - installer/sections/archivemover.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/main.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/setupSections.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/shortcuts_desktop.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/zeroK.nsh | [ Diff ] [ File ] | |||
| mod - installer/spring.nsi | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/SSkirmishAICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/ClientSetup.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameHelper.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameHelper.h | [ 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/GameVersion.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Server/MsgStrings.h | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/GuiHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaFonts.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaPathFinder.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedMoveCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnitDefs.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnsyncedCtrl.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaWeaponDefs.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/BaseGroundDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/BFGroundDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/BFGroundDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/FarTextureHandler.cpp | [ Diff ] [ File ] | |||
| add - rts/Rendering/GL/Light.h | [ Diff ] [ File ] | |||
| add - rts/Rendering/GL/LightHandler.cpp | [ Diff ] [ File ] | |||
| add - rts/Rendering/GL/LightHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GroundDecalHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Shaders/ShaderHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/ShadowHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Textures/Bitmap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Textures/S3OTextureHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/CollisionVolume.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/GroundMoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/MoveInfo.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/MoveInfo.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/Default/PathEstimator.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/Default/PathEstimator.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ExpGenSpawner.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ExpGenSpawner.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ExplosionGenerator.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ExplosionGenerator.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/COB/UnitScript.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDef.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDef.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitTypes/Building.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/WeaponDef.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/WeaponDefHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/AutohostInterface.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/AutohostInterface.h | [ Diff ] [ File ] | |||
| mod - rts/System/Net/Socket.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Net/Socket.h | [ Diff ] [ File ] | |||
| mod - rts/System/Net/UDPConnection.h | [ Diff ] [ File ] | |||
| mod - rts/System/Net/UDPListener.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Net/UDPListener.h | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync.cpp | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync_api.h | [ Diff ] [ File ] | |||
