mirror of
https://github.com/ppy/osu.git
synced 2025-01-28 08:02:55 +08:00
Merge branch 'master' into multiplayer-test-fixes
This commit is contained in:
commit
0253d753af
@ -1,19 +0,0 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
|
||||||
|
|
||||||
using osu.Game.Rulesets.Objects;
|
|
||||||
using osu.Game.Rulesets.Scoring;
|
|
||||||
|
|
||||||
namespace osu.Game.Tests.NonVisual
|
|
||||||
{
|
|
||||||
public class TestHitObject : HitObject
|
|
||||||
{
|
|
||||||
public TestHitObject(HitWindows hitWindows)
|
|
||||||
{
|
|
||||||
HitWindows = hitWindows;
|
|
||||||
HitWindows.SetDifficulty(0.5f);
|
|
||||||
}
|
|
||||||
|
|
||||||
public new void AddNested(HitObject nested) => base.AddNested(nested);
|
|
||||||
}
|
|
||||||
}
|
|
@ -108,5 +108,16 @@ namespace osu.Game.Tests.NonVisual
|
|||||||
|
|
||||||
public override void CancelResume() => throw new NotImplementedException();
|
public override void CancelResume() => throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class TestHitObject : HitObject
|
||||||
|
{
|
||||||
|
public TestHitObject(HitWindows hitWindows)
|
||||||
|
{
|
||||||
|
HitWindows = hitWindows;
|
||||||
|
HitWindows.SetDifficulty(0.5f);
|
||||||
|
}
|
||||||
|
|
||||||
|
public new void AddNested(HitObject nested) => base.AddNested(nested);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user