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

Merge remote-tracking branch 'origin/RangeSlider_implementation' into RangeSlider_implementation

Browse Source 
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeFilterControl.cs
#	osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
This commit is contained in:
mk56-spn
2022-11-27 10:40:29 +01:00
parent 1ebaf4963d 61bfd2f6b2
commit 0aba119056
2346 changed files with 3518 additions and 3426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
View File

@ -22,7 +22,7 @@ using osuTK.Graphics;
namespace osu.Game.Tests.Visual.SongSelect
{
[System.ComponentModel.Description("Advanced beatmap statistics display")]
public class TestSceneAdvancedStats : OsuTestScene
public partial class TestSceneAdvancedStats : OsuTestScene
{
private TestAdvancedStats advancedStats;
@ -164,7 +164,7 @@ namespace osu.Game.Tests.Visual.SongSelect
private bool barIsBlue(AdvancedStats.StatisticRow row) => row.ModBar.AccentColour == colours.BlueDark;
private bool barIsRed(AdvancedStats.StatisticRow row) => row.ModBar.AccentColour == colours.Red;
private class TestAdvancedStats : AdvancedStats
private partial class TestAdvancedStats : AdvancedStats
{
public new StatisticRow FirstValue => base.FirstValue;
public new StatisticRow HpDrain => base.HpDrain;

4
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
View File

@ -26,7 +26,7 @@ using osuTK.Input;
namespace osu.Game.Tests.Visual.SongSelect
{
[TestFixture]
public class TestSceneBeatmapCarousel : OsuManualInputManagerTestScene
public partial class TestSceneBeatmapCarousel : OsuManualInputManagerTestScene
{
private TestBeatmapCarousel carousel;
private RulesetStore rulesets;
@ -1112,7 +1112,7 @@ namespace osu.Game.Tests.Visual.SongSelect
AddAssert("Selection is visible", selectedBeatmapVisible);
}
private class TestBeatmapCarousel : BeatmapCarousel
private partial class TestBeatmapCarousel : BeatmapCarousel
{
public bool PendingFilterTask => PendingFilter != null;

2
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs
View File

@ -14,7 +14,7 @@ using osu.Game.Screens.Select;
namespace osu.Game.Tests.Visual.SongSelect
{
[System.ComponentModel.Description("PlaySongSelect beatmap details")]
public class TestSceneBeatmapDetails : OsuTestScene
public partial class TestSceneBeatmapDetails : OsuTestScene
{
private BeatmapDetails details;

4
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
View File

@ -30,7 +30,7 @@ using osuTK;
namespace osu.Game.Tests.Visual.SongSelect
{
[TestFixture]
public class TestSceneBeatmapInfoWedge : OsuTestScene
public partial class TestSceneBeatmapInfoWedge : OsuTestScene
{
private RulesetStore rulesets;
private TestBeatmapInfoWedge infoWedge;
@ -267,7 +267,7 @@ namespace osu.Game.Tests.Visual.SongSelect
};
}
private class TestBeatmapInfoWedge : BeatmapInfoWedge
private partial class TestBeatmapInfoWedge : BeatmapInfoWedge
{
public new Container DisplayedContent => base.DisplayedContent;

4
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
View File

@ -27,7 +27,7 @@ using osuTK;
namespace osu.Game.Tests.Visual.SongSelect
{
public class TestSceneBeatmapLeaderboard : OsuTestScene
public partial class TestSceneBeatmapLeaderboard : OsuTestScene
{
private readonly FailableLeaderboard leaderboard;
@ -381,7 +381,7 @@ namespace osu.Game.Tests.Visual.SongSelect
};
}
private class FailableLeaderboard : BeatmapLeaderboard
private partial class FailableLeaderboard : BeatmapLeaderboard
{
public new void SetErrorState(LeaderboardState state) => base.SetErrorState(state);
public new void SetScores(IEnumerable<ScoreInfo>? scores, ScoreInfo? userScore = null) => base.SetScores(scores, userScore);

4
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
View File

@ -22,7 +22,7 @@ using osuTK;
namespace osu.Game.Tests.Visual.SongSelect
{
public class TestSceneBeatmapMetadataDisplay : OsuTestScene
public partial class TestSceneBeatmapMetadataDisplay : OsuTestScene
{
private BeatmapMetadataDisplay display;
@ -119,7 +119,7 @@ namespace osu.Game.Tests.Visual.SongSelect
AddStep("finish loading", () => display.Loading = false);
}
private class TestBeatmapDifficultyCache : BeatmapDifficultyCache
private partial class TestBeatmapDifficultyCache : BeatmapDifficultyCache
{
private TaskCompletionSource<bool> calculationBlocker;

2
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Screens.Select.Options;
namespace osu.Game.Tests.Visual.SongSelect
{
[Description("bottom beatmap details")]
public class TestSceneBeatmapOptionsOverlay : OsuTestScene
public partial class TestSceneBeatmapOptionsOverlay : OsuTestScene
{
public TestSceneBeatmapOptionsOverlay()
{

2
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
View File

@ -23,7 +23,7 @@ using osu.Game.Users;
namespace osu.Game.Tests.Visual.SongSelect
{
public class TestSceneBeatmapRecommendations : OsuGameTestScene
public partial class TestSceneBeatmapRecommendations : OsuGameTestScene
{
[Resolved]
private IRulesetStore rulesetStore { get; set; }

2
osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
View File

@ -24,7 +24,7 @@ using Realms;
namespace osu.Game.Tests.Visual.SongSelect
{
public class TestSceneFilterControl : OsuManualInputManagerTestScene
public partial class TestSceneFilterControl : OsuManualInputManagerTestScene
{
protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };

4
osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
View File

@ -42,7 +42,7 @@ using osuTK.Input;
namespace osu.Game.Tests.Visual.SongSelect
{
[TestFixture]
public class TestScenePlaySongSelect : ScreenTestScene
public partial class TestScenePlaySongSelect : ScreenTestScene
{
private BeatmapManager manager = null!;
private RulesetStore rulesets = null!;
@ -1141,7 +1141,7 @@ namespace osu.Game.Tests.Visual.SongSelect
rulesets.Dispose();
}
private class TestSongSelect : PlaySongSelect
private partial class TestSongSelect : PlaySongSelect
{
public Action? StartRequested;

2
osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooter.cs
View File

@ -13,7 +13,7 @@ using osuTK.Input;
namespace osu.Game.Tests.Visual.SongSelect
{
public class TestSceneSongSelectFooter : OsuManualInputManagerTestScene
public partial class TestSceneSongSelectFooter : OsuManualInputManagerTestScene
{
private FooterButtonRandom randomButton;

2
osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
View File

@ -20,7 +20,7 @@ using osuTK;
namespace osu.Game.Tests.Visual.SongSelect
{
public class TestSceneTopLocalRank : OsuTestScene
public partial class TestSceneTopLocalRank : OsuTestScene
{
private RulesetStore rulesets = null!;
private BeatmapManager beatmapManager = null!;

2
osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
View File

@ -22,7 +22,7 @@ using osuTK.Input;
namespace osu.Game.Tests.Visual.SongSelect
{
[TestFixture]
public class TestSceneUpdateBeatmapSetButton : OsuManualInputManagerTestScene
public partial class TestSceneUpdateBeatmapSetButton : OsuManualInputManagerTestScene
{
private BeatmapCarousel carousel = null!;

2
osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
View File

@ -19,7 +19,7 @@ using osu.Game.Users;
namespace osu.Game.Tests.Visual.SongSelect
{
public class TestSceneUserTopScoreContainer : OsuTestScene
public partial class TestSceneUserTopScoreContainer : OsuTestScene
{
[Cached(typeof(IDialogOverlay))]
private readonly DialogOverlay dialogOverlay;