Merge branch 'master' into slider_ticks

This commit is contained in:
Dean Herbert
2017-02-16 11:06:23 +09:00
21 changed files with 191 additions and 101 deletions

View File

@ -58,8 +58,10 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
},
initialCircle = new DrawableHitCircle(new HitCircle
{
//todo: avoid creating this temporary HitCircle.
StartTime = s.StartTime,
Position = s.StackedPosition,
ComboIndex = s.ComboIndex,
Scale = s.Scale,
Colour = s.Colour,
Sample = s.Sample,