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

Merge branch 'master' into hub-send-version-hash

Browse Source
This commit is contained in:
Dan Balasescu
2021-02-15 21:12:46 +09:00
committed by GitHub
parent 55d5d8d5be 8e299bc89a
commit 6641f4d5a9
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Online/API/IAPIProvider.cs
View File

@ -111,6 +111,6 @@ namespace osu.Game.Online.API
/// <param name="username">The username to create the account with.</param> /// <param name="username">The username to create the account with.</param>
/// <param name="password">The password to create the account with.</param> /// <param name="password">The password to create the account with.</param>
/// <returns>Any errors encoutnered during account creation.</returns> /// <returns>Any errors encoutnered during account creation.</returns>
RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password); RegistrationRequest.RegistrationRequestErrors? CreateAccount(string email, string username, string password);
} }
} }

2
osu.Game/Overlays/Volume/VolumeMeter.cs
View File

@ -176,6 +176,7 @@ namespace osu.Game.Overlays.Volume
} }
} }
}; };
Bindable.ValueChanged += volume => Bindable.ValueChanged += volume =>
{ {
this.TransformTo("DisplayVolume", this.TransformTo("DisplayVolume",
@ -183,6 +184,7 @@ namespace osu.Game.Overlays.Volume
400, 400,
Easing.OutQuint); Easing.OutQuint);
}; };
bgProgress.Current.Value = 0.75f; bgProgress.Current.Value = 0.75f;
} }

10
osu.Game/Screens/BackgroundScreen.cs
View File

@ -68,15 +68,19 @@ namespace osu.Game.Screens
public override bool OnExiting(IScreen next) public override bool OnExiting(IScreen next)
{ {
this.FadeOut(transition_length, Easing.OutExpo); if (IsLoaded)
this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo); {
this.FadeOut(transition_length, Easing.OutExpo);
this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
}
return base.OnExiting(next); return base.OnExiting(next);
} }
public override void OnResuming(IScreen last) public override void OnResuming(IScreen last)
{ {
this.MoveToX(0, transition_length, Easing.OutExpo); if (IsLoaded)
this.MoveToX(0, transition_length, Easing.OutExpo);
base.OnResuming(last); base.OnResuming(last);
} }
} }