Sven Eberhardt 534e4cc745 Merge branch 'master' into qteditor ... Conflicts: src/script/C4AulParse.cpp		2016-07-24 10:23:57 -04:00
..
C4Application.cpp	Fix crash when starting a game in fullscreen mode	2016-06-20 16:55:23 +02:00
C4Application.h	Qt Editor: Add user properties	2016-04-09 14:29:02 -04:00
C4FullScreen.cpp	Update all copyright notices for 2016	2016-04-03 20:24:42 +02:00
C4FullScreen.h	Update all copyright notices for 2016	2016-04-03 20:24:42 +02:00
C4Game.cpp	Merge branch 'master' into qteditor	2016-07-24 10:23:57 -04:00
C4Game.h	Add InitializePlayers callback after all initial players have joined	2016-07-22 00:13:57 -04:00
C4GameScript.cpp	Add IsEditor script function	2016-07-21 00:24:52 -04:00
C4GameScript.h	Add InitializePlayers callback after all initial players have joined	2016-07-22 00:13:57 -04:00
C4GameVersion.h	Update all copyright notices for 2016	2016-04-03 20:24:42 +02:00
C4GraphicsSystem.cpp	Update all copyright notices for 2016	2016-04-03 20:24:42 +02:00
C4GraphicsSystem.h	Update all copyright notices for 2016	2016-04-03 20:24:42 +02:00
C4Physics.h	Update all copyright notices for 2016	2016-04-03 20:24:42 +02:00
C4Viewport.cpp	Merge branch 'master' into qteditor	2016-06-20 22:27:03 -04:00
C4Viewport.h	Qt Editor: Shape properties	2016-04-25 16:17:10 -04:00
ClonkMain.cpp	Update all copyright notices for 2016	2016-04-03 20:24:42 +02:00