Merge branch 'timed-difficulty-attributes' into update-beatmap-scores-design

# Conflicts:
#	osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
This commit is contained in:
smoogipoo
2019-03-20 17:12:34 +09:00
162 changed files with 2373 additions and 1278 deletions

View File

@ -39,7 +39,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
}
[BackgroundDependencyLoader]
private void load(APIAccess api, BeatmapManager beatmaps)
private void load(IAPIProvider api, BeatmapManager beatmaps)
{
FillFlowContainer textSprites;