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

Implement osu!mania-specific health bar display #30867

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8dca69e
Add osu!mania specifications for health bar display
frenzibyte Nov 25, 2024
f1b5686
Refactor skin migration to allow mutating multiple layouts at once
frenzibyte Nov 25, 2024
76f79ce
Migrate legacy health bar display to per-ruleset target
frenzibyte Nov 25, 2024
7df7727
Revert "Migrate legacy health bar display to per-ruleset target"
frenzibyte Nov 26, 2024
83ecfbd
Revert "Refactor skin migration to allow mutating multiple layouts at…
frenzibyte Nov 26, 2024
c2215b1
Add extensive test scene for skin migrations
frenzibyte Nov 26, 2024
fcbfbd0
Add migration logic for legacy health displays
frenzibyte Nov 26, 2024
5ab9074
Move test and mark headless
frenzibyte Nov 26, 2024
0e920a6
Use type equality
frenzibyte Nov 26, 2024
01f3a2d
Move non-legacy conditional reasoning to migration code
frenzibyte Nov 27, 2024
15a4726
Refactor skin deserialisation tests to better support skin migration
frenzibyte Nov 29, 2024
c12cb25
Document & reduce visibility of `GetInstanceType()`
bdach Dec 2, 2024
45101b5
Merge branch 'master' into mania-hp-bar-position
frenzibyte Dec 4, 2024
03f06ae
Mark skin deserialisation test as headless
frenzibyte Dec 4, 2024
2318535
Add test scene for checking all displayed default skin components per…
frenzibyte Dec 4, 2024
a2c57ee
Fix osu! and osu!catch no longer displaying a health display
frenzibyte Dec 4, 2024
c4a411e
Remove redundant array creation expressions
frenzibyte Dec 4, 2024
c6d74aa
Add failing test case
frenzibyte Dec 11, 2024
b08a417
Exclude skins that contain health display on playfield target
frenzibyte Dec 11, 2024
8c238dd
Merge branch 'master' into mania-hp-bar-position
frenzibyte Dec 11, 2024
855fa4e
Merge branch 'master' into mania-hp-bar-position
frenzibyte Dec 24, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public CatchLegacySkinTransformer(ISkin skin)
Children = new Drawable[]
{
new LegacyKeyCounterDisplay(),
new LegacyHealthDisplay(),
}
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
using osu.Framework.Audio.Sample;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Testing;
using osu.Game.Audio;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Mania.Beatmaps;
using osu.Game.Rulesets.Objects.Legacy;
using osu.Game.Rulesets.Scoring;
using osu.Game.Skinning;
using osuTK;

namespace osu.Game.Rulesets.Mania.Skinning.Legacy
{
Expand Down Expand Up @@ -106,6 +108,20 @@ public override Drawable GetDrawableComponent(ISkinComponentLookup lookup)
{
new LegacyManiaComboCounter(),
};

case GlobalSkinnableContainers.Playfield:
return new Container
{
RelativeSizeAxes = Axes.Both,
Child = new LegacyHealthDisplay
{
Rotation = -90f,
Anchor = Anchor.BottomRight,
Origin = Anchor.TopLeft,
X = 1,
Scale = new Vector2(0.7f),
},
};
}

return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public OsuLegacySkinTransformer(ISkin skin)
{
new LegacyDefaultComboCounter(),
new LegacyKeyCounterDisplay(),
new LegacyHealthDisplay(),
}
};
}
Expand Down
187 changes: 0 additions & 187 deletions osu.Game.Tests/Skins/SkinDeserialisationTest.cs

This file was deleted.

Loading
Loading