(45f083a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-04-03 16:22:12 +03:00
parent 0dd1823eb1
commit 0ecfc426ff
44 changed files with 660 additions and 549 deletions
@@ -491,6 +491,9 @@ namespace Barotrauma
case "levelcommonness":
case "suitabletreatment":
case "containedsprite":
case "fabricate":
case "fabricable":
case "fabricableitem":
break;
case "staticbody":
StaticBodyConfig = subElement;