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.

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

Bump ppy.osu.Game from 2021.828.0 to 2021.916.0 #211

Merged
merged 4 commits into from
Sep 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 2 additions & 10 deletions osu.Game.Rulesets.Tau.Tests/TestSceneOsuGame.cs
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Platform;
using osu.Game.Tests.Visual;

namespace osu.Game.Rulesets.Tau.Tests
{
public class TestSceneOsuGame : OsuTestScene
{
[BackgroundDependencyLoader]
private void load(GameHost host, OsuGameBase gameBase)
private void load()
{
OsuGame game = new OsuGame();
game.SetHost(host);

Children = new Drawable[]
{
game
};
AddGame(new OsuGame());
}
}
}
9 changes: 5 additions & 4 deletions osu.Game.Rulesets.Tau/Objects/Drawables/DrawableBeat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Scoring;
Expand Down Expand Up @@ -172,22 +173,22 @@ protected override void UpdateHitStateTransforms(ArmedState state)
}
}

public bool OnPressed(TauAction action)
public bool OnPressed(KeyBindingPressEvent<TauAction> e)
{
if (Judged)
return false;

validActionPressed = HitActions.Contains(action);
validActionPressed = HitActions.Contains(e.Action);

var result = UpdateResult(true);

if (IsHit)
HitAction = action;
HitAction = e.Action;

return result;
}

public void OnReleased(TauAction action)
public void OnReleased(KeyBindingReleaseEvent<TauAction> e)
{
}
}
Expand Down
7 changes: 4 additions & 3 deletions osu.Game.Rulesets.Tau/Objects/Drawables/DrawableHardBeat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Scoring;
Expand Down Expand Up @@ -110,18 +111,18 @@ protected override void UpdateHitStateTransforms(ArmedState state)
}
}

public bool OnPressed(TauAction action)
public bool OnPressed(KeyBindingPressEvent<TauAction> e)
{
if (AllJudged)
return false;

if (HitActions.Contains(action))
if (HitActions.Contains(e.Action))
return UpdateResult(true);

return false;
}

public void OnReleased(TauAction action)
public void OnReleased(KeyBindingReleaseEvent<TauAction> e)
{
}
}
Expand Down
15 changes: 8 additions & 7 deletions osu.Game.Rulesets.Tau/Objects/Drawables/DrawableSlider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using osu.Framework.Graphics.Lines;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Framework.Timing;
using osu.Framework.Utils;
using osu.Game.Audio;
Expand Down Expand Up @@ -210,7 +211,7 @@ protected override void ClearNestedHitObjects()
}

double totalTimeHeld = 0;

public readonly Bindable<bool> Tracking = new Bindable<bool>();

protected override void UpdateAfterChildren()
Expand Down Expand Up @@ -295,11 +296,11 @@ protected override void UpdateAfterChildren()
switch (effect.Value)
{
case KiaiType.Turbulent:
{
playfield.SliderParticleEmitter.AddParticle(angle, inversed);
{
playfield.SliderParticleEmitter.AddParticle(angle, inversed);

break;
}
break;
}

case KiaiType.Classic:
if ((int)Time.Current % 8 != 0)
Expand Down Expand Up @@ -334,9 +335,9 @@ protected override void UpdateAfterChildren()
playfield?.AdjustRingGlow(0, Vector2.Zero.GetDegreesFromPosition(path.Position));
}

public bool OnPressed(TauAction action) => HitActions.Contains(action) && !Tracking.Value;
public bool OnPressed(KeyBindingPressEvent<TauAction> e) => HitActions.Contains(e.Action) && !Tracking.Value;

public void OnReleased(TauAction action)
public void OnReleased(KeyBindingReleaseEvent<TauAction> e)
{
}

Expand Down
8 changes: 4 additions & 4 deletions osu.Game.Rulesets.Tau/UI/TauResumeOverlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private void load()
}
}
});

Add(absoluteCursor = new TauCursor.AbsoluteCursor
{
Alpha = 0
Expand Down Expand Up @@ -126,9 +126,9 @@ protected override void OnHoverLost(HoverLostEvent e)
base.OnHoverLost(e);
}

public bool OnPressed(TauAction action)
public bool OnPressed(KeyBindingPressEvent<TauAction> e)
{
switch (action)
switch (e.Action)
{
case TauAction.LeftButton:
case TauAction.RightButton:
Expand All @@ -143,7 +143,7 @@ public bool OnPressed(TauAction action)
return false;
}

public void OnReleased(TauAction action)
public void OnReleased(KeyBindingReleaseEvent<TauAction> e)
{
}
}
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<EmbeddedResource Include="Resources\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2021.828.0" />
<PackageReference Include="ppy.osu.Game" Version="2021.916.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\Samples\Gameplay" />
Expand Down