Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter

This commit is contained in:
Dean Herbert
2018-07-05 21:04:19 +09:00
124 changed files with 1811 additions and 776 deletions

View File

@ -202,9 +202,6 @@ namespace osu.Game.Overlays.KeyBinding
switch (args.Key)
{
case Key.Escape:
finalise();
return true;
case Key.Delete:
{
if (state.Keyboard.ShiftPressed)