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
Events	Converted all .cs files to use CRLF line endings.	2016-10-13 23:33:58 -04:00
Formats	Get the game running, though not perfectly	2016-11-10 16:42:29 -05:00
IO	Add beatmap backgrounds.	2016-11-05 20:00:14 +09:00
Objects	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Samples	Add basic osu! hit object parsing	2016-10-13 12:17:08 +09:00
Timing	Fix some warnings.	2016-11-04 15:40:05 +09:00
Beatmap.cs	Add the ability to retrieve (fallback) metadata from a beatmap.	2016-10-28 14:13:52 +09:00
WorkingBeatmap.cs	Fix some nullrefs.	2016-11-12 18:25:58 +09:00