h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 16:12:57 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into multiplayer-chat

Browse Source
This commit is contained in:
Dean Herbert 2021-08-17 17:34:23 +09:00 committed by GitHub
commit 4a65888cfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
View File

@ -41,11 +41,13 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
protected override void PopIn()
{
base.PopIn();
Settings.MoveToY(0, TRANSITION_DURATION, Easing.OutQuint);
}
protected override void PopOut()
{
base.PopOut();
Settings.MoveToY(-1, TRANSITION_DURATION, Easing.InSine);
}

2
osu.Game/Screens/Play/ILocalUserPlayInfo.cs
View File

@ -12,6 +12,6 @@ namespace osu.Game.Screens.Play
/// <summary>
/// Whether the local user is currently playing.
/// </summary>
public IBindable<bool> IsPlaying { get; }
IBindable<bool> IsPlaying { get; }
}
}