Dean Herbert cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection ... # Conflicts: # osu-framework # osu.Game/GameModes/OsuGameMode.cs # osu.Game/GameModes/Play/Player.cs # osu.Game/OsuGame.cs # osu.Game/Overlays/MusicController.cs # osu.Game/Overlays/Options/EditorSection.cs # osu.Game/Overlays/Options/Input/MouseOptions.cs # osu.Game/Overlays/Options/Online/InGameChatOptions.cs # osu.Game/Overlays/Options/SkinSection.cs		2016-11-12 20:18:26 +09:00
..
Drawable	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Circle.cs	Add HitObject colours back in the mix.	2016-11-04 15:43:53 +09:00
OsuBaseHit.cs	Add HitObject colours back in the mix.	2016-11-04 15:43:53 +09:00
OsuConverter.cs	Fix regressions with HitRenderers, while also cleaning them up.	2016-10-13 10:10:15 +09:00
Slider.cs	Add basic structure for osu! mode objects.	2016-09-06 21:41:16 +09:00
Spinner.cs	Add basic osu! hit object parsing	2016-10-13 12:17:08 +09:00