Merge branch 'master' into standard-hd-support

This commit is contained in:
Aergwyn
2017-12-27 21:26:39 +01:00
60 changed files with 891 additions and 413 deletions

View File

@ -117,11 +117,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
progress = Slider.ProgressAt(progress);
if (repeat > currentRepeat)
{
if (repeat < Slider.RepeatCount && Ball.Tracking)
PlaySamples();
currentRepeat = repeat;
}
//todo: we probably want to reconsider this before adding scoring, but it looks and feels nice.
if (!InitialCircle.Judgements.Any(j => j.IsHit))
@ -171,9 +167,4 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
public override Vector2 SelectionPoint => ToScreenSpace(Body.Position);
public override Quad SelectionQuad => Body.PathDrawQuad;
}
internal interface ISliderProgress
{
void UpdateProgress(double progress, int repeat);
}
}