RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-transparent-background-on-screen-scale-modes

This commit is contained in:
Christian Kamphausen 2019-01-23 09:21:18 +01:00 committed by GitHub
parent 4180ca75bc cbbcaf6821
commit 432bd3e0fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
View File

@ -101,8 +101,8 @@ private void computeSliderCursorPosition(Slider slider)
float approxFollowCircleRadius = (float)(slider.Radius * 3);
var computeVertex = new Action<double>(t =>
{
double progress = ((int)t - (int)slider.StartTime) / (float)(int)slider.SpanDuration;
if (progress % 2 > 1)
double progress = (t - slider.StartTime) / slider.SpanDuration;
if (progress % 2 >= 1)
progress = 1 - progress % 1;
else
progress = progress % 1;

2
osu.Game.Rulesets.Osu/Objects/Slider.cs
View File

@ -198,7 +198,7 @@ private void createTicks()
if (tickDistance == 0) return;
var minDistanceFromEnd = Velocity * 0.01;
var minDistanceFromEnd = Velocity * 10;
var spanCount = this.SpanCount();