| spring: maintenance 39fae9b6 | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| Gajo Petrovic | Gajo Petrovic | maintenance | 2018-11-03 06:30:03 | maintenance d5a28f04 |
| Changeset | 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 ] | |||
