Commit Graph

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 38968ad6d2 Add circular arc approximator for "perfect" sliders. 2016-12-09 18:04:02 +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