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
..
Drawables	Merge remote-tracking branch 'upstream/master' into replay	2017-03-07 13:50:08 +09:00
BezierApproximator.cs	Naming standardisation and enforcing.	2017-02-07 16:20:36 +09:00
CircularArcApproximator.cs	Naming standardisation and enforcing.	2017-02-07 16:20:36 +09:00
HitCircle.cs	Fix some license headers.	2017-03-02 18:45:20 +09:00
OsuHitObject.cs	Fix remaining usage of hit window constants.	2017-03-06 23:26:57 +09:00
OsuHitObjectConverter.cs	Add combo numbers.	2017-02-15 23:23:55 +09:00
OsuHitObjectDifficulty.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
OsuHitObjectParser.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
Slider.cs	Refactor sliders to have more central position/progress calculations.	2017-03-06 11:11:29 +09:00
SliderCurve.cs	Merge remote-tracking branch 'upstream/master' into replay	2017-03-07 13:50:08 +09:00
SliderTick.cs	Fix some license headers.	2017-03-02 18:45:20 +09:00
Spinner.cs	Fix some license headers.	2017-03-02 18:45:20 +09:00