openclonk/planet/Objects.ocd/Rules.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
..
BaseRespawn.ocd Unify rule picture size display in the editor to 32x32 2016-08-06 10:32:21 -04:00
BuyAtFlagpole.ocd Unify rule picture size display in the editor to 32x32 2016-08-06 10:32:21 -04:00
Gravestones.ocd Unify rule picture size display in the editor to 32x32 2016-08-06 10:32:21 -04:00
Killlogs.ocd Merge branch 'master' into qteditor 2016-08-13 23:42:59 -04:00
NoEnergy.ocd Unify rule picture size display in the editor to 32x32 2016-08-06 10:32:21 -04:00
ObjectFade.ocd Unify rule picture size display in the editor to 32x32 2016-08-06 10:32:21 -04:00
Restart.ocd Unify rule picture size display in the editor to 32x32 2016-08-06 10:32:21 -04:00
TeamAccount.ocd Unify rule picture size display in the editor to 32x32 2016-08-06 10:32:21 -04:00