sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into confine-during-gameplay

Browse Source 
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
This commit is contained in:
Shane Woolcock
2020-10-07 11:07:00 +10:30
parent 478f2dec96 c803be2dd2
commit ec12a21088
46 changed files with 686 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
View File

@ -51,14 +51,14 @@ namespace osu.Game.Screens.Play.PlayerSettings
}
},
},
rateSlider = new PlayerSliderBar<double> { Bindable = UserPlaybackRate }
rateSlider = new PlayerSliderBar<double> { Current = UserPlaybackRate }
};
}
protected override void LoadComplete()
{
base.LoadComplete();
rateSlider.Bindable.BindValueChanged(multiplier => multiplierText.Text = $"{multiplier.NewValue:0.0}x", true);
rateSlider.Current.BindValueChanged(multiplier => multiplierText.Text = $"{multiplier.NewValue:0.0}x", true);
}
}
}

4
osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
View File

@ -50,8 +50,8 @@ namespace osu.Game.Screens.Play.PlayerSettings
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
{
dimSliderBar.Bindable = config.GetBindable<double>(OsuSetting.DimLevel);
blurSliderBar.Bindable = config.GetBindable<double>(OsuSetting.BlurLevel);
dimSliderBar.Current = config.GetBindable<double>(OsuSetting.DimLevel);
blurSliderBar.Current = config.GetBindable<double>(OsuSetting.BlurLevel);
showStoryboardToggle.Current = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
beatmapSkinsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
beatmapHitsoundsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);