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
@@ -64,6 +64,8 @@ namespace Barotrauma
            get { return arrow; }
        }

+        public static bool DisableHUD;
+
        public static void Init(ContentManager content)
        {
            Font = ToolBox.TryLoadFont("SpriteFont1", content);
@@ -497,8 +499,9 @@ namespace Barotrauma
            DebugConsole.Draw(spriteBatch);
            
            if (GUIComponent.MouseOn != null && !string.IsNullOrWhiteSpace(GUIComponent.MouseOn.ToolTip)) GUIComponent.MouseOn.DrawToolTip(spriteBatch);
-
-            cursor.Draw(spriteBatch, PlayerInput.LatestMousePosition);
+            
+            if (!GUI.DisableHUD)
+                cursor.Draw(spriteBatch, PlayerInput.LatestMousePosition);            
        }

        public static void AddToGUIUpdateList()