Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score

This commit is contained in:
iiSaLMaN
2019-09-07 14:50:23 +03:00
292 changed files with 5774 additions and 1982 deletions

View File

@ -15,8 +15,8 @@ using osu.Framework.Bindables;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics.Sprites;
using osu.Game.Screens.Ranking;
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Ranking;
namespace osu.Game.Rulesets.Osu.Objects.Drawables
{