openclonk/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Hook.ocd
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
..
DefCore.txt Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Graphics.mesh Rotate the OGRE coordinate frame by 90 degrees in X 2015-10-03 11:39:08 -04:00
Hook.skeleton Rotate the OGRE coordinate frame by 90 degrees in X 2015-10-03 11:39:08 -04:00
Scene.material Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00
Script.c Merge branch 'gamepad-controls' 2016-08-07 18:10:24 +02:00
StringTblDE.txt Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00
StringTblUS.txt Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00