Merge remote-tracking branch 'upstream/master' into ingame_options

This commit is contained in:
Dean Herbert
2017-06-05 14:52:27 +09:00
34 changed files with 396 additions and 368 deletions

View File

@ -20,6 +20,8 @@ namespace osu.Game.Configuration
Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10);
Set(OsuSetting.DisplayStarsMaximum, 10.0, 0, 10);
Set(OsuSetting.SelectionRandomType, SelectionRandomType.RandomPermutation);
Set(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2, 1);
// Online settings
@ -107,6 +109,7 @@ namespace osu.Game.Configuration
SaveUsername,
DisplayStarsMinimum,
DisplayStarsMaximum,
SelectionRandomType,
SnakingInSliders,
SnakingOutSliders,
ShowFpsDisplay,