2025-08-30 16:41 CEST

Changesets: spring

Search ] Browse ] Back to Index ]
develop 62b7e4f7
Timestamp: 2018-11-03 06:34:45
Author: Gajo Petrovic
Details ] Diff ]
cleanup Menu/
mod - rts/Menu/SelectMenu.cpp Diff ] File ]
mod - rts/Menu/SelectionWidget.cpp Diff ] File ]
maintenance 39fae9b6
Timestamp: 2018-11-03 06:30:03
Author: Gajo Petrovic
Details ] Diff ]
cleanup Game/

Not the cleanest merge ( 9c53b70c1 ).
Had to ignore the following files:
- rts/Game/UI/EndGameBox.cpp
- rts/Game/UI/GameInfo.cpp
- rts/Game/UI/GuiHandler.cpp
This file was manually merged:
- rts/Game/UnsyncedGameCommands.cpp
mod - rts/Game/Camera/FPSController.cpp Diff ] File ]
mod - rts/Game/Camera/FreeController.cpp Diff ] File ]
mod - rts/Game/CameraHandler.cpp Diff ] File ]
mod - rts/Game/CommandMessage.cpp Diff ] File ]
mod - rts/Game/ConsoleHistory.cpp Diff ] File ]
mod - rts/Game/FPSUnitController.cpp Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/GameControllerTextInput.cpp Diff ] File ]
mod - rts/Game/GameData.cpp Diff ] File ]
mod - rts/Game/GameHelper.cpp Diff ] File ]
mod - rts/Game/GameSetup.cpp Diff ] File ]
mod - rts/Game/InMapDrawModel.cpp Diff ] File ]
mod - rts/Game/Players/Player.cpp Diff ] File ]
mod - rts/Game/Players/PlayerBase.cpp Diff ] File ]
mod - rts/Game/Players/PlayerStatistics.cpp Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/SelectedUnitsAI.cpp Diff ] File ]
mod - rts/Game/SelectedUnitsHandler.cpp Diff ] File ]
mod - rts/Game/SyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/UI/GameSetupDrawer.cpp Diff ] File ]
mod - rts/Game/UI/Groups/Group.cpp Diff ] File ]
mod - rts/Game/UI/Groups/GroupHandler.cpp Diff ] File ]
mod - rts/Game/UI/KeyBindings.cpp Diff ] File ]
mod - rts/Game/UI/MiniMap.cpp Diff ] File ]
mod - rts/Game/UI/MouseCursor.cpp Diff ] File ]
mod - rts/Game/UI/MouseCursor.h Diff ] File ]
mod - rts/Game/UI/MouseHandler.cpp Diff ] File ]
mod - rts/Game/UI/PlayerRosterDrawer.cpp Diff ] File ]
mod - rts/Game/UI/SelectionKeyHandler.cpp Diff ] File ]
mod - rts/Game/UI/ShareBox.cpp Diff ] File ]
mod - rts/Game/UI/UnitTracker.cpp Diff ] File ]
mod - rts/Game/UnsyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.cpp Diff ] File ]
develop 9c53b70c
Timestamp: 2018-11-03 06:30:03
Author: Gajo Petrovic
Details ] Diff ]
cleanup Game/
mod - rts/Game/Camera/FPSController.cpp Diff ] File ]
mod - rts/Game/Camera/FreeController.cpp Diff ] File ]
mod - rts/Game/CameraHandler.cpp Diff ] File ]
mod - rts/Game/CommandMessage.cpp Diff ] File ]
mod - rts/Game/ConsoleHistory.cpp Diff ] File ]
mod - rts/Game/FPSUnitController.cpp Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/GameControllerTextInput.cpp Diff ] File ]
mod - rts/Game/GameData.cpp Diff ] File ]
mod - rts/Game/GameHelper.cpp Diff ] File ]
mod - rts/Game/GameSetup.cpp Diff ] File ]
mod - rts/Game/InMapDrawModel.cpp Diff ] File ]
mod - rts/Game/Players/Player.cpp Diff ] File ]
mod - rts/Game/Players/PlayerBase.cpp Diff ] File ]
mod - rts/Game/Players/PlayerStatistics.cpp Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/SelectedUnitsAI.cpp Diff ] File ]
mod - rts/Game/SelectedUnitsHandler.cpp Diff ] File ]
mod - rts/Game/SyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/UI/EndGameBox.cpp Diff ] File ]
mod - rts/Game/UI/GameInfo.cpp Diff ] File ]
mod - rts/Game/UI/GameSetupDrawer.cpp Diff ] File ]
mod - rts/Game/UI/Groups/Group.cpp Diff ] File ]
mod - rts/Game/UI/Groups/GroupHandler.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/KeyBindings.cpp Diff ] File ]
mod - rts/Game/UI/MiniMap.cpp Diff ] File ]
mod - rts/Game/UI/MouseCursor.cpp Diff ] File ]
mod - rts/Game/UI/MouseCursor.h Diff ] File ]
mod - rts/Game/UI/MouseHandler.cpp Diff ] File ]
mod - rts/Game/UI/PlayerRosterDrawer.cpp Diff ] File ]
mod - rts/Game/UI/SelectionKeyHandler.cpp Diff ] File ]
mod - rts/Game/UI/ShareBox.cpp Diff ] File ]
mod - rts/Game/UI/UnitTracker.cpp Diff ] File ]
mod - rts/Game/UnsyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.cpp Diff ] File ]
maintenance d5a28f04
Timestamp: 2018-11-03 04:16:58
Author: Gajo Petrovic
Details ] Diff ]
nlc
mod - rts/Lua/LuaUI.cpp Diff ] File ]
develop 2d8e5ff5
Timestamp: 2018-11-03 04:16:58
Author: Gajo Petrovic
Details ] Diff ]
nlc
mod - rts/Lua/LuaUI.cpp Diff ] File ]
maintenance 7e8b9462
Timestamp: 2018-11-03 04:16:37
Author: Gajo Petrovic
Details ] Diff ]
cleanup System/
mod - rts/System/AIScriptHandler.cpp Diff ] File ]
mod - rts/System/Config/ConfigHandler.cpp Diff ] File ]
mod - rts/System/Config/ConfigLocater.cpp Diff ] File ]
mod - rts/System/Config/ConfigSource.cpp Diff ] File ]
mod - rts/System/Config/ConfigVariable.cpp Diff ] File ]
mod - rts/System/EventHandler.cpp Diff ] File ]
mod - rts/System/FileSystem/ArchiveNameResolver.cpp Diff ] File ]
mod - rts/System/FileSystem/ArchiveScanner.cpp Diff ] File ]
mod - rts/System/FileSystem/CacheDir.cpp Diff ] File ]
mod - rts/System/FileSystem/DataDirLocater.cpp Diff ] File ]
mod - rts/System/FileSystem/DataDirsAccess.cpp Diff ] File ]
mod - rts/System/FileSystem/FileFilter.cpp Diff ] File ]
mod - rts/System/FileSystem/FileSystemAbstraction.cpp Diff ] File ]
mod - rts/System/FileSystem/GZFileHandler.cpp Diff ] File ]
mod - rts/System/FileSystem/RapidHandler.cpp Diff ] File ]
mod - rts/System/Info.cpp Diff ] File ]
mod - rts/System/Input/InputHandler.cpp Diff ] File ]
mod - rts/System/LoadSave/CregLoadSaveHandler.cpp Diff ] File ]
mod - rts/System/LoadSave/DemoReader.cpp Diff ] File ]
mod - rts/System/LoadSave/DemoRecorder.cpp Diff ] File ]
mod - rts/System/LoadSave/LoadSaveHandler.cpp Diff ] File ]
mod - rts/System/LoadSave/LuaLoadSaveHandler.cpp Diff ] File ]
mod - rts/System/Log/FramePrefixer.cpp Diff ] File ]
mod - rts/System/LogOutput.cpp Diff ] File ]
mod - rts/System/Option.cpp Diff ] File ]
mod - rts/System/Platform/Linux/CrashHandler.cpp Diff ] File ]
mod - rts/System/Platform/Linux/MessageBox.cpp Diff ] File ]
mod - rts/System/Platform/Linux/SoLib.cpp Diff ] File ]
mod - rts/System/Platform/Linux/ThreadSupport.cpp Diff ] File ]
mod - rts/System/Platform/SharedLib.cpp Diff ] File ]
mod - rts/System/Platform/Threading.cpp Diff ] File ]
mod - rts/System/Platform/Watchdog.cpp Diff ] File ]
mod - rts/System/StringUtil.cpp Diff ] File ]
mod - rts/System/TdfParser.cpp Diff ] File ]
mod - rts/System/TimeProfiler.cpp Diff ] File ]
mod - rts/System/TimeUtil.cpp Diff ] File ]
mod - rts/System/creg/SerializeLuaState.cpp Diff ] File ]
mod - rts/System/creg/Serializer.cpp Diff ] File ]
mod - rts/System/creg/VarTypes.cpp Diff ] File ]
mod - rts/System/creg/creg.cpp Diff ] File ]
mod - rts/System/creg/creg_runtime_tests.cpp Diff ] File ]
develop 6f689d9b
Timestamp: 2018-11-03 04:16:37
Author: Gajo Petrovic
Details ] Diff ]
cleanup System/
mod - rts/System/AIScriptHandler.cpp Diff ] File ]
mod - rts/System/Config/ConfigHandler.cpp Diff ] File ]
mod - rts/System/Config/ConfigLocater.cpp Diff ] File ]
mod - rts/System/Config/ConfigSource.cpp Diff ] File ]
mod - rts/System/Config/ConfigVariable.cpp Diff ] File ]
mod - rts/System/EventHandler.cpp Diff ] File ]
mod - rts/System/FileSystem/ArchiveNameResolver.cpp Diff ] File ]
mod - rts/System/FileSystem/ArchiveScanner.cpp Diff ] File ]
mod - rts/System/FileSystem/CacheDir.cpp Diff ] File ]
mod - rts/System/FileSystem/DataDirLocater.cpp Diff ] File ]
mod - rts/System/FileSystem/DataDirsAccess.cpp Diff ] File ]
mod - rts/System/FileSystem/FileFilter.cpp Diff ] File ]
mod - rts/System/FileSystem/FileSystemAbstraction.cpp Diff ] File ]
mod - rts/System/FileSystem/GZFileHandler.cpp Diff ] File ]
mod - rts/System/FileSystem/RapidHandler.cpp Diff ] File ]
mod - rts/System/Info.cpp Diff ] File ]
mod - rts/System/Input/InputHandler.cpp Diff ] File ]
mod - rts/System/LoadSave/CregLoadSaveHandler.cpp Diff ] File ]
mod - rts/System/LoadSave/DemoReader.cpp Diff ] File ]
mod - rts/System/LoadSave/DemoRecorder.cpp Diff ] File ]
mod - rts/System/LoadSave/LoadSaveHandler.cpp Diff ] File ]
mod - rts/System/LoadSave/LuaLoadSaveHandler.cpp Diff ] File ]
mod - rts/System/Log/FramePrefixer.cpp Diff ] File ]
mod - rts/System/LogOutput.cpp Diff ] File ]
mod - rts/System/Option.cpp Diff ] File ]
mod - rts/System/Platform/Linux/CrashHandler.cpp Diff ] File ]
mod - rts/System/Platform/Linux/MessageBox.cpp Diff ] File ]
mod - rts/System/Platform/Linux/SoLib.cpp Diff ] File ]
mod - rts/System/Platform/Linux/ThreadSupport.cpp Diff ] File ]
mod - rts/System/Platform/SharedLib.cpp Diff ] File ]
mod - rts/System/Platform/Threading.cpp Diff ] File ]
mod - rts/System/Platform/Watchdog.cpp Diff ] File ]
mod - rts/System/StringUtil.cpp Diff ] File ]
mod - rts/System/TdfParser.cpp Diff ] File ]
mod - rts/System/TimeProfiler.cpp Diff ] File ]
mod - rts/System/TimeUtil.cpp Diff ] File ]
mod - rts/System/creg/SerializeLuaState.cpp Diff ] File ]
mod - rts/System/creg/Serializer.cpp Diff ] File ]
mod - rts/System/creg/VarTypes.cpp Diff ] File ]
mod - rts/System/creg/creg.cpp Diff ] File ]
mod - rts/System/creg/creg_runtime_tests.cpp Diff ] File ]
maintenance e0ab082d
Timestamp: 2018-11-02 19:23:45
Author: rt
Details ] Diff ]
-
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
develop 93e95095
Timestamp: 2018-11-02 19:22:57
Author: rt
Details ] Diff ]
-
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
maintenance 75d8b4e7
Timestamp: 2018-11-02 19:15:03
Author: rt
Details ] Diff ]
cd6388c5 followup
mod - rts/Lua/LuaFeatureDefs.cpp Diff ] File ]
mod - rts/Lua/LuaIO.cpp Diff ] File ]
mod - rts/Lua/LuaIntro.cpp Diff ] File ]
mod - rts/Lua/LuaParser.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaUI.cpp Diff ] File ]
mod - rts/Lua/LuaUnitDefs.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUtils.cpp Diff ] File ]
mod - rts/Lua/LuaWeaponDefs.cpp Diff ] File ]
mod - rts/Lua/LuaZip.cpp Diff ] File ]
develop bedd5d4a
Timestamp: 2018-11-02 19:15:03
Author: rt
Details ] Diff ]
cd6388c5 followup
mod - rts/Lua/LuaFeatureDefs.cpp Diff ] File ]
mod - rts/Lua/LuaIO.cpp Diff ] File ]
mod - rts/Lua/LuaIntro.cpp Diff ] File ]
mod - rts/Lua/LuaParser.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaUI.cpp Diff ] File ]
mod - rts/Lua/LuaUnitDefs.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUtils.cpp Diff ] File ]
mod - rts/Lua/LuaWeaponDefs.cpp Diff ] File ]
mod - rts/Lua/LuaZip.cpp Diff ] File ]
maintenance ab037beb
Timestamp: 2018-11-02 19:00:01
Author: rt
Details ] Diff ]
81a0da33 residuals
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/Path/IPathController.cpp Diff ] File ]
develop 4592dd89
Timestamp: 2018-11-02 19:00:01
Author: rt
Details ] Diff ]
81a0da33 residuals
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/Path/IPathController.cpp Diff ] File ]
maintenance 0a8519f5
Timestamp: 2018-11-02 17:15:22
Author: Gajo Petrovic
Details ] Diff ]
fix cast regression
mod - rts/Lua/LuaZip.cpp Diff ] File ]
develop 5a4db74d
Timestamp: 2018-11-02 17:15:22
Author: Gajo Petrovic
Details ] Diff ]
fix cast regression
mod - rts/Lua/LuaZip.cpp Diff ] File ]
maintenance a0a259a9
Timestamp: 2018-11-02 17:10:42
Author: Gajo Petrovic
Details ] Diff ]
Lua/* cleanup (mostly nlc)
mod - rts/Lua/LuaFeatureDefs.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.h Diff ] File ]
mod - rts/Lua/LuaHandleSynced.cpp Diff ] File ]
mod - rts/Lua/LuaIO.cpp Diff ] File ]
mod - rts/Lua/LuaInputReceiver.cpp Diff ] File ]
mod - rts/Lua/LuaInterCall.cpp Diff ] File ]
mod - rts/Lua/LuaIntro.cpp Diff ] File ]
mod - rts/Lua/LuaParser.cpp Diff ] File ]
mod - rts/Lua/LuaPathFinder.cpp Diff ] File ]
mod - rts/Lua/LuaRules.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaUI.cpp Diff ] File ]
mod - rts/Lua/LuaUnitDefs.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaUtils.cpp Diff ] File ]
mod - rts/Lua/LuaVFSDownload.cpp Diff ] File ]
develop cd6388c5
Timestamp: 2018-11-02 17:10:42
Author: Gajo Petrovic
Details ] Diff ]
Lua/* cleanup (mostly nlc)
mod - rts/Lua/LuaFeatureDefs.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.h Diff ] File ]
mod - rts/Lua/LuaHandleSynced.cpp Diff ] File ]
mod - rts/Lua/LuaIO.cpp Diff ] File ]
mod - rts/Lua/LuaInputReceiver.cpp Diff ] File ]
mod - rts/Lua/LuaInterCall.cpp Diff ] File ]
mod - rts/Lua/LuaIntro.cpp Diff ] File ]
mod - rts/Lua/LuaParser.cpp Diff ] File ]
mod - rts/Lua/LuaPathFinder.cpp Diff ] File ]
mod - rts/Lua/LuaRules.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaUI.cpp Diff ] File ]
mod - rts/Lua/LuaUnitDefs.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaUtils.cpp Diff ] File ]
mod - rts/Lua/LuaVFSDownload.cpp Diff ] File ]
maintenance 12e806cc
Timestamp: 2018-11-02 03:37:08
Author: rt
Details ] Diff ]
fix regression
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
develop 81a0da33
Timestamp: 2018-11-02 03:37:08
Author: rt
Details ] Diff ]
fix regression
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
develop 5349b824
Timestamp: 2018-11-02 00:23:17
Author: rt
Details ] Diff ]
dead code
mod - rts/Lua/LuaOpenGL.cpp Diff ] File ]
maintenance 7657bad8
Timestamp: 2018-11-02 00:22:57
Author: rt
Details ] Diff ]
fix 0001968
mod - doc/changelog.txt Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.h Diff ] File ]
develop deaf660e
Timestamp: 2018-11-02 00:22:57
Author: rt
Details ] Diff ]
fix 0001968
mod - doc/changelog.txt Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.h Diff ] File ]
maintenance 90d2180f
Timestamp: 2018-11-01 16:18:14
Author: Gajo Petrovic
Committer: rt
Details ] Diff ]
nlc 2

Conflicts:
rts/Lua/LuaOpenGL.cpp
mod - rts/Lua/LuaHandle.h Diff ] File ]
mod - rts/Lua/LuaIO.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGL.cpp Diff ] File ]
develop 1406116c
Timestamp: 2018-11-01 16:18:14
Author: Gajo Petrovic
Details ] Diff ]
nlc 2
mod - rts/Lua/LuaHandle.h Diff ] File ]
mod - rts/Lua/LuaIO.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGL.cpp Diff ] File ]
maintenance 77fb32cf
Timestamp: 2018-11-01 16:10:59
Author: Gajo Petrovic
Committer: rt
Details ] Diff ]
nlc
mod - rts/Lua/LuaGaia.h Diff ] File ]
mod - rts/Lua/LuaHandle.h Diff ] File ]
mod - rts/Lua/LuaHandleSynced.h Diff ] File ]
mod - rts/Lua/LuaHashString.h Diff ] File ]
mod - rts/Lua/LuaIO.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGL.cpp Diff ] File ]
mod - rts/Lua/LuaRules.h Diff ] File ]
mod - rts/Lua/LuaUtils.h Diff ] File ]
mod - rts/Lua/LuaVFS.h Diff ] File ]
mod - rts/Lua/LuaZip.cpp Diff ] File ]
First  Prev  1 2 3 ... 64 65 66 67 68 69 70 ... 110 ... 220 ... 330 ... 440 ... 550 ... 660 ... 770 ... 880 ... 990 ... 1057 1058 1059  Next  Last