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
..
Objects	Merge remote-tracking branch 'upstream/master' into replay	2017-03-07 13:50:08 +09:00
UI	Merge remote-tracking branch 'upstream/master' into replay	2017-03-07 13:50:08 +09:00
LegacyReplay.cs	Fix int truncation.	2017-03-07 11:29:55 +09:00
Mod.cs	Merge remote-tracking branch 'upstream/master' into replay	2017-03-07 13:50:08 +09:00
PlayMode.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Replay.cs	Replay loading via drag-drop huzzah!	2017-03-04 19:02:43 +09:00
Ruleset.cs	Only show replay cursor when replay input is present.	2017-03-06 15:24:00 +09:00
Score.cs	Replay loading via drag-drop huzzah!	2017-03-04 19:02:43 +09:00
ScoreProcesssor.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00