Dean Herbert 7ce5fc08ee Merge branch 'master' into skip-button ...

# Conflicts:
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/osu.Game.csproj

2017-02-01 14:05:58 +09:00

..

Objects

Fix not being able to hit two stacked circles by pressing both buttons/keys on the same frame.

2017-01-08 20:52:19 +08:00

Properties

Fix incorrect folder name.

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

UI

Make skip button work.

2017-01-27 21:57:22 +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

Hook up icons better.

2017-01-30 13:35:40 +09:00

OsuScore.cs

Fix incorrect folder name.

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

OsuScoreProcessor.cs

osu! mode starts with health being full.

2017-01-27 00:41:34 +09:00

packages.config

Fix incorrect folder name.

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