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
@@ -183,7 +183,7 @@ namespace Barotrauma

        public override void Draw(SpriteBatch spriteBatch)
        {
-            if (!isRunning) return;
+            if (!isRunning|| GUI.DisableHUD) return;

            CrewManager.Draw(spriteBatch);

@@ -228,7 +228,7 @@ namespace Barotrauma

        public override void Update(float deltaTime)
        {
-            if (!isRunning) return;
+            if (!isRunning || GUI.DisableHUD) return;

            base.Update(deltaTime);