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

..

Objects

Merge branch 'master' into hit-samples

2016-12-13 17:57:24 +09:00

Properties

Fix incorrect folder name.

2016-12-08 21:36:34 +09:00

UI

Merge remote-tracking branch 'refs/remotes/upstream/master' into hit-samples

2016-12-08 21:41:02 +09:00

app.config

Fix incorrect folder name.

2016-12-08 21:36:34 +09:00

OpenTK.dll.config

Fix incorrect folder name.

2016-12-08 21:36:34 +09:00

osu.Game.Modes.Osu.csproj

Add circular arc approximator for "perfect" sliders.

2016-12-09 18:04:02 +01:00

OsuRuleset.cs

Fix incorrect folder name.

2016-12-08 21:36:34 +09:00

OsuScore.cs

Fix incorrect folder name.

2016-12-08 21:36:34 +09:00

OsuScoreProcessor.cs

Fix incorrect folder name.

2016-12-08 21:36:34 +09:00

packages.config

Fix incorrect folder name.

2016-12-08 21:36:34 +09:00