1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-16 20:03:16 +08:00

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

This commit is contained in:
Dan Balasescu
2021-02-15 21:12:46 +09:00
committed by GitHub
Unverified
3 changed files with 10 additions and 4 deletions
+1 -1
View File
@@ -111,6 +111,6 @@ namespace osu.Game.Online.API
/// <param name="username">The username 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>
RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password);
RegistrationRequest.RegistrationRequestErrors? CreateAccount(string email, string username, string password);
}
}
+2
View File
@@ -176,6 +176,7 @@ namespace osu.Game.Overlays.Volume
}
}
};
Bindable.ValueChanged += volume =>
{
this.TransformTo("DisplayVolume",
@@ -183,6 +184,7 @@ namespace osu.Game.Overlays.Volume
400,
Easing.OutQuint);
};
bgProgress.Current.Value = 0.75f;
}
+7 -3
View File
@@ -68,15 +68,19 @@ namespace osu.Game.Screens
public override bool OnExiting(IScreen next)
{
this.FadeOut(transition_length, Easing.OutExpo);
this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
if (IsLoaded)
{
this.FadeOut(transition_length, Easing.OutExpo);
this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
}
return base.OnExiting(next);
}
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);
}
}