Skip to content

Commit 3a4ff3e

Browse files
authored
Merge pull request #39 from frenzibyte/fix-judgement-crash
Bump osu!lazer package to latest
2 parents 75b76ad + 43fe721 commit 3a4ff3e

File tree

5 files changed

+5
-14
lines changed

5 files changed

+5
-14
lines changed

osu.Game.Rulesets.Rush.Tests/TestSceneMiniBoss.cs

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
using osu.Game.Rulesets.Rush.Beatmaps;
77
using osu.Game.Rulesets.Rush.Objects;
88
using osu.Game.Rulesets.Rush.UI;
9-
using osu.Game.Tests.Visual;
109
using osuTK.Input;
1110

1211
namespace osu.Game.Rulesets.Rush.Tests
1312
{
14-
public class TestSceneMiniBoss : PlayerTestScene
13+
public class TestSceneMiniBoss : TestSceneRushPlayer
1514
{
1615
private const float mini_boss_time = 600f;
1716

@@ -38,11 +37,6 @@ protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
3837

3938
private PlayerTargetLane targetLane => ((DrawableRushRuleset)Player.DrawableRuleset).Playfield.PlayerSprite.Target;
4039

41-
public TestSceneMiniBoss()
42-
: base(new RushRuleset())
43-
{
44-
}
45-
4640
[Test]
4741
public void TestPlayerStateTransitionsAtCorrectTime()
4842
{

osu.Game.Rulesets.Rush.Tests/TestSceneRushPlayer.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ namespace osu.Game.Rulesets.Rush.Tests
99
[TestFixture]
1010
public class TestSceneRushPlayer : PlayerTestScene
1111
{
12-
public TestSceneRushPlayer()
13-
: base(new RushRuleset())
14-
{
15-
}
12+
protected override Ruleset CreatePlayerRuleset() => new RushRuleset();
1613
}
1714
}

osu.Game.Rulesets.Rush/Objects/Drawables/DrawableHeart.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public BeatingHeart()
7979
};
8080
}
8181

82-
protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes) =>
82+
protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes) =>
8383
this.ScaleTo(1.5f)
8484
.Then()
8585
.ScaleTo(1f, timingPoint.BeatLength, Easing.Out);

osu.Game.Rulesets.Rush/UI/HitTarget.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public HitTarget()
3636
};
3737
}
3838

39-
protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes) =>
39+
protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes) =>
4040
this.ScaleTo(1.2f)
4141
.Then()
4242
.ScaleTo(1f, timingPoint.BeatLength, Easing.Out);

osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<EmbeddedResource Include="Resources\**" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="ppy.osu.Game" Version="2020.602.0" />
13+
<PackageReference Include="ppy.osu.Game" Version="2020.710.0" />
1414
</ItemGroup>
1515
</Project>

0 commit comments

Comments
 (0)