marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
openclonk/src/gui
History
David Dormagen ac738735b2 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
	src/game/C4Game.cpp
	src/game/C4GraphicsSystem.cpp
	src/gamescript/C4GameScript.cpp
 		2015-09-02 08:19:34 +02:00
..
C4ChatDlg.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4ChatDlg.h Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4DownloadDlg.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4DownloadDlg.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4FileSelDlg.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4FileSelDlg.h Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4Folder.cpp Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4Folder.h Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4GameDialogs.cpp Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4GameDialogs.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4GameLobby.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4GameLobby.h Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4GameMessage.cpp Merge branch 'master' into Controls 2015-06-03 22:32:36 +02:00
C4GameMessage.h Merge branch 'master' into Controls 2015-06-03 22:32:36 +02:00
C4GameOptions.cpp Reorder some declarations and initializations to avoid order mismatch 2015-02-04 22:12:42 +01:00
C4GameOptions.h Don't force league settings on scenario parameters if league is enabled during single player scenario selection (#1120). 2014-10-03 21:25:25 +02:00
C4GameOverDlg.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4GameOverDlg.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4GfxErrorDlg.cpp Win32: Keep GL error dialog from immediately closing 2015-02-18 23:02:34 +01:00
C4GfxErrorDlg.h Add copyright header to files that were missing it 2015-02-16 18:40:52 +01:00
C4Gui.cpp Merge branch 'master' into Controls 2015-09-02 08:19:34 +02:00
C4Gui.h Merge branch 'master' into Controls 2015-06-03 22:32:36 +02:00
C4GuiButton.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4GuiCheckBox.cpp Don't split UTF8 when handling accelerators (#983) 2014-03-11 00:25:38 +01:00
C4GuiComboBox.cpp Fix lobby team distribution settings hotkeys (#1133) 2014-10-09 20:40:01 +02:00
C4GuiContainers.cpp Merge branch 'master' into Controls 2015-06-03 22:32:36 +02:00
C4GuiDialogs.cpp Merge branch 'master' into Controls 2015-09-02 08:19:34 +02:00
C4GuiEdit.cpp Rename BoundBy to Clamp 2015-02-12 23:05:55 +01:00
C4GuiLabels.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4GuiListBox.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4GuiMenu.cpp Fix lobby team distribution settings hotkeys (#1133) 2014-10-09 20:40:01 +02:00
C4GuiTabular.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4KeyboardInput.cpp Automatically deduce shift state in combo keys with Control/Shift combo. 2015-09-01 19:11:13 -04:00
C4KeyboardInput.h Automatically deduce shift state in combo keys with Control/Shift combo. 2015-09-01 19:11:13 -04:00
C4LoaderScreen.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4LoaderScreen.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4MainMenu.cpp Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4MainMenu.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4Menu.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4Menu.h Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4MessageBoard.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4MessageBoard.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4MessageInput.cpp Silence a few compiler warnings. 2015-08-29 08:33:00 -04:00
C4MessageInput.h Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4MouseControl.cpp Merge branch 'master' into Controls 2015-06-03 22:32:36 +02:00
C4MouseControl.h CustomGUIs: major rework of layouting & controls; better integration of C4GUI 2014-10-11 11:29:02 +02:00
C4PlayerInfoListBox.cpp Silence a few compiler warnings. 2015-08-29 08:33:00 -04:00
C4PlayerInfoListBox.h Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4Scoreboard.cpp Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4Scoreboard.h Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4ScriptGuiWindow.cpp fixed wrong offset in scripted GUIs when upper-board is active 2015-08-02 23:19:28 +02:00
C4ScriptGuiWindow.h fixed wrong offset in scripted GUIs when upper-board is active 2015-08-02 23:19:28 +02:00
C4Startup.cpp Remove several instances of disabled legacy code 2015-01-18 22:59:45 +01:00
C4Startup.h Remove several instances of disabled legacy code 2015-01-18 22:59:45 +01:00
C4StartupAboutDlg.cpp Update TRADEMARK and add trademark reference to credits (#1370) 2015-08-09 19:20:53 +02:00
C4StartupAboutDlg.h Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4StartupMainDlg.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4StartupMainDlg.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4StartupNetDlg.cpp Silence a few compiler warnings. 2015-08-29 08:33:00 -04:00
C4StartupNetDlg.h Fix possible race condition on update check in network game list. 2014-10-05 15:11:06 +02:00
C4StartupOptionsDlg.cpp Silence a few compiler warnings. 2015-08-29 08:33:00 -04:00
C4StartupOptionsDlg.h Remove config entries that are no longer used 2014-11-02 16:57:50 -05:00
C4StartupPlrSelDlg.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4StartupPlrSelDlg.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4StartupScenSelDlg.cpp Silence a few compiler warnings. 2015-08-29 08:33:00 -04:00
C4StartupScenSelDlg.h Reorder some declarations and initializations to avoid order mismatch 2015-02-04 22:12:42 +01:00
C4UpdateDlg.cpp Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4UpdateDlg.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4UpperBoard.cpp Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4UpperBoard.h Update copyright notices 2013-12-23 13:03:19 +01:00