sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-taiko-rewind

Browse Source
This commit is contained in:
Dan Balasescu
2018-06-25 16:08:52 +09:00
committed by GitHub
parent 2421ec10d9 2e556e3051
commit 26d9e3cc10
153 changed files with 3468 additions and 1492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
View File

@ -89,6 +89,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
SecondHitAllowed = false;
validKeyPressed = false;
UnproxyContent();
this.Delay(HitObject.HitWindows.HalfWindowFor(HitResult.Miss)).Expire();
break;
case ArmedState.Miss:
@ -96,6 +97,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
.Expire();
break;
case ArmedState.Hit:
// If we're far enough away from the left stage, we should bring outselves in front of it
if (X >= -0.05f)
ProxyContent();
var flash = circlePiece?.FlashBox;
if (flash != null)
{