Julius Michaelis 35c3d4a421 Merge branch 'master' into floating-point ... (Just merged. Nothing was tested.) Conflicts: config.h.cmake docs/de.po planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c planet/Objects.ocd/Vegetation.ocd/Grass.ocd/Script.c planet/Tests.ocf/AirRace.ocs/Extra.ocd/Rocket.ocd/Script.c planet/Tests.ocf/AirRace.ocs/Extra.ocd/WeaponSpawn.ocd/Script.c planet/Tests.ocf/AirRace.ocs/Script.c planet/Tests.ocf/Experimental.ocd/LiftTower.ocd/Hook.ocd/Script.c planet/Tests.ocf/Experimental.ocd/LiftTower.ocd/Rope.ocd/Script.c planet/Tests.ocf/Moss_Test.ocs/Script.c src/script/C4AulParse.cpp		2012-12-28 17:52:14 +01:00
..
Arena.ocf	Merge branch 'master' into floating-point	2012-12-28 17:52:14 +01:00
Experimental.ocd	Merge branch 'master' into floating-point	2012-12-28 17:52:14 +01:00
Experimental.ocf	Merge branch 'master' into floating-point	2012-12-28 17:52:14 +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	new smooth sand texture	2012-08-20 20:19:45 +02:00
Music.ocg	Merge default to floating-point	2012-03-22 18:02:48 +01:00
Objects.ocd	Merge branch 'master' into floating-point	2012-12-28 17:52:14 +01:00
Parkour.ocf	Merge branch 'master' into floating-point	2012-12-28 17:52:14 +01:00
Settlement.ocf	Merge branch 'master' into floating-point	2012-12-28 17:52:14 +01:00
Sound.ocg	improved tree falling animation and sound	2012-07-22 21:15:49 +02:00
System.ocg	Merge branch 'master' into floating-point	2012-12-28 17:52:14 +01:00
Tutorial.ocf	Merge branch 'master' into floating-point	2012-12-28 17:52:14 +01:00
.gitattributes	Prevent git from changing line endings in the game data	2012-11-21 20:34:53 +01:00
AUTHORS	Merge default to floating-point	2012-03-22 18:02:48 +01:00
COPYING	Initial set of game data	2009-05-09 17:19:46 +02:00