Merge branch 'master' into new-netcode

Conflicts: Subsurface/Source/Characters/Character.cs Subsurface/Source/GUI/GUI.cs Subsurface/Source/GUI/LoadingScreen.cs
2017-02-13 22:04:28 +02:00
parent bfc22c7b33 1ea3044fd6
commit 7f7ac76484
17 changed files with 137 additions and 17 deletions
@@ -34,6 +34,8 @@ namespace Barotrauma

        public static void AddToGUIUpdateList(Character character)
        {
+            if (GUI.DisableHUD) return;
+
            if (cprButton != null && cprButton.Visible) cprButton.AddToGUIUpdateList();

            if (suicideButton != null && suicideButton.Visible) suicideButton.AddToGUIUpdateList();
@@ -118,6 +120,8 @@ namespace Barotrauma
                damageOverlay = new Sprite("Content/UI/damageOverlay.png", Vector2.Zero);
            }

+            if (GUI.DisableHUD) return;
+
            if (character.Inventory != null)
            {
                for (int i = 0; i < character.Inventory.Items.Length - 1; i++)