From 2cb18a2f9fcc3735c6b49c3d66bcf80610eb1366 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 20:10:41 +0000 Subject: [PATCH 1/3] Bump ppy.osu.Game from 2021.907.0 to 2021.916.0 Bumps [ppy.osu.Game](https://github.com/ppy/osu) from 2021.907.0 to 2021.916.0. - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2021.907.0...2021.916.0) --- updated-dependencies: - dependency-name: ppy.osu.Game dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- osu.Game.Rulesets.Cytosu/osu.Game.Rulesets.Cytosu.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Cytosu/osu.Game.Rulesets.Cytosu.csproj b/osu.Game.Rulesets.Cytosu/osu.Game.Rulesets.Cytosu.csproj index 393d659..d65783b 100644 --- a/osu.Game.Rulesets.Cytosu/osu.Game.Rulesets.Cytosu.csproj +++ b/osu.Game.Rulesets.Cytosu/osu.Game.Rulesets.Cytosu.csproj @@ -14,6 +14,6 @@ - + \ No newline at end of file From 33e5a3adbd328c202de8a30461c71d1bbce21e87 Mon Sep 17 00:00:00 2001 From: Ganendra Afrasya Date: Fri, 17 Sep 2021 20:10:12 +0700 Subject: [PATCH 2/3] Update `IKeyBindingHandler` implementation --- .../Objects/Drawables/DrawableHitCircle.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/osu.Game.Rulesets.Cytosu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Cytosu/Objects/Drawables/DrawableHitCircle.cs index ba096ed..073b4aa 100644 --- a/osu.Game.Rulesets.Cytosu/Objects/Drawables/DrawableHitCircle.cs +++ b/osu.Game.Rulesets.Cytosu/Objects/Drawables/DrawableHitCircle.cs @@ -8,6 +8,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Input.Bindings; +using osu.Framework.Input.Events; using osu.Game.Rulesets.Cytosu.Objects.Drawables.Piece; using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Scoring; @@ -182,15 +183,15 @@ public HitReceptor() CornerExponent = 2; } - public bool OnPressed(CytosuAction action) + public bool OnPressed(KeyBindingPressEvent e) { - switch (action) + switch (e.Action) { case CytosuAction.Action1: case CytosuAction.Action2: if (IsHovered && (Hit?.Invoke() ?? false)) { - HitAction = action; + HitAction = e.Action; return true; } @@ -200,7 +201,7 @@ public bool OnPressed(CytosuAction action) return false; } - public void OnReleased(CytosuAction action) + public void OnReleased(KeyBindingReleaseEvent e) { } } From faf4fe9240e36491fce5cd2c0ed49db714a3fdb6 Mon Sep 17 00:00:00 2001 From: Ganendra Afrasya Date: Fri, 17 Sep 2021 20:10:29 +0700 Subject: [PATCH 3/3] Use `AddGame` on visual test --- osu.Game.Rulesets.Cytosu.Tests/TestSceneOsuGame.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/osu.Game.Rulesets.Cytosu.Tests/TestSceneOsuGame.cs b/osu.Game.Rulesets.Cytosu.Tests/TestSceneOsuGame.cs index 1415668..fa8dd29 100644 --- a/osu.Game.Rulesets.Cytosu.Tests/TestSceneOsuGame.cs +++ b/osu.Game.Rulesets.Cytosu.Tests/TestSceneOsuGame.cs @@ -15,18 +15,16 @@ public class TestSceneOsuGame : OsuTestScene [BackgroundDependencyLoader] private void load(GameHost host, OsuGameBase gameBase) { - OsuGame game = new OsuGame(); - game.SetHost(host); - Children = new Drawable[] { new Box { RelativeSizeAxes = Axes.Both, Colour = Color4.Black, - }, - game + } }; + + AddGame(new OsuGame()); } } }