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
..
Arena.ocf	Merge branch 'master' into qteditor	2016-08-13 23:42:59 -04:00
Decoration.ocd	Merge branch 'master' into qteditor	2016-08-06 21:45:19 -04:00
Defense.ocf	Add HideInCreator=true to internal/helper/library definitions	2016-07-10 22:06:48 -04:00
Experimental.ocd	adapt objects and scenarios to new component implementation	2016-05-21 13:34:34 +02:00
Experimental.ocf	adapt objects and scenarios to new component implementation	2016-05-21 13:34:34 +02:00
Graphics.ocg	Merge branch 'master' into qteditor	2016-06-20 22:27:03 -04:00
Issues.ocf	Add test case for #1502	2015-12-17 18:53:31 +01:00
Material.ocg	A different brick texture by Matthi.	2016-06-19 00:10:27 +02:00
Missions.ocf	Merge branch 'master' into qteditor	2016-08-06 21:45:19 -04:00
Music.ocg	Added Offshore to Music.ocg	2016-05-01 20:06:07 +02:00
Objects.ocd	Merge branch 'master' into qteditor	2016-08-13 23:42:59 -04:00
Parkour.ocf	Merge branch 'master' into qteditor	2016-08-13 23:42:59 -04:00
Sound.ocg	add vine as new vegetation object	2016-04-11 21:10:04 +02:00
System.ocg	Merge branch 'master' into qteditor	2016-08-13 23:42:59 -04:00
Tests.ocf	Make standard goals and rules visible as icons in editor	2016-08-04 19:32:57 -04:00
Tutorials.ocf	Merge branch 'master' into qteditor	2016-08-13 23:42:59 -04:00
Worlds.ocf	Merge branch 'master' into qteditor	2016-08-13 23:42:59 -04:00
.gitattributes	planet: Normalize line endings	2013-01-13 19:00:12 +01:00
AUTHORS	update credits	2014-10-03 18:54:57 +02:00
COPYING	Initial set of game data	2009-05-09 17:19:46 +02:00