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	Normalize all the line endings	2018-04-13 18:26:38 +09:00
CirclePiece.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
DefaultCirclePiece.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
ExplodePiece.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
FlashPiece.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
GlowPiece.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
NumberPiece.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
RingPiece.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
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	Normalize all the line endings	2018-04-13 18:26:38 +09:00
SpinnerDisc.cs	Update framework	2018-07-21 16:21:53 +09:00
SpinnerSpmCounter.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
SpinnerTicks.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
TrianglesPiece.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00