h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 02:27:25 +08:00
Code Issues Releases Wiki Activity

Merge pull request #145 from peppy/update-font-awesome

Browse Source 
Update FontAwesome definitions.
This commit is contained in:
Dean Herbert 2016-11-07 19:54:25 +09:00 committed by GitHub
commit dd57f52744
7 changed files with 789 additions and 483 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-resources

@ -1 +1 @@
Subproject commit 5ce263988735b3f15c1195568b65fef40756198c Subproject commit 10dd6161a65972c53e310e26a09c92cffca33a08

2
osu.Game/Beatmaps/Drawable/BeatmapPanel.cs
View File

@ -48,7 +48,7 @@ namespace osu.Game.Beatmaps.Drawable
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Children = new Framework.Graphics.Drawable[] Children = new Framework.Graphics.Drawable[]
{ {
new DifficultyIcon(FontAwesome.dot_circle_o, new Color4(159, 198, 0, 255)) new DifficultyIcon(FontAwesome.fa_dot_circle_o, new Color4(159, 198, 0, 255))
{ {
Scale = new Vector2(1.8f), Scale = new Vector2(1.8f),
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,

4
osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs
View File

@ -68,8 +68,8 @@ namespace osu.Game.Beatmaps.Drawable
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new[] Children = new[]
{ {
new DifficultyIcon(FontAwesome.dot_circle_o, new Color4(159, 198, 0, 255)), new DifficultyIcon(FontAwesome.fa_dot_circle_o, new Color4(159, 198, 0, 255)),
new DifficultyIcon(FontAwesome.dot_circle_o, new Color4(246, 101, 166, 255)), new DifficultyIcon(FontAwesome.fa_dot_circle_o, new Color4(246, 101, 166, 255)),
} }
} }
} }

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

@ -84,7 +84,7 @@ namespace osu.Game.GameModes.Menu
Spacing = new Vector2(-wedge_width, 0), Spacing = new Vector2(-wedge_width, 0),
Children = new[] Children = new[]
{ {
settingsButton = new Button(@"settings", @"options", FontAwesome.gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -wedge_width, Key.O), settingsButton = new Button(@"settings", @"options", FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -wedge_width, Key.O),
backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -wedge_width, Key.Escape), backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -wedge_width, Key.Escape),
iconFacade = new Container //need a container to make the osu! icon flow properly. iconFacade = new Container //need a container to make the osu! icon flow properly.
{ {
@ -105,8 +105,8 @@ namespace osu.Game.GameModes.Menu
buttonFlow.Position = new Vector2(wedge_width * 2 - (button_width + osuLogo.SizeForFlow / 4), 0); buttonFlow.Position = new Vector2(wedge_width * 2 - (button_width + osuLogo.SizeForFlow / 4), 0);
buttonsPlay.Add(new Button(@"solo", @"freeplay", FontAwesome.user, new Color4(102, 68, 204, 255), OnSolo, wedge_width, Key.P)); buttonsPlay.Add(new Button(@"solo", @"freeplay", FontAwesome.fa_user, new Color4(102, 68, 204, 255), OnSolo, wedge_width, Key.P));
buttonsPlay.Add(new Button(@"multi", @"multiplayer", FontAwesome.users, new Color4(94, 63, 186, 255), OnMulti, 0, Key.M)); buttonsPlay.Add(new Button(@"multi", @"multiplayer", FontAwesome.fa_users, new Color4(94, 63, 186, 255), OnMulti, 0, Key.M));
buttonsPlay.Add(new Button(@"chart", @"charts", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), OnChart)); buttonsPlay.Add(new Button(@"chart", @"charts", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), OnChart));
buttonsTopLevel.Add(new Button(@"play", @"play", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, wedge_width, Key.P)); buttonsTopLevel.Add(new Button(@"play", @"play", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, wedge_width, Key.P));

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

File diff suppressed because it is too large Load Diff

2
osu.Game/Graphics/UserInterface/StarCounter.cs
View File

@ -120,7 +120,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
TextAwesome star = new TextAwesome TextAwesome star = new TextAwesome
{ {
Icon = FontAwesome.star, Icon = FontAwesome.fa_star,
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.Centre, Origin = Anchor.Centre,
TextSize = StarSize, TextSize = StarSize,

10
osu.Game/Overlays/Toolbar.cs
View File

@ -58,14 +58,14 @@ namespace osu.Game.Overlays
{ {
new ToolbarButton new ToolbarButton
{ {
Icon = FontAwesome.gear, Icon = FontAwesome.fa_gear,
TooltipMain = "Settings", TooltipMain = "Settings",
TooltipSub = "Change your settings", TooltipSub = "Change your settings",
Action = () => OnSettings?.Invoke() Action = () => OnSettings?.Invoke()
}, },
new ToolbarButton new ToolbarButton
{ {
Icon = FontAwesome.home, Icon = FontAwesome.fa_home,
TooltipMain = "Home", TooltipMain = "Home",
TooltipSub = "Return to the main menu", TooltipSub = "Return to the main menu",
Action = () => OnHome?.Invoke() Action = () => OnHome?.Invoke()
@ -87,15 +87,15 @@ namespace osu.Game.Overlays
{ {
new ToolbarButton new ToolbarButton
{ {
Icon = FontAwesome.search Icon = FontAwesome.fa_search
}, },
userButton = new ToolbarButton userButton = new ToolbarButton
{ {
Icon = FontAwesome.user, Icon = FontAwesome.fa_user,
}, },
new ToolbarButton new ToolbarButton
{ {
Icon = FontAwesome.bars Icon = FontAwesome.fa_bars
}, },
} }
} }