Merge branch 'master' into collapse-graph-option

This commit is contained in:
Dean Herbert
2019-07-09 23:40:43 +09:00
committed by GitHub
57 changed files with 520 additions and 217 deletions

View File

@ -78,6 +78,7 @@ namespace osu.Game.Configuration
Set(OsuSetting.ShowInterface, true);
Set(OsuSetting.ShowProgressGraph, true);
Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
Set(OsuSetting.KeyOverlay, false);
Set(OsuSetting.FloatingComments, false);
@ -133,6 +134,7 @@ namespace osu.Game.Configuration
FloatingComments,
ShowInterface,
ShowProgressGraph,
ShowHealthDisplayWhenCantFail,
MouseDisableButtons,
MouseDisableWheel,
AudioOffset,