Armin Burgmeier 80599754c7 Merge branch 'master' into rope ... Conflicts: planet/Experimental.ocd/LiftTower.ocd/Script.c planet/Objects.ocd/Structures.ocd/Elevator.ocd/Script.c		2012-12-30 11:45:57 +01:00
..
Arena.ocf	Added dummy object to fix script error	2012-11-15 22:07:21 +01:00
Experimental.ocd	Merge branch 'master' into rope	2012-12-30 11:45:57 +01:00
Experimental.ocf	Merge branch 'master' into rope	2012-12-30 11:45:57 +01:00
Graphics.ocg	clean up mouse controls, reduced cursor graphics to the used ones	2012-11-16 17:29:42 +01:00
Material.ocg	Fix snow melting in lava/durolava	2012-12-16 18:51:44 +01:00
Music.ocg	Version corrected	2011-10-13 00:43:16 +01:00
Objects.ocd	Merge branch 'master' into rope	2012-12-30 11:45:57 +01:00
Parkour.ocf	removed some completely arbitrary MaxPlayer entries	2012-10-23 23:28:18 +02:00
Settlement.ocf	Rebalanced wood usage so you need fewer trees to get a settlement started.	2012-12-17 13:52:53 +01:00
Sound.ocg	improved tree falling animation and sound	2012-07-22 21:15:49 +02:00
System.ocg	do not pass controls to disabled cursor anymore (i.e. via SetCrewEnabled)	2012-12-22 17:11:06 +01:00
Tests.ocf	Merge branch 'master' into rope	2012-12-30 11:45:57 +01:00
Tutorial.ocf	Correctly direct player from tutorial 4 to 5	2012-11-07 18:39:33 +01:00
.gitattributes	Prevent git from changing line endings in the game data	2012-11-21 20:34:53 +01:00
AUTHORS	new Clouds1.jpg	2011-08-29 22:25:39 +02:00
COPYING	Initial set of game data	2009-05-09 17:19:46 +02:00