Merge remote-tracking branch 'upstream/dev' into develop

2022-12-09 17:33:44 -03:00
parent 83c9c25164 6f788fb8b4
commit 90c3cef977
416 changed files with 12674 additions and 5862 deletions
@@ -59,6 +59,7 @@ namespace Barotrauma
            switch (MouseButton)
            {
                case MouseButton.None:
+                    if (Key == Keys.None) { return false; }
                    return PlayerInput.KeyDown(Key);
                case MouseButton.PrimaryMouse:
                    return PlayerInput.PrimaryMouseButtonHeld();
@@ -88,6 +89,7 @@ namespace Barotrauma
            switch (MouseButton)
            {
                case MouseButton.None:
+                    if (Key == Keys.None) { return false; }
                    return PlayerInput.KeyHit(Key);
                case MouseButton.PrimaryMouse:
                    return PlayerInput.PrimaryMouseButtonClicked();