2025-11-20 19:08 CET
  

Changesets: spring

[ Search ] [ Browse ] [ Back to Index ]
maintenance d956a90c
Timestamp: 2018-05-07 02:05:56
Author: rt
[ Details ] [ Diff ] 		-
mod - rts/Game/UI/KeySet.cpp [ Diff ] [ File ]
develop e8ebe14a
Timestamp: 2018-05-07 01:46:44
Author: rt
[ Details ] [ Diff ] 		reuse keybindings
mod - rts/Game/Game.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GameSetupDrawer.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UI/KeyBindings.cpp [ Diff ] [ File ]
mod - rts/Game/UI/KeyBindings.h [ Diff ] [ File ]
mod - rts/Game/UI/KeySet.cpp [ Diff ] [ File ]
mod - rts/Game/UnsyncedGameCommands.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedRead.cpp [ Diff ] [ File ]
mod - rts/System/SpringApp.cpp [ Diff ] [ File ]
maintenance 98f362b1
Timestamp: 2018-05-07 01:46:44
Author: rt
[ Details ] [ Diff ] 		reuse keybindings
mod - rts/Game/Game.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GameSetupDrawer.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UI/KeyBindings.cpp [ Diff ] [ File ]
mod - rts/Game/UI/KeyBindings.h [ Diff ] [ File ]
mod - rts/Game/UI/KeySet.cpp [ Diff ] [ File ]
mod - rts/Game/UnsyncedGameCommands.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedRead.cpp [ Diff ] [ File ]
mod - rts/System/SpringApp.cpp [ Diff ] [ File ]
develop 92ceb74a
Timestamp: 2018-05-07 01:01:58
Author: rt
[ Details ] [ Diff ] 		fix UDPL test
mod - rts/System/GlobalConfig.h [ Diff ] [ File ]
mod - test/engine/System/NullGlobalConfig.cpp [ Diff ] [ File ]
maintenance 96f226eb
Timestamp: 2018-05-07 01:01:58
Author: rt
[ Details ] [ Diff ] 		fix UDPL test
mod - rts/System/GlobalConfig.h [ Diff ] [ File ]
mod - test/engine/System/NullGlobalConfig.cpp [ Diff ] [ File ]
develop 972a67cc
Timestamp: 2018-05-07 00:39:08
Author: rt
[ Details ] [ Diff ] 		fix DS after c4e54911
mod - rts/builds/dedicated/main.cpp [ Diff ] [ File ]
maintenance 3574946d
Timestamp: 2018-05-07 00:39:08
Author: rt
[ Details ] [ Diff ] 		fix DS after c4e54911
mod - rts/builds/dedicated/main.cpp [ Diff ] [ File ]
develop 62f816c7
Timestamp: 2018-05-07 00:29:52
Author: rt
[ Details ] [ Diff ] 		do not add /key* words twice
mod - rts/Game/UI/KeyBindings.cpp [ Diff ] [ File ]
mod - rts/Game/WordCompletion.cpp [ Diff ] [ File ]
maintenance 3ea39a66
Timestamp: 2018-05-07 00:29:52
Author: rt
[ Details ] [ Diff ] 		do not add /key* words twice
mod - rts/Game/UI/KeyBindings.cpp [ Diff ] [ File ]
mod - rts/Game/WordCompletion.cpp [ Diff ] [ File ]
develop e6c93121
Timestamp: 2018-05-07 00:06:20
Author: rt
[ Details ] [ Diff ] 		add /view* commands to autocomplete
mod - rts/Game/Console.cpp [ Diff ] [ File ]
mod - rts/Game/Console.h [ Diff ] [ File ]
mod - rts/Game/Game.cpp [ Diff ] [ File ]
mod - rts/Game/WordCompletion.cpp [ Diff ] [ File ]
maintenance 95fc19d1
Timestamp: 2018-05-07 00:06:20
Author: rt
[ Details ] [ Diff ] 		add /view* commands to autocomplete
mod - rts/Game/Console.cpp [ Diff ] [ File ]
mod - rts/Game/Console.h [ Diff ] [ File ]
mod - rts/Game/Game.cpp [ Diff ] [ File ]
mod - rts/Game/WordCompletion.cpp [ Diff ] [ File ]
develop 84617f12
Timestamp: 2018-05-06 23:19:52
Author: rt
[ Details ] [ Diff ] 		wat
mod - rts/Game/UI/InfoConsole.cpp [ Diff ] [ File ]
maintenance d80de594
Timestamp: 2018-05-06 23:19:52
Author: rt
[ Details ] [ Diff ] 		wat
mod - rts/Game/UI/InfoConsole.cpp [ Diff ] [ File ]
maintenance 32540984
Timestamp: 2018-05-06 22:23:03
Author: rt
[ Details ] [ Diff ] 		fix merge failures
mod - rts/Game/Camera.cpp [ Diff ] [ File ]
mod - rts/Game/Camera.h [ Diff ] [ File ]
mod - rts/Game/UI/InfoConsole.cpp [ Diff ] [ File ]
mod - rts/Game/UI/InfoConsole.h [ Diff ] [ File ]
mod - rts/Map/SMF/Basic/BasicMeshDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/AdvTreeDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/AdvWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/BasicSky.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/DynWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/GrassDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/ProjectileDrawer.cpp [ Diff ] [ File ]
mod - rts/System/Matrix44f.cpp [ Diff ] [ File ]
mod - rts/System/Matrix44f.h [ Diff ] [ File ]
develop 25cf5e0d
Timestamp: 2018-05-06 20:57:26
Author: rt
[ Details ] [ Diff ] 		-
mod - rts/Game/CameraHandler.cpp [ Diff ] [ File ]
maintenance ca5cf7e7
Timestamp: 2018-05-06 20:57:26
Author: rt
[ Details ] [ Diff ] 		-
mod - rts/Game/CameraHandler.cpp [ Diff ] [ File ]
develop ad3687ba
Timestamp: 2018-05-06 20:54:33
Author: rt
[ Details ] [ Diff ] 		fix build
mod - rts/Game/CameraHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.h [ Diff ] [ File ]
maintenance 9b793d23
Timestamp: 2018-05-06 20:54:33
Author: rt
[ Details ] [ Diff ] 		fix build
mod - rts/Game/CameraHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.h [ Diff ] [ File ]
develop fca47b33
Timestamp: 2018-05-06 20:48:37
Author: rt
[ Details ] [ Diff ] 		CameraHandler cleanup
mod - rts/Game/Camera/FPSController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverheadController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverheadController.h [ Diff ] [ File ]
mod - rts/Game/CameraHandler.cpp [ Diff ] [ File ]
mod - rts/Game/CameraHandler.h [ Diff ] [ File ]
maintenance 2d7527c5
Timestamp: 2018-05-06 20:48:37
Author: rt
[ Details ] [ Diff ] 		CameraHandler cleanup
mod - rts/Game/Camera/FPSController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverheadController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverheadController.h [ Diff ] [ File ]
mod - rts/Game/CameraHandler.cpp [ Diff ] [ File ]
mod - rts/Game/CameraHandler.h [ Diff ] [ File ]
develop c4e54911
Timestamp: 2018-05-06 20:33:24
Author: rt
[ Details ] [ Diff ] 		deheapify globalConfig
mod - rts/Game/UI/PlayerRosterDrawer.cpp [ Diff ] [ File ]
mod - rts/Game/UnsyncedGameCommands.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp [ Diff ] [ File ]
mod - rts/Net/GameServer.cpp [ Diff ] [ File ]
mod - rts/Net/NetCommands.cpp [ Diff ] [ File ]
mod - rts/Net/Protocol/NetProtocol.cpp [ Diff ] [ File ]
mod - rts/Rendering/TeamHighlight.cpp [ Diff ] [ File ]
mod - rts/System/GlobalConfig.cpp [ Diff ] [ File ]
mod - rts/System/GlobalConfig.h [ Diff ] [ File ]
mod - rts/System/Net/UDPConnection.cpp [ Diff ] [ File ]
mod - rts/System/SpringApp.cpp [ Diff ] [ File ]
maintenance 363b8705
Timestamp: 2018-05-06 20:33:24
Author: rt
[ Details ] [ Diff ] 		deheapify globalConfig

Conflicts:
rts/Game/UnsyncedGameCommands.cpp
rts/System/GlobalConfig.cpp
mod - rts/Game/UI/PlayerRosterDrawer.cpp [ Diff ] [ File ]
mod - rts/Game/UnsyncedGameCommands.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp [ Diff ] [ File ]
mod - rts/Net/GameServer.cpp [ Diff ] [ File ]
mod - rts/Net/NetCommands.cpp [ Diff ] [ File ]
mod - rts/Net/Protocol/NetProtocol.cpp [ Diff ] [ File ]
mod - rts/Rendering/TeamHighlight.cpp [ Diff ] [ File ]
mod - rts/System/GlobalConfig.cpp [ Diff ] [ File ]
mod - rts/System/GlobalConfig.h [ Diff ] [ File ]
mod - rts/System/Net/UDPConnection.cpp [ Diff ] [ File ]
mod - rts/System/SpringApp.cpp [ Diff ] [ File ]
maintenance 124ecaf9
Timestamp: 2018-05-06 20:17:12
Author: rt
[ Details ] [ Diff ] 		reuse camHandler and controllers
move cameras to CameraHandler CU

Conflicts:
rts/Game/Camera.cpp
rts/Map/SMF/Basic/BasicMeshDrawer.cpp
rts/Rendering/Env/AdvTreeDrawer.cpp
rts/Rendering/Env/BumpWater.cpp
rts/Rendering/Env/GrassDrawer.cpp
rts/Rendering/Env/Particles/ProjectileDrawer.cpp
rts/Rendering/UnitDrawer.cpp
rts/System/SpringApp.cpp
mod - rts/Game/Camera.cpp [ Diff ] [ File ]
mod - rts/Game/Camera.h [ Diff ] [ File ]
mod - rts/Game/Camera/CameraController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/CameraController.h [ Diff ] [ File ]
mod - rts/Game/Camera/FPSController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/FreeController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverheadController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverheadController.h [ Diff ] [ File ]
mod - rts/Game/Camera/OverviewController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverviewController.h [ Diff ] [ File ]
mod - rts/Game/Camera/RotOverheadController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/SpringController.cpp [ Diff ] [ File ]
mod - rts/Game/CameraHandler.cpp [ Diff ] [ File ]
mod - rts/Game/CameraHandler.h [ Diff ] [ File ]
mod - rts/Game/Game.cpp [ Diff ] [ File ]
mod - rts/Game/UI/MiniMap.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedRead.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/Basic/BasicMeshDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/ROAM/RoamMeshDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/SMFGroundTextures.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/SMFReadMap.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/AdvTreeDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/AdvWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/BumpWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/CubeMapHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/DynWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/GrassDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/ProjectileDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/FeatureDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/ShadowHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitDrawer.cpp [ Diff ] [ File ]
mod - rts/System/SpringApp.cpp [ Diff ] [ File ]
develop 8172515d
Timestamp: 2018-05-06 20:17:12
Author: rt
[ Details ] [ Diff ] 		reuse camHandler and controllers
move cameras to CameraHandler CU
mod - rts/Game/Camera.cpp [ Diff ] [ File ]
mod - rts/Game/Camera.h [ Diff ] [ File ]
mod - rts/Game/Camera/CameraController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/CameraController.h [ Diff ] [ File ]
mod - rts/Game/Camera/FPSController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/FreeController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverheadController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverheadController.h [ Diff ] [ File ]
mod - rts/Game/Camera/OverviewController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverviewController.h [ Diff ] [ File ]
mod - rts/Game/Camera/RotOverheadController.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/SpringController.cpp [ Diff ] [ File ]
mod - rts/Game/CameraHandler.cpp [ Diff ] [ File ]
mod - rts/Game/CameraHandler.h [ Diff ] [ File ]
mod - rts/Game/Game.cpp [ Diff ] [ File ]
mod - rts/Game/UI/MiniMap.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedRead.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/Basic/BasicMeshDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/ROAM/RoamMeshDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/SMFGroundTextures.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/SMFReadMap.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/AdvTreeDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/AdvWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/BumpWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/CubeMapHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/DynWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/GrassDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/ProjectileDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/FeatureDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/ShadowHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitDrawer.cpp [ Diff ] [ File ]
mod - rts/System/SpringApp.cpp [ Diff ] [ File ]
maintenance 891ac9a6
Timestamp: 2018-05-06 17:29:28
Author: rt
[ Details ] [ Diff ] 		reuse infoConsole
reuse mouseHandler

Conflicts:
rts/Game/UI/InfoConsole.cpp
rts/Game/UI/InfoConsole.h
mod - rts/Game/CameraHandler.h [ Diff ] [ File ]
mod - rts/Game/Game.cpp [ Diff ] [ File ]
mod - rts/Game/UI/InfoConsole.cpp [ Diff ] [ File ]
mod - rts/Game/UI/InfoConsole.h [ Diff ] [ File ]
mod - rts/Game/UI/MouseHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UI/MouseHandler.h [ Diff ] [ File ]
mod - rts/Menu/LuaMenuController.cpp [ Diff ] [ File ]
mod - rts/System/SpringApp.cpp [ Diff ] [ File ]
mod - rts/lib/lua/include/LuaUser.cpp [ Diff ] [ File ]
First  Prev  1 2 3 ... 94 95 96 97 98 99 100 ... 110 ... 220 ... 330 ... 440 ... 550 ... 660 ... 770 ... 880 ... 990 ... 1057 1058 1059  Next  Last