Thomas Müller 32ee20b843 Merge branch 'master' of github.com:ppy/osu into better-clocks ... # Conflicts: # osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs		2016-11-06 10:08:24 +01:00
..
Drawable	Background scaling different approach	2016-11-06 04:37:41 +01:00
Events	Converted all .cs files to use CRLF line endings.	2016-10-13 23:33:58 -04:00
Formats	Fix off-by-one colour retrieval.	2016-11-04 15:43:53 +09:00
IO	Add beatmap backgrounds.	2016-11-05 20:00:14 +09:00
Objects	Merge branch 'master' of github.com:ppy/osu into better-clocks	2016-11-06 10:08:24 +01: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 lock object.	2016-11-05 20:21:08 +08:00