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

2019-05-16 06:37:45 +03:00
parent 17f036e587
commit 5e8800c1e1
11 changed files with 418 additions and 53 deletions
@@ -164,6 +164,12 @@ namespace Barotrauma.Items.Components
            set { posToMaintain = value; }
        }

+        public Vector2? PosToMaintain
+        {
+            get { return posToMaintain; }
+            set { posToMaintain = value; }
+        }
+
        struct ObstacleDebugInfo
        {
            public Vector2 Point1;