Merge https://github.com/Regalis11/Barotrauma into develop

2023-06-15 12:13:50 -03:00
parent 6b461e1026 f95be0511c
commit 15daa64f66
210 changed files with 4491 additions and 2580 deletions
@@ -542,6 +542,7 @@ namespace Barotrauma
            void drawRect(Vector2 topLeft, Vector2 bottomRight)
            {
                int minWidth = GUI.IntScale(5);
+                if (OverflowClip) { topLeft.X = Math.Max(topLeft.X, 0.0f); }
                if (bottomRight.X - topLeft.X < minWidth) { bottomRight.X = topLeft.X + minWidth; }
                GUI.DrawRectangle(spriteBatch,
                    Rect.Location.ToVector2() + topLeft,