Merge remote-tracking branch 'upstream/master' into show-beatmap-id

This commit is contained in:
Dean Herbert
2018-04-20 12:41:38 +09:00
9 changed files with 190 additions and 53 deletions

View File

@ -17,6 +17,11 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
{
Children = new Drawable[]
{
new SettingsCheckbox
{
LabelText = "Right mouse drag to absolute scroll",
Bindable = config.GetBindable<bool>(OsuSetting.SongSelectRightMouseScroll),
},
new SettingsCheckbox
{
LabelText = "Show converted beatmaps",