h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 08:13:15 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into skin-editor-borrowed-dependencies

Browse Source
This commit is contained in:
Bartłomiej Dach 2022-03-16 21:11:00 +01:00
commit e577152d2a
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
View File

@ -2,8 +2,10 @@
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Testing;
using osu.Game.Overlays;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Osu;
using osu.Game.Skinning.Editor;
@ -16,6 +18,9 @@ namespace osu.Game.Tests.Visual.Gameplay
protected override bool Autoplay => true;
[Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
[SetUpSteps]
public override void SetUpSteps()
{

4
osu.Game.Tests/Visual/Online/TestSceneMessageNotifier.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game.Tests.Visual.Online
private int messageIdCounter;
[SetUp]
public void Setup()
public void Setup() => Schedule(() =>
{
if (API is DummyAPIAccess daa)
{
@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.Online
testContainer.ChatOverlay.Show();
});
}
});
private bool dummyAPIHandleRequest(APIRequest request)
{

2
osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -99,7 +99,7 @@ namespace osu.Game.Overlays.Chat
if (highlightedMessage.Value == null)
return;
var chatLine = chatLines.SingleOrDefault(c => c.Message.Equals(highlightedMessage.Value));
var chatLine = chatLines.FirstOrDefault(c => c.Message.Equals(highlightedMessage.Value));
if (chatLine == null)
return;