Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot

This commit is contained in:
Dean Herbert
2018-04-16 00:20:06 +09:00
17 changed files with 300 additions and 226 deletions

View File

@ -443,7 +443,7 @@ namespace osu.Game
sensitivity.Value = 1;
sensitivity.Disabled = true;
frameworkConfig.Set(FrameworkSetting.ActiveInputHandlers, string.Empty);
frameworkConfig.Set(FrameworkSetting.IgnoredInputHandlers, string.Empty);
frameworkConfig.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode).SetDefault();
return true;
case GlobalAction.ToggleToolbar: