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

Merge remote-tracking branch 'upstream/master' into flashlight-dim

Browse Source
This commit is contained in:
David Zhao
2019-05-07 12:04:58 +09:00
parent 9ce7d0416b 437d7a5cf3
commit 732b0b22a3
196 changed files with 2679 additions and 1463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics.Textures;
using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Rulesets;
using osuTK;
namespace osu.Game.Tests.Beatmaps
{
@ -67,9 +68,10 @@ namespace osu.Game.Tests.Beatmaps
public override bool Seek(double seek)
{
offset = Math.Min(seek, Length);
offset = MathHelper.Clamp(seek, 0, Length);
lastReferenceTime = null;
return true;
return offset == seek;
}
public override void Start()

4
osu.Game/Tests/Visual/AllPlayersTestCase.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Tests.Visual
{
Player p = null;
AddStep(r.Name, () => p = loadPlayerFor(r));
AddUntilStep(() =>
AddUntilStep("player loaded", () =>
{
if (p?.IsLoaded == true)
{
@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual
}
return false;
}, "player loaded");
});
AddCheckSteps();
}

2
osu.Game/Tests/Visual/EditorClockTestCase.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual
public abstract class EditorClockTestCase : OsuTestCase
{
protected readonly BindableBeatDivisor BeatDivisor = new BindableBeatDivisor();
protected readonly EditorClock Clock;
protected new readonly EditorClock Clock;
protected EditorClockTestCase()
{

2
osu.Game/Tests/Visual/OsuTestCase.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual
[Cached(Type = typeof(IBindable<IReadOnlyList<Mod>>))]
protected readonly Bindable<IReadOnlyList<Mod>> Mods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
protected DependencyContainer Dependencies { get; private set; }
protected new DependencyContainer Dependencies { get; private set; }
private readonly Lazy<Storage> localStorage;
protected Storage LocalStorage => localStorage.Value;

2
osu.Game/Tests/Visual/PlayerTestCase.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Tests.Visual
public void SetUpSteps()
{
AddStep(ruleset.RulesetInfo.Name, loadPlayer);
AddUntilStep(() => Player.IsLoaded && Player.Alpha == 1, "player loaded");
AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
}
protected virtual IBeatmap CreateBeatmap(Ruleset ruleset) => new TestBeatmap(ruleset.RulesetInfo);