sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge master with conflicts resolved

Browse Source
This commit is contained in:
Andrei Zavatski
2020-01-30 10:08:02 +03:00
parent d20c48d151 dfd0b1b88c
commit a8578c1526
27 changed files with 205 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
View File

@ -30,7 +30,6 @@ namespace osu.Game.Tests.Visual.Navigation
}
[Test]
[Ignore("will be fixed soon")]
public void TestFromMainMenuDifferentRuleset()
{
var firstImport = importBeatmap(1);

2
osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Online
typeof(HeaderButton),
typeof(SortTabControl),
typeof(ShowChildrenButton),
typeof(DeletedChildrenPlaceholder),
typeof(DeletedCommentsCounter),
typeof(VotePill),
typeof(CommentsPage),
};

5
osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
View File

@ -4,10 +4,12 @@
using System;
using System.Collections.Generic;
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Overlays;
using osu.Game.Overlays.Profile.Sections;
using osu.Game.Overlays.Profile.Sections.Historical;
using osu.Game.Users;
@ -27,6 +29,9 @@ namespace osu.Game.Tests.Visual.Online
typeof(DrawableProfileRow)
};
[Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
public TestSceneHistoricalSection()
{
HistoricalSection section;

3
osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
View File

@ -16,7 +16,8 @@ namespace osu.Game.Tests.Visual.UserInterface
{
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(FooterButtonMods)
typeof(FooterButtonMods),
typeof(FooterButton)
};
private readonly TestFooterButtonMods footerButtonMods;