8 Commits

Author	SHA1	Message	Date
Dean Herbert	ec7bbd231f	Make flash animation last slightly longer.	2016-12-15 22:58:30 +09:00
Dean Herbert	0a9e3ce1b0	Don't handle input in triangle particle effect containers.	2016-12-15 22:58:19 +09:00
Dean Herbert	db5c2efa15	Rename tracking variable and change conditional as per feedback.	2016-12-13 18:12:35 +09:00
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
Thomas Müller	2ced0a48e0	Update framework.	2016-12-10 14:37:00 +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