Merge branch 'master' into new-netcode

Conflicts: Subsurface/Properties/AssemblyInfo.cs Subsurface/Source/Items/Components/Signal/Wire.cs Subsurface/Source/Items/Item.cs Subsurface/Source/Items/ItemInventory.cs Subsurface/Source/Networking/GameServer.cs
2016-11-09 17:58:56 +02:00
parent 9eaca68cea d017817878
commit ac65a431a8
25 changed files with 486 additions and 262 deletions
@@ -1140,7 +1140,10 @@ namespace Barotrauma

        public Vector2 GetColliderBottom()
        {
-            return  collider.SimPosition - Vector2.UnitY * (collider.height / 2 + collider.radius);
+            float halfHeight = collider.height / 2 + collider.radius;
+
+            return collider.SimPosition +
+                new Vector2((float)Math.Sin(collider.Rotation), -(float)Math.Cos(collider.Rotation)) * halfHeight;
        }

        public Limb FindLowestLimb()