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
..
Catch	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Mania	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Osu	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Taiko	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
DrawableHitObject.cs	Ensure transformations are never used prior to being added to the Drawable tree.	2016-11-06 11:13:52 +01:00
HitObject.cs	Add HitObject colours back in the mix.	2016-11-04 15:43:53 +09:00
HitObjectConverter.cs	Specify HitObjectConvertException.	2016-10-13 20:53:42 +08:00