Merge master with conflicts resolved

This commit is contained in:
Andrei Zavatski
2020-07-12 02:20:54 +03:00
1340 changed files with 41715 additions and 14298 deletions

View File

@ -17,18 +17,6 @@ namespace osu.Game.Tests.Visual.Online
{
public class TestSceneOfflineCommentsContainer : OsuTestScene
{
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(CommentsContainer),
typeof(CommentsHeader),
typeof(DrawableComment),
typeof(HeaderButton),
typeof(OverlaySortTabControl<>),
typeof(ShowChildrenButton),
typeof(DeletedCommentsCounter),
typeof(VotePill)
};
[Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);