2025-08-25 17:24 CEST

spring: develop 941b4c92 Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
Tobi Vollebregt Tobi Vollebregt develop 2011-07-03 01:30:40 develop 693b824e
Changeset Merge branch 'master' into features/config-rework

Conflicts:
    rts/Rendering/Env/BumpWater.cpp
mod - CMakeLists.txt Diff ] File ]
mod - LICENSE Diff ] File ]
mod - LICENSE.html Diff ] File ]
mod - buildbot/slave/make_installer.sh Diff ] File ]
mod - buildbot/slave/rsync.sh Diff ] File ]
mod - doc/CMakeLists.txt Diff ] File ]
mod - installer/include/aiHelpers.nsh Diff ] File ]
add - installer/include/extractFile.nsh Diff ] File ]
mod - installer/make_installer.pl Diff ] File ]
mod - installer/sections/archivemover.nsh Diff ] File ]
add - installer/sections/deprecated.nsh Diff ] File ]
mod - installer/sections/docs.nsh Diff ] File ]
rm - installer/sections/luaui.nsh Diff ] File ]
mod - installer/sections/main.nsh Diff ] File ]
mod - installer/sections/rapid.nsh Diff ] File ]
mod - installer/sections/sectiondesc.nsh Diff ] File ]
mod - installer/sections/setupSections.nsh Diff ] File ]
mod - installer/sections/shortcuts_startMenu.nsh Diff ] File ]
add - installer/sections/springsettings.nsh Diff ] File ]
mod - installer/spring.nsi Diff ] File ]
mod - rts/ExternalAI/AICallback.cpp Diff ] File ]
mod - rts/Game/Camera.cpp Diff ] File ]
mod - rts/Game/Camera/FPSController.cpp Diff ] File ]
mod - rts/Game/Camera/FreeController.cpp Diff ] File ]
mod - rts/Game/Camera/OrbitController.cpp Diff ] File ]
mod - rts/Game/Camera/OverheadController.cpp Diff ] File ]
mod - rts/Game/Camera/OverviewController.cpp Diff ] File ]
mod - rts/Game/Camera/RotOverheadController.cpp Diff ] File ]
mod - rts/Game/Camera/SmoothController.cpp Diff ] File ]
mod - rts/Game/Camera/TWController.cpp Diff ] File ]
mod - rts/Game/Game.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/GameVersion.h Diff ] File ]
mod - rts/Game/InMapDraw.cpp Diff ] File ]
mod - rts/Game/InMapDrawModel.cpp Diff ] File ]
mod - rts/Game/NetCommands.cpp Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/TraceRay.cpp Diff ] File ]
mod - rts/Game/TraceRay.h Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/MiniMap.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.cpp Diff ] File ]
mod - rts/Game/UI/SelectionKeyHandler.cpp Diff ] File ]
mod - rts/Game/UI/StartPosSelecter.cpp Diff ] File ]
mod - rts/Game/UI/UnitTracker.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedRead.cpp Diff ] File ]
mod - rts/Map/BaseGroundDrawer.cpp Diff ] File ]
mod - rts/Map/BasicMapDamage.cpp Diff ] File ]
mod - rts/Map/Ground.cpp Diff ] File ]
mod - rts/Map/Ground.h Diff ] File ]
mod - rts/Map/ReadMap.cpp Diff ] File ]
mod - rts/Map/ReadMap.h Diff ] File ]
mod - rts/Map/SMF/SMFGroundDrawer.cpp Diff ] File ]
mod - rts/Map/SMF/SMFGroundTextures.cpp Diff ] File ]
mod - rts/Map/SMF/SMFReadMap.cpp Diff ] File ]
mod - rts/Map/SMF/SMFReadMap.h Diff ] File ]
mod - rts/Rendering/CommandDrawer.cpp Diff ] File ]
mod - rts/Rendering/DefaultPathDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvSky.cpp Diff ] File ]
mod - rts/Rendering/Env/BaseWater.cpp Diff ] File ]
mod - rts/Rendering/Env/BaseWater.h Diff ] File ]
mod - rts/Rendering/Env/BasicSky.cpp Diff ] File ]
mod - rts/Rendering/Env/BumpWater.cpp Diff ] File ]
mod - rts/Rendering/Env/CubeMapHandler.cpp Diff ] File ]
mod - rts/Rendering/Env/GrassDrawer.cpp Diff ] File ]
mod - rts/Rendering/GL/glExtra.cpp Diff ] File ]
mod - rts/Rendering/GroundDecalHandler.cpp Diff ] File ]
mod - rts/Rendering/GroundFlash.cpp Diff ] File ]
mod - rts/Rendering/Models/IModelParser.cpp Diff ] File ]
mod - rts/Rendering/ShadowHandler.cpp Diff ] File ]
mod - rts/Rendering/UnitDrawer.cpp Diff ] File ]
mod - rts/Rendering/WindowManagerHelper.cpp Diff ] File ]
mod - rts/Rendering/WindowManagerHelper.h Diff ] File ]
mod - rts/Rendering/WorldDrawer.cpp Diff ] File ]
mod - rts/Sim/Misc/LosMap.cpp Diff ] File ]
mod - rts/Sim/Misc/RadarHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/SmoothHeightMesh.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/AAirMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/TAAirMoveType.cpp Diff ] File ]
mod - rts/Sim/Path/Default/PathManager.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ProjectileHandler.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/TransportCAI.cpp Diff ] File ]
mod - rts/Sim/Units/Scripts/CobEngine.cpp Diff ] File ]
mod - rts/Sim/Units/Scripts/UnitScriptEngine.cpp Diff ] File ]
mod - rts/Sim/Units/Unit.cpp Diff ] File ]
mod - rts/Sim/Units/UnitHandler.cpp Diff ] File ]
mod - rts/Sim/Units/UnitHandler.h Diff ] File ]
mod - rts/Sim/Units/UnitLoader.cpp Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Builder.cpp Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Building.cpp Diff ] File ]
mod - rts/Sim/Units/UnitTypes/TransportUnit.cpp Diff ] File ]
mod - rts/System/EventClient.h Diff ] File ]
mod - rts/System/EventHandler.cpp Diff ] File ]
mod - rts/System/EventHandler.h Diff ] File ]
mod - rts/System/SpringApp.cpp Diff ] File ]
mod - rts/System/TimeProfiler.cpp Diff ] File ]
mod - rts/System/TimeProfiler.h Diff ] File ]
mod - rts/aGui/List.cpp Diff ] File ]
add - rts/build/cmake/FindMarkdown.cmake Diff ] File ]
mod - rts/build/cmake/FindPandoc.cmake Diff ] File ]
mod - rts/builds/CMakeLists.txt Diff ] File ]
mod - tools/unitsync/unitsync_api.h Diff ] File ]