Merge remote-tracking branch 'upstream/master' into user-status-wiring

This commit is contained in:
Lucas A
2019-06-05 16:59:38 +02:00
79 changed files with 655 additions and 448 deletions

View File

@ -128,7 +128,7 @@ namespace osu.Game.Screens
[BackgroundDependencyLoader(true)]
private void load(OsuGame osu, AudioManager audio, IAPIProvider provider)
{
sampleExit = audio.Sample.Get(@"UI/screen-back");
sampleExit = audio.Samples.Get(@"UI/screen-back");
}
public virtual bool OnPressed(GlobalAction action)