Dean Herbert ffcad6e0f1 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake ... # Conflicts: # osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs # osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs		2018-08-24 15:26:36 +09:00
..
ApproachCircle.cs	…
CirclePiece.cs	…
DefaultCirclePiece.cs	…
ExplodePiece.cs	…
FlashPiece.cs	…
GlowPiece.cs	…
NumberPiece.cs	…
RingPiece.cs	…
SliderBall.cs	Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake	2018-08-24 15:26:36 +09:00
SliderBody.cs	Add common custom words to dotsettings dictionary	2018-07-05 15:54:41 +09:00
SpinnerBackground.cs	…
SpinnerDisc.cs	Update framework	2018-07-21 16:21:53 +09:00
SpinnerSpmCounter.cs	…
SpinnerTicks.cs	…
TrianglesPiece.cs	…