h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-07 07:43:16 +08:00
Code Issues Releases Wiki Activity

Add back TextAwesome and osu!font.

Browse Source
This commit is contained in:
Dean Herbert 2016-09-21 18:33:09 +09:00
parent edcc48c49b
commit 1e06f9113a
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-resources

@ -1 +1 @@
Subproject commit 7ad9b5fcb00d5886792314847f88cee082421a4b
Subproject commit d7f9eb25006b2ad0579ed1ef8983a44b5c0e1de2

10
osu.Game/GameModes/Menu/ButtonSystem.cs
View File

@ -444,13 +444,19 @@ namespace osu.Game.GameModes.Menu
Origin = Anchor.Centre,
Children = new Drawable[]
{
icon = new TextAwesome(symbol, 40, Vector2.Zero),
icon = new TextAwesome
{
Anchor = Anchor.Centre,
TextSize = 40,
Position = new Vector2(0, 0),
Icon = symbol
},
new SpriteText
{
Direction = FlowDirection.HorizontalOnly,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Position = new Vector2(0, 25),
Position = new Vector2(0, 35),
Text = text
}
}

6
osu.Game/Graphics/TextAwesome.cs
View File

@ -28,11 +28,9 @@ namespace osu.Game.Graphics
}
}
internal TextAwesome(FontAwesome icon = FontAwesome.circle, float size = 10, Vector2? position = null)
: base(null)
public TextAwesome()
{
Icon = icon;
Origin = osu.Framework.Graphics.Anchor.Centre;
Origin = Framework.Graphics.Anchor.Centre;
}
}

6
osu.Game/OsuGame.cs
View File

@ -37,7 +37,11 @@ namespace osu.Game
base.Load();
//this completely overrides the framework default. will need to change once we make a proper FontStore.
Fonts = new TextureStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Regular")) { ScaleAdjust = 0.01f };
Fonts = new TextureStore() { ScaleAdjust = 0.01f };
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Regular"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));
API = new APIAccess()
{