Merge remote-tracking branch 'upstream/master' into chat-mention

This commit is contained in:
Craftplacer
2019-12-16 00:59:06 +01:00
893 changed files with 25107 additions and 10215 deletions

View File

@ -86,6 +86,9 @@ namespace osu.Game.Configuration
// Gameplay
Set(OsuSetting.DimLevel, 0.3, 0, 1, 0.01);
Set(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
Set(OsuSetting.LightenDuringBreaks, true);
Set(OsuSetting.HitLighting, true);
Set(OsuSetting.ShowInterface, true);
Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
@ -118,7 +121,11 @@ namespace osu.Game.Configuration
Set(OsuSetting.UIScale, 1f, 0.8f, 1.6f, 0.01f);
Set(OsuSetting.UIHoldActivationDelay, 200f, 0f, 500f, 50f);
Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
}
public OsuConfigManager(Storage storage)
@ -142,6 +149,7 @@ namespace osu.Game.Configuration
AutoCursorSize,
DimLevel,
BlurLevel,
LightenDuringBreaks,
ShowStoryboard,
ShowVideoBackground,
KeyOverlay,
@ -190,6 +198,9 @@ namespace osu.Game.Configuration
ChatHighlightName,
ChatMessageNotification,
HighlightWords,
IgnoreList
IgnoreList,
UIHoldActivationDelay,
HitLighting,
MenuBackgroundSource
}
}