(048b753e6) Merge branch 'dev' into human-ai

2019-05-16 05:20:29 +03:00
parent 7b6c2f1fa8
commit 3d7a113d75
47 changed files with 651 additions and 461 deletions
@@ -94,7 +94,7 @@ namespace Barotrauma
        }
    }
    
-    partial class Limb : ISerializableEntity
+    partial class Limb : ISerializableEntity, ISpatialEntity
    {
        // Note: not used
        private const float LimbDensity = 15;
@@ -155,6 +155,8 @@ namespace Barotrauma
            }
        }

+        public Submarine Submarine => character.Submarine;
+
        public Vector2 WorldPosition
        {
            get { return character.Submarine == null ? Position : Position + character.Submarine.Position; }