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

Merge branch 'master' into fix-taiko-rewind

Browse Source
This commit is contained in:
Dean Herbert 2018-06-25 17:10:53 +09:00 committed by GitHub
commit 5e6634cd00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,8 +98,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
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();
ProxyContent();
var flash = circlePiece?.FlashBox;
if (flash != null)

2
osu.Game.Rulesets.Taiko/UI/TaikoRulesetContainer.cs
View File

@ -70,8 +70,6 @@ namespace osu.Game.Rulesets.Taiko.UI
Playfield.Add(isMajor ? new DrawableBarLineMajor(barLine) : new DrawableBarLine(barLine));
double bl = currentPoint.BeatLength;
if (bl < 800)
bl *= (int)currentPoint.TimeSignature;
time += bl;
currentBeat++;