Merge branch 'master' into master

This commit is contained in:
Dean Herbert
2019-06-07 15:34:14 +09:00
committed by GitHub
105 changed files with 2148 additions and 502 deletions

View File

@ -59,8 +59,8 @@ namespace osu.Game.Overlays.Mods
Ruleset.BindTo(ruleset);
if (mods != null) SelectedMods.BindTo(mods);
sampleOn = audio.Sample.Get(@"UI/check-on");
sampleOff = audio.Sample.Get(@"UI/check-off");
sampleOn = audio.Samples.Get(@"UI/check-on");
sampleOff = audio.Samples.Get(@"UI/check-off");
}
protected override void LoadComplete()