(d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-03-29 17:24:17 +02:00
parent ca08b803dc
commit ddfd7274e9
22 changed files with 230 additions and 99 deletions
@@ -200,6 +200,9 @@ namespace Barotrauma
    {
        public static bool CloseHUD(Rectangle rect)
        {
+            // Always close when hitting escape
+            if (PlayerInput.KeyHit(Microsoft.Xna.Framework.Input.Keys.Escape)) { return true; }
+
            //don't close when the cursor is on a UI element
            if (GUI.MouseOn != null) return false;