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
..
definition	Merge branch 'master' into Controls	2015-06-03 22:32:36 +02:00
folder	added missing Folder.txt documentation (#1187)	2015-01-10 08:44:02 +01:00
material	Order mat-tex combinations by appearance in texture map instead of by palette index when zooming map to landscape.	2015-08-10 00:34:43 -04:00
particle	renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle	2013-12-17 22:32:01 +01:00
scenario	Documentation updates	2015-08-04 21:21:24 -04:00
script	Merge branch 'master' into Controls	2015-09-02 08:19:34 +02:00
cmdline.xml	Implement custom scenario parameter selection in startup scenario selection dialogue and by command line.	2014-09-27 16:05:32 +02:00
console.xml	docs: replaced all c4s,c4d,c4g,c4m,c4p,c4i,... with their oc* counterpart in the documentation	2011-06-25 15:31:29 +02:00
content.xml.in	Merge branch 'master' into Controls	2015-09-02 08:19:34 +02:00
files.xml	docs: Add an index to the table of contents	2011-09-05 22:37:47 +02:00
index.xml	docs: Improvements to chm generation and in-browser xslt preview	2011-09-09 21:36:03 +02:00
lang.xml	docs: fixed examples and localization thereof for all folders except script/	2011-07-21 01:43:00 +02:00
playercontrols.xml	Document PathFree2 and CoordinateSpace	2014-04-26 19:22:02 +02:00