RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make appveyor happy.

This commit is contained in:
Lucas A 2019-05-05 21:32:23 +02:00
parent 3d8b56fe57
commit a50bbf7f42
6 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/Visual/Background/TestCaseBackgroundScreenBeatmap.cs
View File

@ -275,7 +275,6 @@ private void setupUserSettings()
private class DummySongSelect : PlaySongSelect
{
protected override BackgroundScreen CreateBackground()
{
FadeAccessibleBackground background = new FadeAccessibleBackground(Beatmap.Value);
@ -319,7 +318,6 @@ private void load(OsuConfigManager config)
private class FadeAccessibleResults : SoloResults
{
public FadeAccessibleResults(ScoreInfo score)
: base(score)
{
@ -332,7 +330,6 @@ public FadeAccessibleResults(ScoreInfo score)
private class TestPlayer : Player
{
protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value);
protected override UserDimContainer CreateStoryboardContainer()

1
osu.Game.Tests/Visual/Gameplay/TestCasePause.cs
View File

@ -12,7 +12,6 @@
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Play;
using osu.Game.Users;
using osuTK;
using osuTK.Input;

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

@ -12,8 +12,8 @@ namespace osu.Game.Tests.Visual.Online
[TestFixture]
public class TestCaseUserPanel : OsuTestCase
{
UserPanel flyte;
UserPanel peppy;
private readonly UserPanel flyte;
private readonly UserPanel peppy;
public TestCaseUserPanel()
{

4
osu.Game/Screens/OsuScreen.cs
View File

@ -64,15 +64,15 @@ public abstract class OsuScreen : Screen, IOsuScreen, IKeyBindingHandler<GlobalA
/// </summary>
protected UserActivity ScreenActivity
{
get => activity;
set
{
if (value == null) return;
if (value == activity) return;
if (api == null) return;
activity = value;
api.LocalUser.Value.Activity.Value = activity;
}
get => activity;
}
private UserActivity activity;

2
osu.Game/Users/UserActivity.cs
View File

@ -65,6 +65,4 @@ public class UserActivityInLobby : UserActivity
{
public override string Status => @"in Multiplayer Lobby";
}
}

6
osu.Game/Users/UserPanel.cs
View File

@ -238,10 +238,10 @@ private void displayStatus(UserStatus status, UserActivity activity = null)
statusBg.FadeColour(activity.GetAppropriateColour(colours), 500, Easing.OutQuint);
return;
}
statusMessage.Text = status.Message;
statusBg.FadeColour(status?.GetAppropriateColour(colours) ?? colours.Gray5, 500, Easing.OutQuint);
}
statusMessage.Text = status?.Message;
statusBg.FadeColour(status?.GetAppropriateColour(colours) ?? colours.Gray5, 500, Easing.OutQuint);
}
public MenuItem[] ContextMenuItems => new MenuItem[]