Merge branch 'master' into social-browser

2025-08-03 06:36:31 +09:00 · 2017-05-28 15:11:00 -03:00
parent 816caf86ea d1517257dd
commit 0e087994a1
19 changed files with 72 additions and 48 deletions
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@ -261,6 +261,9 @@ namespace osu.Game
                        settings.ToggleVisibility();
                        return true;
                    case Key.D:
+                        if (state.Keyboard.ShiftPressed || state.Keyboard.AltPressed)
+                            return false;
+
                        direct.ToggleVisibility();
                        return true;
                }