Dean Herbert 4430255ec4 Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Desktop/OsuGameDesktop.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game/Database/BeatmapDatabase.cs # osu.Game/Graphics/Cursor/OsuCursorContainer.cs # osu.Game/IPC/BeatmapImporter.cs # osu.Game/Modes/Mod.cs # osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs # osu.Game/Modes/UI/Playfield.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/PlayerInputManager.cs		2017-03-07 13:50:08 +09:00
..
ApproachCircle.cs	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
CirclePiece.cs	Move constants to base OsuHitObject representation.	2017-03-06 12:58:14 +09:00
ExplodePiece.cs	Adjust Explode alpha slightly.	2017-02-16 22:48:47 +09:00
FlashPiece.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
GlowPiece.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
NumberPiece.cs	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
RingPiece.cs	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
SliderBall.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
SliderBody.cs	Namespace does not correspond to file location.	2017-02-16 11:30:31 +01:00
SliderBouncer.cs	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
SpinnerBackground.cs	Add spinners and improve TestCaseHitObjects.	2017-02-15 01:23:20 +09:00
SpinnerDisc.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
TrianglesPiece.cs	Fix regression in TrianglesPiece.	2017-03-01 11:56:14 +09:00