sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lucas A
2019-05-07 18:27:14 +02:00
parent 3ecfa9dcdb 9f52b3b490
commit a5f758b977
224 changed files with 772 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/OsuScreen.cs
View File

@ -83,6 +83,8 @@ namespace osu.Game.Screens
private SampleChannel sampleExit;
protected virtual bool PlayResumeSound => true;
public virtual float BackgroundParallaxAmount => 1;
public Bindable<WorkingBeatmap> Beatmap { get; private set; }
@ -146,7 +148,8 @@ namespace osu.Game.Screens
public override void OnResuming(IScreen last)
{
sampleExit?.Play();
if (PlayResumeSound)
sampleExit?.Play();
applyArrivingDefaults(true);
setUserActivity(activity);