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

Fix swells not stopping at the hit position

Browse Source
This commit is contained in:
smoogipoo 2018-01-04 21:45:29 +09:00
parent 4fee76ba0b
commit add68ff068
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 6134dafccb3368dac96d837537325c04b89fb8ee
Subproject commit 067fdb8f5b0594be1cd30e6bbd43f2ea749904ec

2
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
View File

@ -192,7 +192,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
Size = BaseSize * Parent.RelativeChildSize;
// Make the swell stop at the hit target
X = (float)Math.Max(Time.Current, HitObject.StartTime);
X = Math.Max(0, X);
double t = Math.Min(HitObject.StartTime, Time.Current);
if (t == HitObject.StartTime && !hasStarted)

7
osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
View File

@ -29,9 +29,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
RelativeSizeAxes = Axes.Both;
}
protected override void UpdateAfterChildren()
protected override void UpdateAfterChildrenLife()
{
base.UpdateAfterChildren();
base.UpdateAfterChildrenLife();
// We need to calculate this as soon as possible so that hitobjects
// get the final say in their positions
var currentMultiplier = controlPointAt(Time.Current);