RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-26 08:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27787 from peppy/update-hit-error-icons

Browse Source 
Update hit error metre to use new icons
This commit is contained in:
Bartłomiej Dach 2024-04-05 09:58:12 +02:00 committed by GitHub
commit b226a05637
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Graphics/OsuIcon.cs
View File

@ -175,6 +175,8 @@ namespace osu.Game.Graphics
public static IconUsage EditorSelect => get(OsuIconMapping.EditorSelect);
public static IconUsage EditorSound => get(OsuIconMapping.EditorSound);
public static IconUsage EditorWhistle => get(OsuIconMapping.EditorWhistle);
public static IconUsage Tortoise => get(OsuIconMapping.Tortoise);
public static IconUsage Hare => get(OsuIconMapping.Hare);
private static IconUsage get(OsuIconMapping glyph) => new IconUsage((char)glyph, FONT_NAME);
@ -380,6 +382,12 @@ namespace osu.Game.Graphics
[Description(@"Editor/whistle")]
EditorWhistle,
[Description(@"tortoise")]
Tortoise,
[Description(@"hare")]
Hare,
}
public class OsuIconStore : ITextureStore, ITexturedGlyphLookupStore

4
osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
View File

@ -303,13 +303,13 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
labelEarly.Child = new SpriteIcon
{
Size = new Vector2(icon_size),
Icon = FontAwesome.Solid.ShippingFast,
Icon = OsuIcon.Hare
};
labelLate.Child = new SpriteIcon
{
Size = new Vector2(icon_size),
Icon = FontAwesome.Solid.Bicycle,
Icon = OsuIcon.Tortoise
};
break;

2
osu.Game/osu.Game.csproj
View File

@ -36,7 +36,7 @@
</PackageReference>
<PackageReference Include="Realm" Version="11.5.0" />
<PackageReference Include="ppy.osu.Framework" Version="2024.329.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2024.321.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2024.404.0" />
<PackageReference Include="Sentry" Version="3.41.3" />
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
<PackageReference Include="SharpCompress" Version="0.36.0" />