Merge branch 'master' of git://github.com/ppy/osu into ranks-section

2025-07-03 01:09:57 +09:00 · 2017-08-08 23:13:25 +02:00
parent 1c2329f111 d5c6693990
commit 7d7cfe5d92
180 changed files with 1729 additions and 1185 deletions
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@ -111,12 +111,12 @@ namespace osu.Game.Overlays.Profile
                                                    Alpha = 0,
                                                    AlwaysPresent = true
                                                },
-                                                new TextAwesome
+                                                new SpriteIcon
                                                {
                                                    Icon = FontAwesome.fa_heart,
                                                    Anchor = Anchor.Centre,
                                                    Origin = Anchor.Centre,
-                                                    TextSize = 12
+                                                    Size = new Vector2(12),
                                                }
                                            }
                                        },