mirror of
https://github.com/ppy/osu.git
synced 2024-11-14 20:38:33 +08:00
Merge branch 'master' into fix-nullref-on-dispose
This commit is contained in:
commit
292b44d896
@ -1 +1 @@
|
|||||||
Subproject commit c6fd2914926f2a6df23eda536c0310f072581b1b
|
Subproject commit eea84aaefcc7a1a6732d105ba319272dd9744901
|
@ -26,8 +26,6 @@ namespace osu.Game.Rulesets.Mania.Tests
|
|||||||
private const double start_time = 500;
|
private const double start_time = 500;
|
||||||
private const double duration = 500;
|
private const double duration = 500;
|
||||||
|
|
||||||
public override string Description => @"Mania playfield";
|
|
||||||
|
|
||||||
protected override double TimePerAction => 200;
|
protected override double TimePerAction => 200;
|
||||||
|
|
||||||
private RulesetInfo maniaRuleset;
|
private RulesetInfo maniaRuleset;
|
||||||
|
@ -30,8 +30,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
|
|||||||
private const double default_duration = 1000;
|
private const double default_duration = 1000;
|
||||||
private const float scroll_time = 1000;
|
private const float scroll_time = 1000;
|
||||||
|
|
||||||
public override string Description => "Taiko playfield";
|
|
||||||
|
|
||||||
protected override double TimePerAction => default_duration * 2;
|
protected override double TimePerAction => default_duration * 2;
|
||||||
|
|
||||||
private readonly Random rng = new Random(1337);
|
private readonly Random rng = new Random(1337);
|
||||||
|
@ -5,6 +5,5 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
public class TestCaseAllPlayers : TestCasePlayer
|
public class TestCaseAllPlayers : TestCasePlayer
|
||||||
{
|
{
|
||||||
public override string Description => @"Showing everything to play the game.";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,8 +19,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseBeatSyncedContainer : OsuTestCase
|
internal class TestCaseBeatSyncedContainer : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Tests beat synced containers.";
|
|
||||||
|
|
||||||
private readonly MusicController mc;
|
private readonly MusicController mc;
|
||||||
|
|
||||||
public TestCaseBeatSyncedContainer()
|
public TestCaseBeatSyncedContainer()
|
||||||
|
@ -9,10 +9,9 @@ using OpenTK;
|
|||||||
namespace osu.Game.Tests.Visual
|
namespace osu.Game.Tests.Visual
|
||||||
{
|
{
|
||||||
[TestFixture]
|
[TestFixture]
|
||||||
|
[System.ComponentModel.Description("PlaySongSelect leaderboard/details area")]
|
||||||
internal class TestCaseBeatmapDetailArea : OsuTestCase
|
internal class TestCaseBeatmapDetailArea : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Beatmap details in song select";
|
|
||||||
|
|
||||||
public TestCaseBeatmapDetailArea()
|
public TestCaseBeatmapDetailArea()
|
||||||
{
|
{
|
||||||
Add(new BeatmapDetailArea
|
Add(new BeatmapDetailArea
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using System.ComponentModel;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
@ -8,10 +9,9 @@ using osu.Game.Screens.Select;
|
|||||||
|
|
||||||
namespace osu.Game.Tests.Visual
|
namespace osu.Game.Tests.Visual
|
||||||
{
|
{
|
||||||
|
[Description("PlaySongSelect beatmap details")]
|
||||||
internal class TestCaseBeatmapDetails : OsuTestCase
|
internal class TestCaseBeatmapDetails : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => "BeatmapDetails tab of BeatmapDetailArea";
|
|
||||||
|
|
||||||
public TestCaseBeatmapDetails()
|
public TestCaseBeatmapDetails()
|
||||||
{
|
{
|
||||||
BeatmapDetails details;
|
BeatmapDetails details;
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using System.ComponentModel;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
using osu.Game.Screens.Select.Options;
|
using osu.Game.Screens.Select.Options;
|
||||||
using OpenTK.Graphics;
|
using OpenTK.Graphics;
|
||||||
@ -8,10 +9,9 @@ using OpenTK.Input;
|
|||||||
|
|
||||||
namespace osu.Game.Tests.Visual
|
namespace osu.Game.Tests.Visual
|
||||||
{
|
{
|
||||||
|
[Description("bottom beatmap details")]
|
||||||
internal class TestCaseBeatmapOptionsOverlay : OsuTestCase
|
internal class TestCaseBeatmapOptionsOverlay : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Beatmap options in song select";
|
|
||||||
|
|
||||||
public TestCaseBeatmapOptionsOverlay()
|
public TestCaseBeatmapOptionsOverlay()
|
||||||
{
|
{
|
||||||
var overlay = new BeatmapOptionsOverlay();
|
var overlay = new BeatmapOptionsOverlay();
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Containers;
|
|
||||||
using osu.Framework.Graphics.Shapes;
|
using osu.Framework.Graphics.Shapes;
|
||||||
using osu.Framework.MathUtils;
|
using osu.Framework.MathUtils;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
@ -14,13 +13,13 @@ using osu.Game.Rulesets.Osu.Mods;
|
|||||||
using osu.Game.Rulesets.Scoring;
|
using osu.Game.Rulesets.Scoring;
|
||||||
using osu.Game.Users;
|
using osu.Game.Users;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
|
||||||
namespace osu.Game.Tests.Visual
|
namespace osu.Game.Tests.Visual
|
||||||
{
|
{
|
||||||
|
[System.ComponentModel.Description("in BeatmapOverlay")]
|
||||||
public class TestCaseBeatmapScoresContainer : OsuTestCase
|
public class TestCaseBeatmapScoresContainer : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => "BeatmapOverlay scores container";
|
|
||||||
|
|
||||||
private readonly IEnumerable<OnlineScore> scores;
|
private readonly IEnumerable<OnlineScore> scores;
|
||||||
private readonly IEnumerable<OnlineScore> anotherScores;
|
private readonly IEnumerable<OnlineScore> anotherScores;
|
||||||
private readonly OnlineScore topScore;
|
private readonly OnlineScore topScore;
|
||||||
|
@ -14,8 +14,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseBeatmapSetOverlay : OsuTestCase
|
internal class TestCaseBeatmapSetOverlay : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"view online beatmap sets";
|
|
||||||
|
|
||||||
private readonly BeatmapSetOverlay overlay;
|
private readonly BeatmapSetOverlay overlay;
|
||||||
|
|
||||||
public TestCaseBeatmapSetOverlay()
|
public TestCaseBeatmapSetOverlay()
|
||||||
|
@ -8,8 +8,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseBreadcrumbs : OsuTestCase
|
internal class TestCaseBreadcrumbs : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"breadcrumb > control";
|
|
||||||
|
|
||||||
public TestCaseBreadcrumbs()
|
public TestCaseBreadcrumbs()
|
||||||
{
|
{
|
||||||
BreadcrumbControl<BreadcrumbTab> c;
|
BreadcrumbControl<BreadcrumbTab> c;
|
||||||
|
@ -10,8 +10,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseBreakOverlay : OsuTestCase
|
internal class TestCaseBreakOverlay : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Tests breaks behavior";
|
|
||||||
|
|
||||||
private readonly BreakOverlay breakOverlay;
|
private readonly BreakOverlay breakOverlay;
|
||||||
|
|
||||||
public TestCaseBreakOverlay()
|
public TestCaseBreakOverlay()
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using System.ComponentModel;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
using osu.Game.Overlays;
|
using osu.Game.Overlays;
|
||||||
|
|
||||||
namespace osu.Game.Tests.Visual
|
namespace osu.Game.Tests.Visual
|
||||||
{
|
{
|
||||||
|
[Description("Testing chat api and overlay")]
|
||||||
internal class TestCaseChatDisplay : OsuTestCase
|
internal class TestCaseChatDisplay : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Testing chat api and overlay";
|
|
||||||
|
|
||||||
public TestCaseChatDisplay()
|
public TestCaseChatDisplay()
|
||||||
{
|
{
|
||||||
Add(new ChatOverlay
|
Add(new ChatOverlay
|
||||||
|
@ -15,8 +15,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseContextMenu : OsuTestCase
|
internal class TestCaseContextMenu : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Menu visible on right click";
|
|
||||||
|
|
||||||
private const int start_time = 0;
|
private const int start_time = 0;
|
||||||
private const int duration = 1000;
|
private const int duration = 1000;
|
||||||
|
|
||||||
|
@ -9,8 +9,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseDialogOverlay : OsuTestCase
|
internal class TestCaseDialogOverlay : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Display dialogs";
|
|
||||||
|
|
||||||
public TestCaseDialogOverlay()
|
public TestCaseDialogOverlay()
|
||||||
{
|
{
|
||||||
DialogOverlay overlay;
|
DialogOverlay overlay;
|
||||||
|
@ -11,8 +11,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
public class TestCaseDirect : OsuTestCase
|
public class TestCaseDirect : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"osu!direct overlay";
|
|
||||||
|
|
||||||
private DirectOverlay direct;
|
private DirectOverlay direct;
|
||||||
private RulesetStore rulesets;
|
private RulesetStore rulesets;
|
||||||
|
|
||||||
|
@ -14,8 +14,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseDrawableRoom : OsuTestCase
|
internal class TestCaseDrawableRoom : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Select your favourite room";
|
|
||||||
|
|
||||||
private RulesetStore rulesets;
|
private RulesetStore rulesets;
|
||||||
|
|
||||||
protected override void LoadComplete()
|
protected override void LoadComplete()
|
||||||
|
@ -2,15 +2,15 @@
|
|||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
using osu.Game.Screens.Tournament;
|
using osu.Game.Screens.Tournament;
|
||||||
using osu.Game.Screens.Tournament.Teams;
|
using osu.Game.Screens.Tournament.Teams;
|
||||||
|
|
||||||
namespace osu.Game.Tests.Visual
|
namespace osu.Game.Tests.Visual
|
||||||
{
|
{
|
||||||
|
[Description("for tournament use")]
|
||||||
internal class TestCaseDrawings : OsuTestCase
|
internal class TestCaseDrawings : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => "Tournament drawings";
|
|
||||||
|
|
||||||
public TestCaseDrawings()
|
public TestCaseDrawings()
|
||||||
{
|
{
|
||||||
Add(new Drawings
|
Add(new Drawings
|
||||||
|
@ -7,8 +7,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseGamefield : OsuTestCase
|
internal class TestCaseGamefield : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Showing hitobjects and what not.";
|
|
||||||
|
|
||||||
protected override void LoadComplete()
|
protected override void LoadComplete()
|
||||||
{
|
{
|
||||||
base.LoadComplete();
|
base.LoadComplete();
|
||||||
|
@ -10,8 +10,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseGraph : OsuTestCase
|
internal class TestCaseGraph : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => "graph";
|
|
||||||
|
|
||||||
public TestCaseGraph()
|
public TestCaseGraph()
|
||||||
{
|
{
|
||||||
BarGraph graph;
|
BarGraph graph;
|
||||||
|
@ -14,8 +14,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
public class TestCaseIconButton : OsuTestCase
|
public class TestCaseIconButton : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => "Various display modes of icon buttons";
|
|
||||||
|
|
||||||
public TestCaseIconButton()
|
public TestCaseIconButton()
|
||||||
{
|
{
|
||||||
Child = new FillFlowContainer
|
Child = new FillFlowContainer
|
||||||
|
@ -9,8 +9,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
private readonly KeyBindingOverlay overlay;
|
private readonly KeyBindingOverlay overlay;
|
||||||
|
|
||||||
public override string Description => @"Key configuration";
|
|
||||||
|
|
||||||
public TestCaseKeyConfiguration()
|
public TestCaseKeyConfiguration()
|
||||||
{
|
{
|
||||||
Child = overlay = new KeyBindingOverlay();
|
Child = overlay = new KeyBindingOverlay();
|
||||||
|
@ -10,8 +10,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseKeyCounter : OsuTestCase
|
internal class TestCaseKeyCounter : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Tests key counter";
|
|
||||||
|
|
||||||
public TestCaseKeyCounter()
|
public TestCaseKeyCounter()
|
||||||
{
|
{
|
||||||
KeyCounterCollection kc = new KeyCounterCollection
|
KeyCounterCollection kc = new KeyCounterCollection
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using System.ComponentModel;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Game.Rulesets.Scoring;
|
using osu.Game.Rulesets.Scoring;
|
||||||
using osu.Game.Screens.Select.Leaderboards;
|
using osu.Game.Screens.Select.Leaderboards;
|
||||||
@ -9,10 +10,9 @@ using OpenTK;
|
|||||||
|
|
||||||
namespace osu.Game.Tests.Visual
|
namespace osu.Game.Tests.Visual
|
||||||
{
|
{
|
||||||
|
[Description("PlaySongSelect leaderboard")]
|
||||||
internal class TestCaseLeaderboard : OsuTestCase
|
internal class TestCaseLeaderboard : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"From song select";
|
|
||||||
|
|
||||||
private readonly Leaderboard leaderboard;
|
private readonly Leaderboard leaderboard;
|
||||||
|
|
||||||
private void newScores()
|
private void newScores()
|
||||||
|
@ -11,8 +11,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseMedalOverlay : OsuTestCase
|
internal class TestCaseMedalOverlay : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"medal get!";
|
|
||||||
|
|
||||||
public override IReadOnlyList<Type> RequiredTypes => new[]
|
public override IReadOnlyList<Type> RequiredTypes => new[]
|
||||||
{
|
{
|
||||||
typeof(MedalOverlay),
|
typeof(MedalOverlay),
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using System.ComponentModel;
|
||||||
using osu.Framework.Graphics.Colour;
|
using osu.Framework.Graphics.Colour;
|
||||||
using osu.Framework.Graphics.Shapes;
|
using osu.Framework.Graphics.Shapes;
|
||||||
using osu.Game.Screens.Menu;
|
using osu.Game.Screens.Menu;
|
||||||
@ -8,10 +9,9 @@ using OpenTK.Graphics;
|
|||||||
|
|
||||||
namespace osu.Game.Tests.Visual
|
namespace osu.Game.Tests.Visual
|
||||||
{
|
{
|
||||||
|
[Description("main menu")]
|
||||||
internal class TestCaseMenuButtonSystem : OsuTestCase
|
internal class TestCaseMenuButtonSystem : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Main menu button system";
|
|
||||||
|
|
||||||
public TestCaseMenuButtonSystem()
|
public TestCaseMenuButtonSystem()
|
||||||
{
|
{
|
||||||
Add(new Box
|
Add(new Box
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using System.ComponentModel;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
using osu.Framework.Logging;
|
using osu.Framework.Logging;
|
||||||
using osu.Game.Screens.Play;
|
using osu.Game.Screens.Play;
|
||||||
|
|
||||||
namespace osu.Game.Tests.Visual
|
namespace osu.Game.Tests.Visual
|
||||||
{
|
{
|
||||||
|
[Description("player pause/fail screens")]
|
||||||
internal class TestCaseMenuOverlays : OsuTestCase
|
internal class TestCaseMenuOverlays : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Tests pause and fail overlays";
|
|
||||||
|
|
||||||
public TestCaseMenuOverlays()
|
public TestCaseMenuOverlays()
|
||||||
{
|
{
|
||||||
FailOverlay failOverlay;
|
FailOverlay failOverlay;
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using System.ComponentModel;
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Game.Overlays.Mods;
|
using osu.Game.Overlays.Mods;
|
||||||
@ -10,10 +11,9 @@ using OpenTK;
|
|||||||
|
|
||||||
namespace osu.Game.Tests.Visual
|
namespace osu.Game.Tests.Visual
|
||||||
{
|
{
|
||||||
|
[Description("mod select and icon display")]
|
||||||
internal class TestCaseMods : OsuTestCase
|
internal class TestCaseMods : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Mod select overlay and in-game display";
|
|
||||||
|
|
||||||
private ModSelectOverlay modSelect;
|
private ModSelectOverlay modSelect;
|
||||||
private ModDisplay modDisplay;
|
private ModDisplay modDisplay;
|
||||||
|
|
||||||
|
@ -13,8 +13,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseMusicController : OsuTestCase
|
internal class TestCaseMusicController : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Tests music controller ui.";
|
|
||||||
|
|
||||||
private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
|
private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
|
||||||
|
|
||||||
public TestCaseMusicController()
|
public TestCaseMusicController()
|
||||||
|
@ -15,8 +15,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
[TestFixture]
|
[TestFixture]
|
||||||
internal class TestCaseNotificationOverlay : OsuTestCase
|
internal class TestCaseNotificationOverlay : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"I handle notifications";
|
|
||||||
|
|
||||||
private readonly NotificationOverlay manager;
|
private readonly NotificationOverlay manager;
|
||||||
|
|
||||||
public TestCaseNotificationOverlay()
|
public TestCaseNotificationOverlay()
|
||||||
|
@ -12,8 +12,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
private FrameworkConfigManager config;
|
private FrameworkConfigManager config;
|
||||||
private Bindable<FrameSync> frameSyncMode;
|
private Bindable<FrameSync> frameSyncMode;
|
||||||
|
|
||||||
public override string Description => @"Make it easier to see setting changes";
|
|
||||||
|
|
||||||
protected override void LoadComplete()
|
protected override void LoadComplete()
|
||||||
{
|
{
|
||||||
base.LoadComplete();
|
base.LoadComplete();
|
||||||
|
@ -22,8 +22,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
private BeatmapManager manager;
|
private BeatmapManager manager;
|
||||||
|
|
||||||
public override string Description => @"with fake data";
|
|
||||||
|
|
||||||
private RulesetStore rulesets;
|
private RulesetStore rulesets;
|
||||||
|
|
||||||
private DependencyContainer dependencies;
|
private DependencyContainer dependencies;
|
||||||
|
@ -10,8 +10,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseReplay : TestCasePlayer
|
internal class TestCaseReplay : TestCasePlayer
|
||||||
{
|
{
|
||||||
public override string Description => @"Testing replay playback.";
|
|
||||||
|
|
||||||
protected override Player CreatePlayer(WorkingBeatmap beatmap, Ruleset ruleset)
|
protected override Player CreatePlayer(WorkingBeatmap beatmap, Ruleset ruleset)
|
||||||
{
|
{
|
||||||
beatmap.Mods.Value = beatmap.Mods.Value.Concat(new[] { ruleset.GetAutoplayMod() });
|
beatmap.Mods.Value = beatmap.Mods.Value.Concat(new[] { ruleset.GetAutoplayMod() });
|
||||||
|
@ -10,8 +10,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseReplaySettingsOverlay : OsuTestCase
|
internal class TestCaseReplaySettingsOverlay : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Settings visible in replay/auto";
|
|
||||||
|
|
||||||
public TestCaseReplaySettingsOverlay()
|
public TestCaseReplaySettingsOverlay()
|
||||||
{
|
{
|
||||||
ExampleContainer container;
|
ExampleContainer container;
|
||||||
|
@ -15,8 +15,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
private BeatmapManager beatmaps;
|
private BeatmapManager beatmaps;
|
||||||
|
|
||||||
public override string Description => @"Results after playing.";
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(BeatmapManager beatmaps)
|
private void load(BeatmapManager beatmaps)
|
||||||
{
|
{
|
||||||
|
@ -13,8 +13,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseRoomInspector : OsuTestCase
|
internal class TestCaseRoomInspector : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"from the multiplayer lobby";
|
|
||||||
|
|
||||||
private RulesetStore rulesets;
|
private RulesetStore rulesets;
|
||||||
|
|
||||||
protected override void LoadComplete()
|
protected override void LoadComplete()
|
||||||
|
@ -12,8 +12,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseScoreCounter : OsuTestCase
|
internal class TestCaseScoreCounter : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Tests multiple counters";
|
|
||||||
|
|
||||||
public TestCaseScoreCounter()
|
public TestCaseScoreCounter()
|
||||||
{
|
{
|
||||||
int numerator = 0, denominator = 0;
|
int numerator = 0, denominator = 0;
|
||||||
|
@ -7,8 +7,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseSettings : OsuTestCase
|
internal class TestCaseSettings : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Tests the settings overlay";
|
|
||||||
|
|
||||||
private readonly SettingsOverlay settings;
|
private readonly SettingsOverlay settings;
|
||||||
|
|
||||||
public TestCaseSettings()
|
public TestCaseSettings()
|
||||||
|
@ -7,8 +7,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseSkipButton : OsuTestCase
|
internal class TestCaseSkipButton : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Skip skip skippediskip";
|
|
||||||
|
|
||||||
protected override void LoadComplete()
|
protected override void LoadComplete()
|
||||||
{
|
{
|
||||||
base.LoadComplete();
|
base.LoadComplete();
|
||||||
|
@ -8,8 +8,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
public class TestCaseSocial : OsuTestCase
|
public class TestCaseSocial : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"social browser overlay";
|
|
||||||
|
|
||||||
public TestCaseSocial()
|
public TestCaseSocial()
|
||||||
{
|
{
|
||||||
SocialOverlay s = new SocialOverlay
|
SocialOverlay s = new SocialOverlay
|
||||||
|
@ -12,8 +12,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseSongProgress : OsuTestCase
|
internal class TestCaseSongProgress : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"With fake data";
|
|
||||||
|
|
||||||
private readonly SongProgress progress;
|
private readonly SongProgress progress;
|
||||||
private readonly SongProgressGraph graph;
|
private readonly SongProgressGraph graph;
|
||||||
|
|
||||||
|
@ -16,8 +16,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseStoryboard : OsuTestCase
|
internal class TestCaseStoryboard : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Tests storyboards.";
|
|
||||||
|
|
||||||
private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
|
private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
|
||||||
|
|
||||||
private readonly Container<DrawableStoryboard> storyboardContainer;
|
private readonly Container<DrawableStoryboard> storyboardContainer;
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using System.ComponentModel;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Game.Graphics.Sprites;
|
using osu.Game.Graphics.Sprites;
|
||||||
using osu.Game.Graphics.UserInterface;
|
using osu.Game.Graphics.UserInterface;
|
||||||
@ -9,10 +10,9 @@ using OpenTK;
|
|||||||
|
|
||||||
namespace osu.Game.Tests.Visual
|
namespace osu.Game.Tests.Visual
|
||||||
{
|
{
|
||||||
|
[Description("SongSelect filter control")]
|
||||||
public class TestCaseTabControl : OsuTestCase
|
public class TestCaseTabControl : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Filter for song select";
|
|
||||||
|
|
||||||
public TestCaseTabControl()
|
public TestCaseTabControl()
|
||||||
{
|
{
|
||||||
OsuSpriteText text;
|
OsuSpriteText text;
|
||||||
|
@ -12,8 +12,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseTextAwesome : OsuTestCase
|
internal class TestCaseTextAwesome : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Tests display of icons";
|
|
||||||
|
|
||||||
public TestCaseTextAwesome()
|
public TestCaseTextAwesome()
|
||||||
{
|
{
|
||||||
FillFlowContainer flow;
|
FillFlowContainer flow;
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using System.ComponentModel;
|
||||||
using osu.Game.Graphics.UserInterface;
|
using osu.Game.Graphics.UserInterface;
|
||||||
|
|
||||||
namespace osu.Game.Tests.Visual
|
namespace osu.Game.Tests.Visual
|
||||||
{
|
{
|
||||||
|
[Description("mostly back button")]
|
||||||
internal class TestCaseTwoLayerButton : OsuTestCase
|
internal class TestCaseTwoLayerButton : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Mostly back button";
|
|
||||||
|
|
||||||
public TestCaseTwoLayerButton()
|
public TestCaseTwoLayerButton()
|
||||||
{
|
{
|
||||||
Add(new BackButton());
|
Add(new BackButton());
|
||||||
|
@ -10,8 +10,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseUserPanel : OsuTestCase
|
internal class TestCaseUserPanel : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => @"Panels for displaying a user's status";
|
|
||||||
|
|
||||||
public TestCaseUserPanel()
|
public TestCaseUserPanel()
|
||||||
{
|
{
|
||||||
UserPanel flyte;
|
UserPanel flyte;
|
||||||
|
@ -10,8 +10,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseUserProfile : OsuTestCase
|
internal class TestCaseUserProfile : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => "Tests user's profile page.";
|
|
||||||
|
|
||||||
public TestCaseUserProfile()
|
public TestCaseUserProfile()
|
||||||
{
|
{
|
||||||
var profile = new UserProfileOverlay();
|
var profile = new UserProfileOverlay();
|
||||||
|
@ -15,8 +15,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
internal class TestCaseUserRanks : OsuTestCase
|
internal class TestCaseUserRanks : OsuTestCase
|
||||||
{
|
{
|
||||||
public override string Description => "showing your latest achievements";
|
|
||||||
|
|
||||||
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(DrawableScore), typeof(RanksSection) };
|
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(DrawableScore), typeof(RanksSection) };
|
||||||
|
|
||||||
public TestCaseUserRanks()
|
public TestCaseUserRanks()
|
||||||
|
134
osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
Normal file
134
osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
Normal file
@ -0,0 +1,134 @@
|
|||||||
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using OpenTK;
|
||||||
|
using OpenTK.Graphics;
|
||||||
|
using osu.Framework.Configuration;
|
||||||
|
using osu.Framework.Extensions.Color4Extensions;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Shapes;
|
||||||
|
using osu.Framework.Input;
|
||||||
|
using osu.Game.Graphics;
|
||||||
|
using osu.Game.Graphics.Sprites;
|
||||||
|
using osu.Game.Users;
|
||||||
|
|
||||||
|
namespace osu.Game.Overlays.Profile.Sections.Kudosu
|
||||||
|
{
|
||||||
|
public class KudosuInfo : Container
|
||||||
|
{
|
||||||
|
private readonly Bindable<User> user = new Bindable<User>();
|
||||||
|
|
||||||
|
public KudosuInfo(Bindable<User> user)
|
||||||
|
{
|
||||||
|
this.user.BindTo(user);
|
||||||
|
|
||||||
|
CountSection total;
|
||||||
|
CountSection avaliable;
|
||||||
|
|
||||||
|
RelativeSizeAxes = Axes.X;
|
||||||
|
AutoSizeAxes = Axes.Y;
|
||||||
|
Masking = true;
|
||||||
|
CornerRadius = 3;
|
||||||
|
EdgeEffect = new EdgeEffectParameters
|
||||||
|
{
|
||||||
|
Type = EdgeEffectType.Shadow,
|
||||||
|
Offset = new Vector2(0f, 1f),
|
||||||
|
Radius = 3f,
|
||||||
|
Colour = Color4.Black.Opacity(0.2f),
|
||||||
|
};
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new Box
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Colour = OsuColour.Gray(0.2f)
|
||||||
|
},
|
||||||
|
new FillFlowContainer
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
AutoSizeAxes = Axes.Y,
|
||||||
|
Children = new[]
|
||||||
|
{
|
||||||
|
total = new CountSection(
|
||||||
|
"Total Kudosu Earned",
|
||||||
|
"Based on how much of a contribution the user has made to beatmap moderation. See this link for more information."
|
||||||
|
),
|
||||||
|
avaliable = new CountSection(
|
||||||
|
"Kudosu Avaliable",
|
||||||
|
"Kudosu can be traded for kudosu stars, which will help your beatmap get more attention. This is the number of kudosu you haven't traded in yet."
|
||||||
|
),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
this.user.ValueChanged += newUser =>
|
||||||
|
{
|
||||||
|
total.Count = newUser?.Kudosu.Total ?? 0;
|
||||||
|
avaliable.Count = newUser?.Kudosu.Available ?? 0;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override bool OnClick(InputState state) => true;
|
||||||
|
|
||||||
|
private class CountSection : Container
|
||||||
|
{
|
||||||
|
private readonly OsuSpriteText valueText;
|
||||||
|
|
||||||
|
public int Count
|
||||||
|
{
|
||||||
|
set { valueText.Text = value.ToString(); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public CountSection(string header, string description)
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.X;
|
||||||
|
Width = 0.5f;
|
||||||
|
AutoSizeAxes = Axes.Y;
|
||||||
|
Padding = new MarginPadding { Horizontal = 10, Top = 10, Bottom = 20 };
|
||||||
|
Child = new FillFlowContainer
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Y,
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
Direction = FillDirection.Vertical,
|
||||||
|
Spacing = new Vector2(0, 5),
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new FillFlowContainer
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Direction = FillDirection.Horizontal,
|
||||||
|
Spacing = new Vector2(5, 0),
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new OsuSpriteText
|
||||||
|
{
|
||||||
|
Anchor = Anchor.BottomLeft,
|
||||||
|
Origin = Anchor.BottomLeft,
|
||||||
|
Text = header + ":",
|
||||||
|
TextSize = 20,
|
||||||
|
Font = @"Exo2.0-RegularItalic",
|
||||||
|
},
|
||||||
|
valueText = new OsuSpriteText
|
||||||
|
{
|
||||||
|
Anchor = Anchor.BottomLeft,
|
||||||
|
Origin = Anchor.BottomLeft,
|
||||||
|
Text = "0",
|
||||||
|
TextSize = 40,
|
||||||
|
UseFullGlyphHeight = false,
|
||||||
|
Font = @"Exo2.0-RegularItalic"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
new TextFlowContainer(t => { t.TextSize = 19; })
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
AutoSizeAxes = Axes.Y,
|
||||||
|
Text = description
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,6 +1,8 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using osu.Game.Overlays.Profile.Sections.Kudosu;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Profile.Sections
|
namespace osu.Game.Overlays.Profile.Sections
|
||||||
{
|
{
|
||||||
public class KudosuSection : ProfileSection
|
public class KudosuSection : ProfileSection
|
||||||
@ -8,5 +10,13 @@ namespace osu.Game.Overlays.Profile.Sections
|
|||||||
public override string Title => "Kudosu!";
|
public override string Title => "Kudosu!";
|
||||||
|
|
||||||
public override string Identifier => "kudosu";
|
public override string Identifier => "kudosu";
|
||||||
|
|
||||||
|
public KudosuSection()
|
||||||
|
{
|
||||||
|
Children = new[]
|
||||||
|
{
|
||||||
|
new KudosuInfo(User),
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -97,7 +97,7 @@ namespace osu.Game.Overlays
|
|||||||
//new MedalsSection(),
|
//new MedalsSection(),
|
||||||
new HistoricalSection(),
|
new HistoricalSection(),
|
||||||
new BeatmapsSection(),
|
new BeatmapsSection(),
|
||||||
//new KudosuSection()
|
new KudosuSection()
|
||||||
};
|
};
|
||||||
tabs = new ProfileTabControl
|
tabs = new ProfileTabControl
|
||||||
{
|
{
|
||||||
|
@ -23,8 +23,6 @@ namespace osu.Game.Tests.Visual
|
|||||||
|
|
||||||
protected Player Player;
|
protected Player Player;
|
||||||
|
|
||||||
public override string Description => @"Showing everything to play the game.";
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Create a TestCase which runs through the Player screen.
|
/// Create a TestCase which runs through the Player screen.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -292,6 +292,7 @@
|
|||||||
<Compile Include="Overlays\BeatmapSet\Scores\ScoresContainer.cs" />
|
<Compile Include="Overlays\BeatmapSet\Scores\ScoresContainer.cs" />
|
||||||
<Compile Include="Online\API\Requests\GetUserBeatmapsRequest.cs" />
|
<Compile Include="Online\API\Requests\GetUserBeatmapsRequest.cs" />
|
||||||
<Compile Include="Overlays\Profile\Sections\Beatmaps\PaginatedBeatmapContainer.cs" />
|
<Compile Include="Overlays\Profile\Sections\Beatmaps\PaginatedBeatmapContainer.cs" />
|
||||||
|
<Compile Include="Overlays\Profile\Sections\Kudosu\KudosuInfo.cs" />
|
||||||
<Compile Include="Overlays\Profile\Sections\PaginatedContainer.cs" />
|
<Compile Include="Overlays\Profile\Sections\PaginatedContainer.cs" />
|
||||||
<Compile Include="Overlays\Profile\Sections\Ranks\DrawablePerformanceScore.cs" />
|
<Compile Include="Overlays\Profile\Sections\Ranks\DrawablePerformanceScore.cs" />
|
||||||
<Compile Include="Overlays\Profile\Sections\Ranks\PaginatedScoreContainer.cs" />
|
<Compile Include="Overlays\Profile\Sections\Ranks\PaginatedScoreContainer.cs" />
|
||||||
|
Loading…
Reference in New Issue
Block a user