David Dormagen 196f528201 Merge branch 'master' into Controls ... Conflicts: planet/Objects.ocd/HUD.ocd/FancyGridMenu.ocd/DefCore.txt planet/Objects.ocd/HUD.ocd/GridMenu.ocd/DefCore.txt planet/Objects.ocd/Helpers.ocd/Dummy.ocd/Graphics.png planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c planet/Objects.ocd/Libraries.ocd/Flag.ocd/Marker.ocd/Script.c planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c src/game/C4Game.cpp src/gamescript/C4GameScript.cpp src/gui/C4GameMessage.cpp src/landscape/C4Landscape.cpp		2015-06-03 22:32:36 +02:00
..
actmap.xml	update documentation around ActMap (2)	2013-11-30 13:11:36 +07:00
animations.xml	Add the Anim_Dist AVP	2014-10-09 17:00:26 -04:00
category.xml	introduce a constant for no category	2015-03-02 20:42:34 +01:00
cnat.xml	update documentation around ActMap	2013-11-30 11:45:31 +07:00
defcore.xml	remove obsolete BuildTurnTo defcore entry	2015-05-11 21:47:55 +02:00
index.xml	Remove mention of "fire monsters" from docs.	2015-01-17 18:10:56 +01:00
meshes.xml	fix layout of GUI Script documentation	2015-06-02 22:48:38 +02:00
ocf.xml	docs: fixed examples and localization thereof for all folders except script/	2011-07-21 01:43:00 +02:00
procedures.xml	update documentation around ActMap	2013-11-30 11:45:31 +07:00
properties.xml	make ContainBlast a property instead of DefCore entry	2015-01-15 17:46:53 +01:00
script.xml	Merge branch 'master' into Controls	2015-06-03 22:32:36 +02:00
vertices.xml	docs: Add an index to the table of contents	2011-09-05 22:37:47 +02:00
visibility.xml	docs: Add an index to the table of contents	2011-09-05 22:37:47 +02:00