sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects 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
parent 6a2d82c81a bf8b42df06
commit 4a65888cfc
2 changed files with 3 additions and 1 deletions
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() protected override void PopIn()
{ {
base.PopIn();
Settings.MoveToY(0, TRANSITION_DURATION, Easing.OutQuint); Settings.MoveToY(0, TRANSITION_DURATION, Easing.OutQuint);
} }
protected override void PopOut() protected override void PopOut()
{ {
base.PopOut();
Settings.MoveToY(-1, TRANSITION_DURATION, Easing.InSine); 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> /// <summary>
/// Whether the local user is currently playing. /// Whether the local user is currently playing.
/// </summary> /// </summary>
public IBindable<bool> IsPlaying { get; } IBindable<bool> IsPlaying { get; }
} }
} }