h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:17:26 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into proper-taiko-hitsounds

Browse Source
This commit is contained in:
Dean Herbert 2017-12-27 23:13:30 +09:00 committed by GitHub
commit 02f4705178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
View File

@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
{ {
foreach (var tick in drumRoll.NestedHitObjects.OfType<DrumRollTick>()) foreach (var tick in drumRoll.NestedHitObjects.OfType<DrumRollTick>())
{ {
Frames.Add(new ReplayFrame(tick.StartTime, null, null, hitButton ? ReplayButtonState.Left1 : ReplayButtonState.Left2)); Frames.Add(new ReplayFrame(tick.StartTime, null, null, hitButton ? ReplayButtonState.Right1 : ReplayButtonState.Right2));
hitButton = !hitButton; hitButton = !hitButton;
} }
} }

9
osu.Game/Overlays/NotificationOverlay.cs
View File

@ -85,9 +85,12 @@ namespace osu.Game.Overlays
private void notificationClosed() private void notificationClosed()
{ {
// hide ourselves if all notifications have been dismissed. Schedule(() =>
if (totalCount == 0) {
State = Visibility.Hidden; // hide ourselves if all notifications have been dismissed.
if (totalCount == 0)
State = Visibility.Hidden;
});
updateCounts(); updateCounts();
} }

2
osu.Game/Overlays/Notifications/ProgressNotification.cs
View File

@ -95,8 +95,8 @@ namespace osu.Game.Overlays.Notifications
protected virtual void Completed() protected virtual void Completed()
{ {
base.Close();
CompletionTarget?.Invoke(CreateCompletionNotification()); CompletionTarget?.Invoke(CreateCompletionNotification());
base.Close();
} }
public override bool DisplayOnTop => false; public override bool DisplayOnTop => false;