Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design

# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
This commit is contained in:
smoogipoo
2019-03-29 15:08:21 +09:00
250 changed files with 1693 additions and 1929 deletions

View File

@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Leaderboards;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Scoring;
@ -55,9 +54,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private readonly ModsInfoColumn modsInfo;
private APIScoreInfo score;
private ScoreInfo score;
public APIScoreInfo Score
public ScoreInfo Score
{
get => score;
set