Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2

# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
This commit is contained in:
Thomas Müller
2016-11-05 13:35:15 +01:00
23 changed files with 144 additions and 66 deletions

View File

@ -57,10 +57,7 @@ namespace osu.Desktop.VisualTests.Tests
Add(new Player
{
Beatmap = new WorkingBeatmap
{
Beatmap = b
}
Beatmap = new WorkingBeatmap(b)
});
}