openclonk/planet/Objects.ocd/Items.ocd/Weapons.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
..
Bow.ocd Merge branch 'master' into qteditor 2016-08-06 21:45:19 -04:00
Club.ocd Show quick slot item on clonk. 2016-08-05 01:14:13 +02:00
GrenadeLauncher.ocd Try to space out two items on the back better. 2016-08-07 03:04:04 +02:00
Helmet.ocd Added a helmet by pluto. Wear and get 20% off damage*! 2016-08-12 18:25:01 +02:00
IronBomb.ocd Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Javelin.ocd Show quick slot item on clonk. 2016-08-05 01:14:13 +02:00
Musket.ocd Merge branch 'master' into qteditor 2016-08-06 21:45:19 -04:00
Shield.ocd Merge branch 'master' into qteditor 2016-08-06 21:45:19 -04:00
SmokeBomb.ocd implement Components as a property lookup table 2016-05-21 13:34:34 +02:00
Sword.ocd Merge branch 'master' into qteditor 2016-08-06 21:45:19 -04:00