Merge branch 'master' of https://github.com/ppy/osu into no-video-option

 Conflicts:
	osu.Game/Overlays/Direct/PanelDownloadButton.cs
This commit is contained in:
Endrik Tombak
2020-04-13 17:40:28 +03:00
82 changed files with 2859 additions and 420 deletions

View File

@ -89,6 +89,7 @@ namespace osu.Game.Configuration
Set(OsuSetting.ShowProgressGraph, true);
Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
Set(OsuSetting.KeyOverlay, false);
Set(OsuSetting.PositionalHitSounds, true);
Set(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
Set(OsuSetting.FloatingComments, false);
@ -177,6 +178,7 @@ namespace osu.Game.Configuration
LightenDuringBreaks,
ShowStoryboard,
KeyOverlay,
PositionalHitSounds,
ScoreMeter,
FloatingComments,
ShowInterface,