4 Commits

Author	SHA1	Message	Date
Dean Herbert	c420c55291	Merge branch 'master' into hit-samples ... # Conflicts: # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs	2016-12-13 17:57:24 +09:00
Thomas Müller	eef697d842	Wire up CircleSize to hitobjects. ... Note, that circle sizes still are wrong compared to stable osu. In order to fix this, the base radius of hitcircles needs to become 64, but it currently is 72.	2016-12-11 10:11:22 +01:00
Dean Herbert	8329022a2e	Merge remote-tracking branch 'refs/remotes/upstream/master' into hit-samples	2016-12-08 21:41:02 +09:00
Dean Herbert	40ea6e0d72	Fix incorrect folder name.	2016-12-08 21:36:34 +09:00