Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump ppy.osu.Game from 2022.810.0 to 2022.901.0 #260

Merged
merged 2 commits into from
Aug 31, 2022
Merged

Bump ppy.osu.Game from 2022.810.0 to 2022.901.0 #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d393907
Bump ppy.osu.Game from 2022.810.0 to 2022.901.0
dependabot[bot] Aug 31, 2022
2a0cc2e
Apply fixes to breaking changes
LumpBloom7 Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Rush.Tests/Visual/TestSceneMiniBoss.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void TestPlayerStateTransitionsAtCorrectTime()

AddAssert("not in fight state", () => targetLane != PlayerTargetLane.MiniBoss);
AddUntilStep("wait for fight state", () => targetLane == PlayerTargetLane.MiniBoss);
AddAssert("time has reached mini-boss time", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= mini_boss_time);
AddAssert("time has reached mini-boss time", () => Player.GameplayClockContainer.CurrentTime >= mini_boss_time);

AddStep("stop mashing", () => Scheduler.CancelDelayedTasks());
}
Expand Down
3 changes: 2 additions & 1 deletion osu.Game.Rulesets.Rush/RushRuleset.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Bindings;
using osu.Framework.Localisation;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Overlays.Settings;
Expand Down Expand Up @@ -123,7 +124,7 @@ protected override IEnumerable<HitResult> GetValidHitResults()
};
}

public override string GetDisplayNameForHitResult(HitResult result) => result switch
public override LocalisableString GetDisplayNameForHitResult(HitResult result) => result switch
{
HitResult.SmallBonus => "Heart bonus",
HitResult.LargeBonus => "Fever bonus",
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2022.810.0" />
<PackageReference Include="ppy.osu.Game" Version="2022.901.0" />
</ItemGroup>
</Project>