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
..
Animals.ocd	added item spawning functionality and better effect for meteor; added alien meteor skin	2015-09-01 22:42:14 +02:00
Clonk.ocd	Merge branch 'master' into Controls	2015-09-02 08:19:34 +02:00
Effects.ocd	Merge branch 'master' into Controls	2015-09-02 08:19:34 +02:00
Environment.ocd	Merge branch 'master' into Controls	2015-09-02 08:19:34 +02:00
Goals.ocd	Merge branch 'master' into Controls	2015-09-02 08:19:34 +02:00
HUD.ocd	interaction menu: visually disable containers on one side if they are already open on the other	2015-08-07 16:48:28 +02:00
Helpers.ocd	let AI handle the musket and fix tracking riding clonks	2015-08-19 08:11:43 +02:00
Icons.ocd	add icons for hash and sum	2015-06-06 14:23:47 +02:00
Items.ocd	Merge branch 'master' into Controls	2015-09-02 08:19:34 +02:00
Libraries.ocd	Merge branch 'master' into Controls	2015-09-02 08:19:34 +02:00
Rules.ocd	Fix gravestone inscriptions for clonks with empty death messages (#896).	2015-07-08 21:14:56 -04:00
Structures.ocd	Merge branch 'master' into Controls	2015-09-02 08:19:34 +02:00
Vegetation.ocd	Merge branch 'master' into Controls	2015-09-02 08:19:34 +02:00
Vehicles.ocd	Merge branch 'master' into Controls	2015-09-02 08:19:34 +02:00
normal_map.material	Make mesh shaders use the C4Shader slice machinery	2014-12-22 22:56:30 +01:00
normal_map_fragment.glsl	Make mesh shaders use the C4Shader slice machinery	2014-12-22 22:56:30 +01:00
normal_map_vertex.glsl	Make mesh shaders use the C4Shader slice machinery	2014-12-22 22:56:30 +01:00