openclonk/src
Sven Eberhardt bce903ee04 Merge branch 'master' into qteditor
Conflicts:
	planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Animal.ocd/CreatureControl.ocd/DefCore.txt
2016-08-13 23:42:59 -04:00
..
c4group Qt editor: Store and restore window layout (docked dialogues, etc.) 2016-08-08 23:57:24 -04:00
config Qt Editor: Add toggle help button to "?" menu 2016-07-25 21:39:35 -04:00
control Fix game coordinates for keyboard controls that request a cursor pos 2016-08-07 18:03:56 +02:00
editor Allow scenario saving as editor client 2016-08-09 18:55:43 +02:00
game Allow joining to editor games through startup network dialogue 2016-08-10 19:35:39 -04:00
graphics Remove the GTK platform (USE_GTK) 2016-08-03 16:25:46 +02:00
gui Fix RestartApplication on Linux 2016-08-11 22:11:15 +02:00
landscape Merge branch 'master' into qteditor 2016-08-06 21:45:19 -04:00
lib Merge branch 'master' into qteditor 2016-08-06 21:45:19 -04:00
mape Fix mape build 2016-06-22 01:47:45 -04:00
netio Replace rand() with SafeRandom() 2016-04-20 22:42:00 +02:00
network Allow joining to editor games through startup network dialogue 2016-08-10 19:35:39 -04:00
object Add VIS_Editor visibility flag 2016-08-02 01:12:08 -04:00
platform Fix RestartApplication on Linux 2016-08-11 22:11:15 +02:00
player Do not auto-deactivate clients without players in editor 2016-08-06 22:05:25 -04:00
res Qt Editor: Add sound property delegate 2016-07-27 22:35:11 -04:00
script Fix an aul preparser crash on DirectExec functions parsing 2016-08-08 15:26:25 -04:00
zlib Fix possible double close when attempting to open uncompressed files 2012-02-05 20:00:47 +01:00
C4Globals.cpp Update all copyright notices for 2016 2016-04-03 20:24:42 +02:00
C4Include.cpp Update all copyright notices for 2016 2016-04-03 20:24:42 +02:00
C4Include.h Merge branch 'master' into qteditor 2016-08-13 23:42:59 -04:00
C4Prototypes.h Declare C4AulBCC as class instead of struct 2016-05-09 12:21:33 +02:00
C4Version.h.in Update all copyright notices for 2016 2016-04-03 20:24:42 +02:00