Renamed the CollisionMisc collision category to CollisionItem, teleporting items inside/outside the sub if their physicsbody leaves/enters a hull, powercontainer charge can be changed in editor (i.e. batteries can be set to fully loaded)

2016-05-19 19:47:26 +03:00
parent 6651933c45
commit a477dad1b2
12 changed files with 25 additions and 14 deletions
@@ -323,7 +323,7 @@ namespace Barotrauma
            {
                if (fixture == null || 
                    fixture.CollisionCategories == Category.None || 
-                    fixture.CollisionCategories == Physics.CollisionMisc) return -1;
+                    fixture.CollisionCategories == Physics.CollisionItem) return -1;

                if (collisionCategory != null && !fixture.CollisionCategories.HasFlag((Category)collisionCategory)) return -1;