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

Fix CI problems

This commit is contained in:
Dean Herbert 2017-10-11 20:51:16 +09:00
parent 744d548738
commit 4a4c01f221
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
View File

@ -5,7 +5,6 @@
using osu.Framework.Graphics;
using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Rulesets.Catch.Objects.Drawable
{

1
osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
View File

@ -4,7 +4,6 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using OpenTK;
using OpenTK.Graphics;
using osu.Game.Rulesets.Objects.Drawables;
namespace osu.Game.Rulesets.Catch.Objects.Drawable

7
osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
View File

@ -12,7 +12,6 @@
using osu.Game.Rulesets.Objects.Types;
using OpenTK;
using osu.Framework.Lists;
using OpenTK.Graphics;
namespace osu.Game.Rulesets.Catch.Objects
{
@ -66,8 +65,6 @@ public IEnumerable<CatchBaseHit> Ticks
X = X
});
double lastTickTime = StartTime;
for (var repeat = 0; repeat < RepeatCount; repeat++)
{
var repeatStartTime = StartTime + repeat * repeatDuration;
@ -81,7 +78,7 @@ public IEnumerable<CatchBaseHit> Ticks
var timeProgress = d / length;
var distanceProgress = reversed ? 1 - timeProgress : timeProgress;
lastTickTime = repeatStartTime + timeProgress * repeatDuration;
var lastTickTime = repeatStartTime + timeProgress * repeatDuration;
ticks.Add(new Droplet
{
StartTime = lastTickTime,
@ -96,7 +93,7 @@ public IEnumerable<CatchBaseHit> Ticks
});
}
double tinyTickInterval = (tickDistance / length) * repeatDuration;
double tinyTickInterval = tickDistance / length * repeatDuration;
while (tinyTickInterval > 100)
tinyTickInterval /= 2;