From c4132339a66211ac073f25f400541702146a80ae Mon Sep 17 00:00:00 2001 From: Maciej <3stylemylife@gmail.com> Date: Sun, 6 Nov 2016 04:12:35 +0100 Subject: [PATCH 01/11] Working beatmap background scaling fix Add a check for the working beatmap background width and assign a proper scaling value to cover the whole box --- osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs b/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs index 7c6fd5a963..12f5e63c1d 100644 --- a/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs +++ b/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs @@ -40,7 +40,7 @@ namespace osu.Game.Beatmaps.Drawable Texture = working.Background, Anchor = Anchor.Centre, Origin = Anchor.Centre, - Scale = new Vector2(0.5f), + Scale = new Vector2((working.Background.Width >= 1366) ? 0.5f : 0.6f), Colour = new Color4(200, 200, 200, 255), }, new FlowContainer From bcc1d7c669118c319bdd1121614a46ff4409a18d Mon Sep 17 00:00:00 2001 From: Maciej <3stylemylife@gmail.com> Date: Sun, 6 Nov 2016 04:37:41 +0100 Subject: [PATCH 02/11] Background scaling different approach --- osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs b/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs index 12f5e63c1d..c2b5c47613 100644 --- a/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs +++ b/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs @@ -40,7 +40,7 @@ namespace osu.Game.Beatmaps.Drawable Texture = working.Background, Anchor = Anchor.Centre, Origin = Anchor.Centre, - Scale = new Vector2((working.Background.Width >= 1366) ? 0.5f : 0.6f), + Scale = new Vector2(1366 / working.Background.Width * 0.6f), Colour = new Color4(200, 200, 200, 255), }, new FlowContainer From a6c0fd29f2fe7b111eeee7747fcdb17c94142448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 6 Nov 2016 08:25:21 +0100 Subject: [PATCH 03/11] Make use of new timing system in Drawables and Transforms. --- osu-framework | 2 +- osu.Game.Tests/osu.Game.Tests.csproj | 6 ++++-- osu.Game/Beatmaps/Objects/DrawableHitObject.cs | 2 +- osu.Game/GameModes/Menu/Button.cs | 2 +- osu.Game/GameModes/Play/ComboCounter.cs | 6 +++--- osu.Game/GameModes/Play/ComboResultCounter.cs | 2 +- osu.Game/Graphics/UserInterface/RollingCounter.cs | 4 ++-- osu.Game/Graphics/UserInterface/ScoreCounter.cs | 2 +- osu.Game/Graphics/UserInterface/StarCounter.cs | 6 +++--- .../Graphics/UserInterface/Volume/VolumeControl.cs | 13 ++----------- .../UserInterface/Volume/VolumeControlReceptor.cs | 8 +------- .../Graphics/UserInterface/Volume/VolumeMeter.cs | 10 ++-------- 12 files changed, 22 insertions(+), 41 deletions(-) diff --git a/osu-framework b/osu-framework index ed33cc4899..beddb830a2 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit ed33cc48996e9b57093c4d057aa0560319495dee +Subproject commit beddb830a23b40fe970892e4c84339871e202034 diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj index af6fa91661..d4a1976f17 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -75,7 +75,9 @@ osu.Game.Resources - + + + @@ -86,4 +88,4 @@ - + \ No newline at end of file diff --git a/osu.Game/Beatmaps/Objects/DrawableHitObject.cs b/osu.Game/Beatmaps/Objects/DrawableHitObject.cs index d6b459b0d1..eb5e5bc094 100644 --- a/osu.Game/Beatmaps/Objects/DrawableHitObject.cs +++ b/osu.Game/Beatmaps/Objects/DrawableHitObject.cs @@ -49,7 +49,7 @@ namespace osu.Game.Beatmaps.Objects { base.Update(); - if (Time >= HitObject.EndTime && !counted) + if (Time.Current >= HitObject.EndTime && !counted) { counted = true; if (state == ArmedState.Armed) diff --git a/osu.Game/GameModes/Menu/Button.cs b/osu.Game/GameModes/Menu/Button.cs index 779501a448..012c000f9c 100644 --- a/osu.Game/GameModes/Menu/Button.cs +++ b/osu.Game/GameModes/Menu/Button.cs @@ -112,7 +112,7 @@ namespace osu.Game.GameModes.Menu icon.ScaleTo(1, 500, EasingTypes.OutElasticHalf); double offset = 0; //(1 - Game.Audio.SyncBeatProgress) * duration; - double startTime = Time + offset; + double startTime = Time.Current + offset; icon.RotateTo(10, offset, EasingTypes.InOutSine); icon.ScaleTo(new Vector2(1, 0.9f), offset, EasingTypes.Out); diff --git a/osu.Game/GameModes/Play/ComboCounter.cs b/osu.Game/GameModes/Play/ComboCounter.cs index 8d5f55f775..06c45d7386 100644 --- a/osu.Game/GameModes/Play/ComboCounter.cs +++ b/osu.Game/GameModes/Play/ComboCounter.cs @@ -238,8 +238,8 @@ namespace osu.Game.GameModes.Play return; } - transform.StartTime = Time; - transform.EndTime = Time + getProportionalDuration(currentValue, newValue); + transform.StartTime = Time.Current; + transform.EndTime = Time.Current + getProportionalDuration(currentValue, newValue); transform.StartValue = currentValue; transform.EndValue = newValue; transform.Easing = RollingEasing; @@ -253,7 +253,7 @@ namespace osu.Game.GameModes.Play { get { - double time = CurrentTime ?? 0; + double time = Time?.Current ?? 0; if (time < StartTime) return StartValue; if (time >= EndTime) return EndValue; diff --git a/osu.Game/GameModes/Play/ComboResultCounter.cs b/osu.Game/GameModes/Play/ComboResultCounter.cs index fd96906d18..9607c6df14 100644 --- a/osu.Game/GameModes/Play/ComboResultCounter.cs +++ b/osu.Game/GameModes/Play/ComboResultCounter.cs @@ -45,7 +45,7 @@ namespace osu.Game.GameModes.Play { get { - double time = CurrentTime ?? 0; + double time = Time?.Current ?? 0; if (time < StartTime) return StartValue; if (time >= EndTime) return EndValue; diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs index 80f1b345b6..13737ded34 100644 --- a/osu.Game/Graphics/UserInterface/RollingCounter.cs +++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs @@ -225,8 +225,8 @@ namespace osu.Game.Graphics.UserInterface ? GetProportionalDuration(currentValue, newValue) : RollingDuration; - transform.StartTime = Time; - transform.EndTime = Time + rollingTotalDuration; + transform.StartTime = Time.Current; + transform.EndTime = Time.Current + rollingTotalDuration; transform.StartValue = currentValue; transform.EndValue = newValue; transform.Easing = RollingEasing; diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs index 48f4da1fcf..56be64b92e 100644 --- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs +++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs @@ -60,7 +60,7 @@ namespace osu.Game.Graphics.UserInterface { get { - double time = CurrentTime ?? 0; + double time = Time?.Current ?? 0; if (time < StartTime) return StartValue; if (time >= EndTime) return EndValue; diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs index cff8fc65fe..e56e699be9 100644 --- a/osu.Game/Graphics/UserInterface/StarCounter.cs +++ b/osu.Game/Graphics/UserInterface/StarCounter.cs @@ -50,7 +50,7 @@ namespace osu.Game.Graphics.UserInterface { get { - double elapsedTime = Time - transformStartTime; + double elapsedTime = Time.Current - transformStartTime; double expectedElapsedTime = Math.Abs(prevCount - count) * animationDelay; if (elapsedTime >= expectedElapsedTime) return count; @@ -149,7 +149,7 @@ namespace osu.Game.Graphics.UserInterface public void StopAnimation() { prevCount = count; - transformStartTime = Time; + transformStartTime = Time.Current; for (int i = 0; i < MaxStars; i++) transformStarQuick(i, count); @@ -188,7 +188,7 @@ namespace osu.Game.Graphics.UserInterface transformStar(i, newValue); stars[i].DelayReset(); } - transformStartTime = Time; + transformStartTime = Time.Current; } } } diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs index 4d86483262..0acd330b0e 100644 --- a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs +++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs @@ -67,21 +67,12 @@ namespace osu.Game.Graphics.UserInterface.Volume base.Dispose(isDisposing); } - protected override bool OnWheelDown(InputState state) + protected override bool OnWheel(InputState state) { if (!IsVisible) return false; - volumeMeterMaster.TriggerWheelDown(state); - return true; - } - - protected override bool OnWheelUp(InputState state) - { - if (!IsVisible) - return false; - - volumeMeterMaster.TriggerWheelUp(state); + volumeMeterMaster.TriggerWheel(state); return true; } diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs index 1601c2a883..1c98aaa61d 100644 --- a/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs +++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs @@ -14,13 +14,7 @@ namespace osu.Game.Graphics.UserInterface.Volume { public Action ActivateRequested; - protected override bool OnWheelDown(InputState state) - { - ActivateRequested?.Invoke(); - return true; - } - - protected override bool OnWheelUp(InputState state) + protected override bool OnWheel(InputState state) { ActivateRequested?.Invoke(); return true; diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs index 64cb59175c..c72ddeede3 100644 --- a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs +++ b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs @@ -73,15 +73,9 @@ namespace osu.Game.Graphics.UserInterface.Volume } } - protected override bool OnWheelUp(InputState state) + protected override bool OnWheel(InputState state) { - Volume += 0.05f; - return true; - } - - protected override bool OnWheelDown(InputState state) - { - Volume -= 0.05f; + Volume += 0.05f * state.Mouse.WheelDiff; return true; } From 8894e5f73a407ef990434c7a95fc78abeda7d717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 6 Nov 2016 08:54:36 +0100 Subject: [PATCH 04/11] Fade the options overlay to prevent unnecessary updates to its content. --- osu-framework | 2 +- osu.Game/Overlays/OptionsOverlay.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index beddb830a2..4c8683bcfc 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit beddb830a23b40fe970892e4c84339871e202034 +Subproject commit 4c8683bcfc024d7c341f3e7bb20661d241f50d0c diff --git a/osu.Game/Overlays/OptionsOverlay.cs b/osu.Game/Overlays/OptionsOverlay.cs index cdf7628953..3774b71254 100644 --- a/osu.Game/Overlays/OptionsOverlay.cs +++ b/osu.Game/Overlays/OptionsOverlay.cs @@ -101,11 +101,13 @@ namespace osu.Game.Overlays protected override void PopIn() { MoveToX(0, 300, EasingTypes.Out); + FadeTo(1, 300); } protected override void PopOut() { MoveToX(-width, 300, EasingTypes.Out); + FadeTo(0, 300); } } } From 5f2bf165a2be0d29dbe58951337af03930a16b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 6 Nov 2016 10:06:09 +0100 Subject: [PATCH 05/11] Remove now obsolete clock usages. --- osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs | 4 ++-- osu.Game/GameModes/Play/ComboCounter.cs | 3 --- osu.Game/Graphics/UserInterface/RollingCounter.cs | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs b/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs index 2b52657f1e..d00803e42b 100644 --- a/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs +++ b/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs @@ -265,7 +265,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable base.Update(); foreach (Framework.Graphics.Drawable d in Children) - d.Position -= new Vector2(0, (float)(d.Scale.X * (Clock.ElapsedFrameTime / 20))); + d.Position -= new Vector2(0, (float)(d.Scale.X * (Time.Elapsed / 20))); } } } @@ -342,7 +342,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable base.Update(); foreach (Framework.Graphics.Drawable d in Children) - d.Position -= new Vector2(0, (float)(d.Scale.X * (Clock.ElapsedFrameTime / 20))); + d.Position -= new Vector2(0, (float)(d.Scale.X * (Time.Elapsed / 20))); } } } diff --git a/osu.Game/GameModes/Play/ComboCounter.cs b/osu.Game/GameModes/Play/ComboCounter.cs index 06c45d7386..a9db04347d 100644 --- a/osu.Game/GameModes/Play/ComboCounter.cs +++ b/osu.Game/GameModes/Play/ComboCounter.cs @@ -229,9 +229,6 @@ namespace osu.Game.GameModes.Play { Flush(false, typeof(TransformComboRoll)); - if (Clock == null) - return; - if (RollingDuration < 1) { DisplayedCount = Count; diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs index 13737ded34..af77093b34 100644 --- a/osu.Game/Graphics/UserInterface/RollingCounter.cs +++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs @@ -211,9 +211,6 @@ namespace osu.Game.Graphics.UserInterface Flush(false, type); - if (Clock == null) - return; - if (RollingDuration < 1) { DisplayedCount = Count; From 103176826f6ae80284e78b88e07826d1d565d92f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 6 Nov 2016 11:13:52 +0100 Subject: [PATCH 06/11] Ensure transformations are never used prior to being added to the Drawable tree. --- osu-framework | 2 +- osu.Game/Beatmaps/Objects/DrawableHitObject.cs | 2 +- osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs | 2 +- osu.Game/GameModes/Play/ComboCounter.cs | 7 ++++++- osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs | 4 ++-- osu.Game/Graphics/UserInterface/RollingCounter.cs | 9 +++++++-- osu.Game/Graphics/UserInterface/StarCounter.cs | 8 +++++--- osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs | 4 ++-- 8 files changed, 25 insertions(+), 13 deletions(-) diff --git a/osu-framework b/osu-framework index 4c8683bcfc..cbcf8a77af 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 4c8683bcfc024d7c341f3e7bb20661d241f50d0c +Subproject commit cbcf8a77afb8fb0fa759c5ee2a798bface6b80b4 diff --git a/osu.Game/Beatmaps/Objects/DrawableHitObject.cs b/osu.Game/Beatmaps/Objects/DrawableHitObject.cs index 037cd92fb6..380e527de4 100644 --- a/osu.Game/Beatmaps/Objects/DrawableHitObject.cs +++ b/osu.Game/Beatmaps/Objects/DrawableHitObject.cs @@ -52,7 +52,7 @@ namespace osu.Game.Beatmaps.Objects if (AllowHit?.Invoke(this) == false) return false; - HitTime = Time; + HitTime = Time.Current; State = ArmedState.Armed; return true; diff --git a/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs b/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs index 890b576d83..cf150e7e04 100644 --- a/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs +++ b/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs @@ -96,7 +96,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable approachCircle.Transforms.Add(new TransformScale { StartTime = t - 1000, EndTime = t, StartValue = new Vector2(2f), EndValue = new Vector2(0.6f) }); //set transform delay to t==hitTime - Delay(t - Time, true); + Delay(t - Time.Current, true); approachCircle.FadeOut(); glow.FadeOut(400); diff --git a/osu.Game/GameModes/Play/ComboCounter.cs b/osu.Game/GameModes/Play/ComboCounter.cs index a9db04347d..ec0d1b45d5 100644 --- a/osu.Game/GameModes/Play/ComboCounter.cs +++ b/osu.Game/GameModes/Play/ComboCounter.cs @@ -205,8 +205,13 @@ namespace osu.Game.GameModes.Play private void updateCount(ulong value, bool rolling = false) { - ulong prevCount = count; count = value; + + if (!IsLoaded) + return; + + ulong prevCount = count; + if (!rolling) { Flush(false, typeof(TransformComboRoll)); diff --git a/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs b/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs index 8d1c6d5b57..0a087225fc 100644 --- a/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs +++ b/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs @@ -31,9 +31,9 @@ namespace osu.Game.GameModes.Play.Mania protected override float PopOutInitialAlpha => 1.0f; protected override double PopOutDuration => 300; - protected override void Load(BaseGame game) + protected override void LoadComplete() { - base.Load(game); + base.LoadComplete(); PopOutSpriteText.Anchor = Anchor.BottomCentre; PopOutSpriteText.Origin = Anchor.Centre; diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs index af77093b34..87403c232a 100644 --- a/osu.Game/Graphics/UserInterface/RollingCounter.cs +++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs @@ -123,8 +123,6 @@ namespace osu.Game.Graphics.UserInterface { base.Load(game); - Flush(false, TransformType); - DisplayedCount = Count; DisplayedCountSpriteText.Text = FormatCount(count); @@ -132,6 +130,13 @@ namespace osu.Game.Graphics.UserInterface DisplayedCountSpriteText.Origin = this.Origin; } + protected override void LoadComplete() + { + base.LoadComplete(); + + Flush(false, TransformType); + } + /// /// Sets count value, bypassing rollover animation. /// diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs index e56e699be9..47385861ab 100644 --- a/osu.Game/Graphics/UserInterface/StarCounter.cs +++ b/osu.Game/Graphics/UserInterface/StarCounter.cs @@ -70,14 +70,16 @@ namespace osu.Game.Graphics.UserInterface { return count; } + set { - prevCount = VisibleValue; - count = value; if (IsLoaded) { - transformCount(prevCount, count); + prevCount = VisibleValue; + transformCount(prevCount, value); } + + count = value; } } diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs index c72ddeede3..bcd1d9f8db 100644 --- a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs +++ b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs @@ -57,9 +57,9 @@ namespace osu.Game.Graphics.UserInterface.Volume }; } - protected override void Load(BaseGame game) + protected override void LoadComplete() { - base.Load(game); + base.LoadComplete(); updateFill(); } From 108d32b6d86e509e8fa147076eb63eb30cbb368f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 6 Nov 2016 18:50:21 +0100 Subject: [PATCH 07/11] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index cbcf8a77af..4631a91f00 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit cbcf8a77afb8fb0fa759c5ee2a798bface6b80b4 +Subproject commit 4631a91f00e8be3eddf13736b5ecd8d25d6d3918 From 90c889a7ce3ef41202e82fa152735c5f308e8343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 6 Nov 2016 19:34:44 +0100 Subject: [PATCH 08/11] Smoothen wedged buttons in main menu and the wedges on song select background. --- osu-framework | 2 +- osu.Game/GameModes/Menu/Button.cs | 1 + osu.Game/GameModes/Play/PlaySongSelect.cs | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 4631a91f00..9901eb4480 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 4631a91f00e8be3eddf13736b5ecd8d25d6d3918 +Subproject commit 9901eb4480ecc57364987166221a61567b9ef8eb diff --git a/osu.Game/GameModes/Menu/Button.cs b/osu.Game/GameModes/Menu/Button.cs index 012c000f9c..07e46ab0f9 100644 --- a/osu.Game/GameModes/Menu/Button.cs +++ b/osu.Game/GameModes/Menu/Button.cs @@ -65,6 +65,7 @@ namespace osu.Game.GameModes.Menu Scale = new Vector2(0, 1), Size = boxSize, Shear = new Vector2(ButtonSystem.wedge_width / boxSize.Y, 0), + EdgeSmoothness = new Vector2(2, 0), }, iconText = new Container { diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs index a2855d55b5..a05e02ae3b 100644 --- a/osu.Game/GameModes/Play/PlaySongSelect.cs +++ b/osu.Game/GameModes/Play/PlaySongSelect.cs @@ -59,6 +59,7 @@ namespace osu.Game.GameModes.Play Size = new Vector2(1, 0.5f), Colour = new Color4(0, 0, 0, 0.5f), Shear = new Vector2(0.15f, 0), + EdgeSmoothness = new Vector2(2, 0), }, new Box { @@ -68,6 +69,7 @@ namespace osu.Game.GameModes.Play Position = new Vector2(0, 1), Colour = new Color4(0, 0, 0, 0.5f), Shear = new Vector2(-0.15f, 0), + EdgeSmoothness = new Vector2(2, 0), }, } }, From fa8d668cb69860e88c8b2b88f1f7316dfb25f659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 6 Nov 2016 19:59:30 +0100 Subject: [PATCH 09/11] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 9901eb4480..9e9145afcd 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 9901eb4480ecc57364987166221a61567b9ef8eb +Subproject commit 9e9145afcd1d37c56f89a6ae6e7b59e43d51037e From f14a35d480988344add4d070611ead46ae42a589 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 7 Nov 2016 17:58:32 +0900 Subject: [PATCH 10/11] Update FontAwesome definitions. --- osu.Game/Beatmaps/Drawable/BeatmapPanel.cs | 2 +- .../Beatmaps/Drawable/BeatmapSetHeader.cs | 4 +- osu.Game/GameModes/Menu/ButtonSystem.cs | 6 +- osu.Game/Graphics/TextAwesome.cs | 1246 ++++++++++------- .../Graphics/UserInterface/StarCounter.cs | 2 +- osu.Game/Overlays/Toolbar.cs | 10 +- 6 files changed, 788 insertions(+), 482 deletions(-) diff --git a/osu.Game/Beatmaps/Drawable/BeatmapPanel.cs b/osu.Game/Beatmaps/Drawable/BeatmapPanel.cs index 35a7f95037..7641afd25d 100644 --- a/osu.Game/Beatmaps/Drawable/BeatmapPanel.cs +++ b/osu.Game/Beatmaps/Drawable/BeatmapPanel.cs @@ -48,7 +48,7 @@ namespace osu.Game.Beatmaps.Drawable Origin = Anchor.CentreLeft, 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), Anchor = Anchor.CentreLeft, diff --git a/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs b/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs index c2b5c47613..f8a38931e2 100644 --- a/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs +++ b/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs @@ -68,8 +68,8 @@ namespace osu.Game.Beatmaps.Drawable AutoSizeAxes = Axes.Both, Children = new[] { - new DifficultyIcon(FontAwesome.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(159, 198, 0, 255)), + new DifficultyIcon(FontAwesome.fa_dot_circle_o, new Color4(246, 101, 166, 255)), } } } diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs index 10ccf864e6..4053935d0f 100644 --- a/osu.Game/GameModes/Menu/ButtonSystem.cs +++ b/osu.Game/GameModes/Menu/ButtonSystem.cs @@ -84,7 +84,7 @@ namespace osu.Game.GameModes.Menu Spacing = new Vector2(-wedge_width, 0), 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), 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); - buttonsPlay.Add(new Button(@"solo", @"freeplay", FontAwesome.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(@"solo", @"freeplay", FontAwesome.fa_user, new Color4(102, 68, 204, 255), OnSolo, wedge_width, Key.P)); + 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)); buttonsTopLevel.Add(new Button(@"play", @"play", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, wedge_width, Key.P)); diff --git a/osu.Game/Graphics/TextAwesome.cs b/osu.Game/Graphics/TextAwesome.cs index 4d434b701d..2faf5b28ad 100644 --- a/osu.Game/Graphics/TextAwesome.cs +++ b/osu.Game/Graphics/TextAwesome.cs @@ -36,486 +36,792 @@ namespace osu.Game.Graphics public enum FontAwesome { - glass = 0xf000, - music = 0xf001, - search = 0xf002, - envelope_o = 0xf003, - heart = 0xf004, - star = 0xf005, - star_o = 0xf006, - user = 0xf007, - film = 0xf008, - th_large = 0xf009, - th = 0xf00a, - th_list = 0xf00b, - check = 0xf00c, - times = 0xf00d, - search_plus = 0xf00e, - search_minus = 0xf010, - power_off = 0xf011, - signal = 0xf012, - gear = 0xf013, - trash_o = 0xf014, - home = 0xf015, - file_o = 0xf016, - clock_o = 0xf017, - road = 0xf018, - download = 0xf019, - arrow_circle_o_down = 0xf01a, - arrow_circle_o_up = 0xf01b, - inbox = 0xf01c, - play_circle_o = 0xf01d, - repeat = 0xf01e, - refresh = 0xf021, - list_alt = 0xf022, - locked = 0xf023, - flag = 0xf024, - headphones = 0xf025, - volume_off = 0xf026, - volume_down = 0xf027, - volume_up = 0xf028, - qrcode = 0xf029, - barcode = 0xf02a, - tag = 0xf02b, - tags = 0xf02c, - book = 0xf02d, - bookmark = 0xf02e, - print = 0xf02f, - camera = 0xf030, - font = 0xf031, - bold = 0xf032, - italic = 0xf033, - text_height = 0xf034, - text_width = 0xf035, - align_left = 0xf036, - align_center = 0xf037, - align_right = 0xf038, - align_justify = 0xf039, - list = 0xf03a, - outdent = 0xf03b, - indent = 0xf03c, - video_camera = 0xf03d, - picture_o = 0xf03e, - pencil = 0xf040, - map_marker = 0xf041, - adjust = 0xf042, - tint = 0xf043, - edit = 0xf044, - share_square_o = 0xf045, - check_square_o = 0xf046, - arrows = 0xf047, - step_backward = 0xf048, - fast_backward = 0xf049, - backward = 0xf04a, - play = 0xf04b, - pause = 0xf04c, - stop = 0xf04d, - forward = 0xf04e, - fast_forward = 0xf050, - step_forward = 0xf051, - eject = 0xf052, - chevron_left = 0xf053, - chevron_right = 0xf054, - plus_circle = 0xf055, - minus_circle = 0xf056, - times_circle = 0xf057, - check_circle = 0xf058, - question_circle = 0xf059, - info_circle = 0xf05a, - crosshairs = 0xf05b, - times_circle_o = 0xf05c, - check_circle_o = 0xf05d, - ban = 0xf05e, - arrow_left = 0xf060, - arrow_right = 0xf061, - arrow_up = 0xf062, - arrow_down = 0xf063, - share = 0xf064, - expand = 0xf065, - compress = 0xf066, - plus = 0xf067, - minus = 0xf068, - asterisk = 0xf069, - exclamation_circle = 0xf06a, - gift = 0xf06b, - leaf = 0xf06c, - fire = 0xf06d, - eye = 0xf06e, - eye_slash = 0xf070, - warning = 0xf071, - plane = 0xf072, - calendar = 0xf073, - random = 0xf074, - comment = 0xf075, - magnet = 0xf076, - chevron_up = 0xf077, - chevron_down = 0xf078, - retweet = 0xf079, - shopping_cart = 0xf07a, - folder = 0xf07b, - folder_open = 0xf07c, - arrows_v = 0xf07d, - arrows_h = 0xf07e, - bar_chart_o = 0xf080, - twitter_square = 0xf081, - facebook_square = 0xf082, - camera_retro = 0xf083, - key = 0xf084, - gears = 0xf085, - comments = 0xf086, - thumbs_o_up = 0xf087, - thumbs_o_down = 0xf088, - star_half = 0xf089, - heart_o = 0xf08a, - sign_out = 0xf08b, - linkedin_square = 0xf08c, - thumb_tack = 0xf08d, - external_link = 0xf08e, - sign_in = 0xf090, - trophy = 0xf091, - github_square = 0xf092, - upload = 0xf093, - lemon_o = 0xf094, - phone = 0xf095, - square_o = 0xf096, - bookmark_o = 0xf097, - phone_square = 0xf098, - twitter = 0xf099, - facebook = 0xf09a, - github = 0xf09b, - unlock = 0xf09c, - credit_card = 0xf09d, - rss = 0xf09e, - hdd_o = 0xf0a0, - bullhorn = 0xf0a1, - bell = 0xf0f3, - certificate = 0xf0a3, - hand_o_right = 0xf0a4, - hand_o_left = 0xf0a5, - hand_o_up = 0xf0a6, - hand_o_down = 0xf0a7, - arrow_circle_left = 0xf0a8, - arrow_circle_right = 0xf0a9, - arrow_circle_up = 0xf0aa, - arrow_circle_down = 0xf0ab, - globe = 0xf0ac, - wrench = 0xf0ad, - tasks = 0xf0ae, - filter = 0xf0b0, - briefcase = 0xf0b1, - arrows_alt = 0xf0b2, - users = 0xf0c0, - link = 0xf0c1, - cloud = 0xf0c2, - flask = 0xf0c3, - cut = 0xf0c4, - copy = 0xf0c5, - paperclip = 0xf0c6, - save_o = 0xf0c7, - square = 0xf0c8, - bars = 0xf0c9, - list_ul = 0xf0ca, - list_ol = 0xf0cb, - strikethrough = 0xf0cc, - underline = 0xf0cd, - table = 0xf0ce, - magic = 0xf0d0, - truck = 0xf0d1, - pinterest = 0xf0d2, - pinterest_square = 0xf0d3, - google_plus_square = 0xf0d4, - google_plus = 0xf0d5, - money = 0xf0d6, - caret_down = 0xf0d7, - caret_up = 0xf0d8, - caret_left = 0xf0d9, - caret_right = 0xf0da, - columns = 0xf0db, - sort = 0xf0dc, - sort_asc = 0xf0dd, - sort_desc = 0xf0de, - envelope = 0xf0e0, - linkedin = 0xf0e1, - undo = 0xf0e2, - legal = 0xf0e3, - dashboard = 0xf0e4, - comment_o = 0xf0e5, - comments_o = 0xf0e6, - bolt = 0xf0e7, - sitemap = 0xf0e8, - umbrella = 0xf0e9, - paste = 0xf0ea, - lightbulb_o = 0xf0eb, - exchange = 0xf0ec, - cloud_download = 0xf0ed, - cloud_upload = 0xf0ee, - user_md = 0xf0f0, - stethoscope = 0xf0f1, - suitcase = 0xf0f2, - bell_o = 0xf0a2, - coffee = 0xf0f4, - cutlery = 0xf0f5, - file_text_o = 0xf0f6, - building_o = 0xf0f7, - hospital_o = 0xf0f8, - ambulance = 0xf0f9, - medkit = 0xf0fa, - fighter_jet = 0xf0fb, - beer = 0xf0fc, - h_square = 0xf0fd, - plus_square = 0xf0fe, - angle_double_left = 0xf100, - angle_double_right = 0xf101, - angle_double_up = 0xf102, - angle_double_down = 0xf103, - angle_left = 0xf104, - angle_right = 0xf105, - angle_up = 0xf106, - angle_down = 0xf107, - desktop = 0xf108, - laptop = 0xf109, - tablet = 0xf10a, - mobile = 0xf10b, - circle_o = 0xf10c, - quote_left = 0xf10d, - quote_right = 0xf10e, - spinner = 0xf110, - circle = 0xf111, - reply = 0xf112, - github_alt = 0xf113, - folder_o = 0xf114, - folder_open_o = 0xf115, - smile_o = 0xf118, - frown_o = 0xf119, - meh_o = 0xf11a, - gamepad = 0xf11b, - keyboard_o = 0xf11c, - flag_o = 0xf11d, - flag_checkered = 0xf11e, - terminal = 0xf120, - code = 0xf121, - reply_all = 0xf122, - mail_reply_all = 0xf122, - star_half_o = 0xf123, - location_arrow = 0xf124, - crop = 0xf125, - code_fork = 0xf126, - chain_broken = 0xf127, - question = 0xf128, - info = 0xf129, - exclamation = 0xf12a, - superscript = 0xf12b, - subscript = 0xf12c, - eraser = 0xf12d, - puzzle_piece = 0xf12e, - microphone = 0xf130, - microphone_slash = 0xf131, - shield = 0xf132, - calendar_o = 0xf133, - fire_extinguisher = 0xf134, - rocket = 0xf135, - maxcdn = 0xf136, - chevron_circle_left = 0xf137, - chevron_circle_right = 0xf138, - chevron_circle_up = 0xf139, - chevron_circle_down = 0xf13a, - html5 = 0xf13b, - css3 = 0xf13c, - anchor = 0xf13d, - unlock_alt = 0xf13e, - bullseye = 0xf140, - ellipsis_h = 0xf141, - ellipsis_v = 0xf142, - rss_square = 0xf143, - play_circle = 0xf144, - ticket = 0xf145, - minus_square = 0xf146, - minus_square_o = 0xf147, - level_up = 0xf148, - level_down = 0xf149, - check_square = 0xf14a, - pencil_square = 0xf14b, - external_link_square = 0xf14c, - share_square = 0xf14d, - compass = 0xf14e, - caret_square_o_down = 0xf150, - caret_square_o_up = 0xf151, - caret_square_o_right = 0xf152, - eur = 0xf153, - gbp = 0xf154, - usd = 0xf155, - inr = 0xf156, - jpy = 0xf157, - rub = 0xf158, - krw = 0xf159, - btc = 0xf15a, - file = 0xf15b, - file_text = 0xf15c, - sort_alpha_asc = 0xf15d, - sort_alpha_desc = 0xf15e, - sort_amount_asc = 0xf160, - sort_amount_desc = 0xf161, - sort_numeric_asc = 0xf162, - sort_numeric_desc = 0xf163, - thumbs_up = 0xf164, - thumbs_down = 0xf165, - youtube_square = 0xf166, - youtube = 0xf167, - xing = 0xf168, - xing_square = 0xf169, - youtube_play = 0xf16a, - dropbox = 0xf16b, - stack_overflow = 0xf16c, - instagram = 0xf16d, - flickr = 0xf16e, - adn = 0xf170, - bitbucket = 0xf171, - bitbucket_square = 0xf172, - tumblr = 0xf173, - tumblr_square = 0xf174, - long_arrow_down = 0xf175, - long_arrow_up = 0xf176, - long_arrow_left = 0xf177, - long_arrow_right = 0xf178, - apple = 0xf179, - windows = 0xf17a, - android = 0xf17b, - linux = 0xf17c, - dribbble = 0xf17d, - skype = 0xf17e, - foursquare = 0xf180, - trello = 0xf181, - female = 0xf182, - male = 0xf183, - gittip = 0xf184, - sun_o = 0xf185, - moon_o = 0xf186, - archive = 0xf187, - bug = 0xf188, - vk = 0xf189, - weibo = 0xf18a, - renren = 0xf18b, - pagelines = 0xf18c, - stack_exchange = 0xf18d, - arrow_circle_o_right = 0xf18e, - arrow_circle_o_left = 0xf190, - caret_square_o_left = 0xf191, - dot_circle_o = 0xf192, - wheelchair = 0xf193, - vimeo_square = 0xf194, - tryy = 0xf195, - plus_square_o = 0xf196, - fa_space_shuttle = 0xf197, - fa_slack = 0xf198, - fa_envelope_square = 0xf199, - fa_wordpress = 0xf19a, - fa_openid = 0xf19b, + fa_500px = 0xf26e, + fa_address_book = 0xf2b9, + fa_address_book_o = 0xf2ba, + fa_address_card = 0xf2bb, + fa_address_card_o = 0xf2bc, + fa_adjust = 0xf042, + fa_adn = 0xf170, + fa_align_center = 0xf037, + fa_align_justify = 0xf039, + fa_align_left = 0xf036, + fa_align_right = 0xf038, + fa_amazon = 0xf270, + fa_ambulance = 0xf0f9, + fa_american_sign_language_interpreting = 0xf2a3, + fa_anchor = 0xf13d, + fa_android = 0xf17b, + fa_angellist = 0xf209, + fa_angle_double_down = 0xf103, + fa_angle_double_left = 0xf100, + fa_angle_double_right = 0xf101, + fa_angle_double_up = 0xf102, + fa_angle_down = 0xf107, + fa_angle_left = 0xf104, + fa_angle_right = 0xf105, + fa_angle_up = 0xf106, + fa_apple = 0xf179, + fa_archive = 0xf187, + fa_area_chart = 0xf1fe, + fa_arrow_circle_down = 0xf0ab, + fa_arrow_circle_left = 0xf0a8, + fa_arrow_circle_o_down = 0xf01a, + fa_arrow_circle_o_left = 0xf190, + fa_arrow_circle_o_right = 0xf18e, + fa_arrow_circle_o_up = 0xf01b, + fa_arrow_circle_right = 0xf0a9, + fa_arrow_circle_up = 0xf0aa, + fa_arrow_down = 0xf063, + fa_arrow_left = 0xf060, + fa_arrow_right = 0xf061, + fa_arrow_up = 0xf062, + fa_arrows = 0xf047, + fa_arrows_alt = 0xf0b2, + fa_arrows_h = 0xf07e, + fa_arrows_v = 0xf07d, + fa_asl_interpreting = 0xf2a3, + fa_assistive_listening_systems = 0xf2a2, + fa_asterisk = 0xf069, + fa_at = 0xf1fa, + fa_audio_description = 0xf29e, + fa_automobile = 0xf1b9, + fa_backward = 0xf04a, + fa_balance_scale = 0xf24e, + fa_ban = 0xf05e, + fa_bandcamp = 0xf2d5, fa_bank = 0xf19c, - fa_graduation_cap = 0xf19d, - fa_yahoo = 0xf19e, - fa_google = 0xf1a0, - fa_reddit = 0xf1a1, - fa_reddit_square = 0xf1a2, - fa_stumbleupon_circle = 0xf1a3, - fa_stumbleupon = 0xf1a4, - fa_delicious = 0xf1a5, - fa_digg = 0xf1a6, - fa_pied_piper = 0xf1a7, - fa_pied_piper_alt = 0xf1a8, - fa_drupal = 0xf1a9, - fa_joomla = 0xf1aa, - fa_language = 0xf1ab, - fa_fax = 0xf1ac, - fa_building = 0xf1ad, - fa_child = 0xf1ae, - fa_paw = 0xf1b0, - fa_spoon = 0xf1b1, - fa_cube = 0xf1b2, - fa_cubes = 0xf1b3, + fa_bar_chart = 0xf080, + fa_bar_chart_o = 0xf080, + fa_barcode = 0xf02a, + fa_bars = 0xf0c9, + fa_bath = 0xf2cd, + fa_bathtub = 0xf2cd, + fa_battery = 0xf240, + fa_battery_0 = 0xf244, + fa_battery_1 = 0xf243, + fa_battery_2 = 0xf242, + fa_battery_3 = 0xf241, + fa_battery_4 = 0xf240, + fa_battery_empty = 0xf244, + fa_battery_full = 0xf240, + fa_battery_half = 0xf242, + fa_battery_quarter = 0xf243, + fa_battery_three_quarters = 0xf241, + fa_bed = 0xf236, + fa_beer = 0xf0fc, fa_behance = 0xf1b4, fa_behance_square = 0xf1b5, - fa_steam = 0xf1b6, - fa_steam_square = 0xf1b7, - fa_recycle = 0xf1b8, - fa_car = 0xf1b9, - fa_taxi = 0xf1ba, - fa_tree = 0xf1bb, - fa_spotify = 0xf1bc, - fa_deviantart = 0xf1bd, - fa_soundcloud = 0xf1be, - fa_database = 0xf1c0, - fa_file_pdf_o = 0xf1c1, - fa_file_word_o = 0xf1c2, - fa_file_excel_o = 0xf1c3, - fa_file_powerpoint_o = 0xf1c4, - fa_file_image_o = 0xf1c5, - fa_file_archive_o = 0xf1c6, - fa_file_audio_o = 0xf1c7, - fa_file_video_o = 0xf1c8, - fa_file_code_o = 0xf1c9, - fa_vine = 0xf1ca, - fa_codepen = 0xf1cb, - fa_jsfiddle = 0xf1cc, - fa_life_ring = 0xf1cd, - fa_circle_o_notch = 0xf1ce, - fa_rebel = 0xf1d0, - fa_empire = 0xf1d1, - fa_git_square = 0xf1d2, - fa_git = 0xf1d3, - fa_hacker_news = 0xf1d4, - fa_tencent_weibo = 0xf1d5, - fa_qq = 0xf1d6, - fa_weixin = 0xf1d7, - fa_paper_plane = 0xf1d8, - fa_paper_plane_o = 0xf1d9, - fa_history = 0xf1da, - fa_circle_thin = 0xf1db, - fa_header = 0xf1dc, - fa_paragraph = 0xf1dd, - fa_sliders = 0xf1de, - fa_share_alt = 0xf1e0, - fa_share_alt_square = 0xf1e1, - fa_bomb = 0xf1e2, - fa_futbol_o = 0xf1e3, - fa_tty = 0xf1e4, - fa_binoculars = 0xf1e5, - fa_plug = 0xf1e6, - fa_slideshare = 0xf1e7, - fa_twitch = 0xf1e8, - fa_yelp = 0xf1e9, - fa_newspaper_o = 0xf1ea, - fa_wifi = 0xf1eb, - fa_calculator = 0xf1ec, - fa_paypal = 0xf1ed, - fa_google_wallet = 0xf1ee, - fa_cc_visa = 0xf1f0, - fa_cc_mastercard = 0xf1f1, - fa_cc_discover = 0xf1f2, - fa_cc_amex = 0xf1f3, - fa_cc_paypal = 0xf1f4, - fa_cc_stripe = 0xf1f5, + fa_bell = 0xf0f3, + fa_bell_o = 0xf0a2, fa_bell_slash = 0xf1f6, fa_bell_slash_o = 0xf1f7, - fa_trash = 0xf1f8, - fa_copyright = 0xf1f9, - fa_at = 0xf1fa, - fa_eyedropper = 0xf1fb, - fa_paint_brush = 0xf1fc, + fa_bicycle = 0xf206, + fa_binoculars = 0xf1e5, fa_birthday_cake = 0xf1fd, - fa_area_chart = 0xf1fe, - fa_pie_chart = 0xf200, - fa_line_chart = 0xf201, + fa_bitbucket = 0xf171, + fa_bitbucket_square = 0xf172, + fa_bitcoin = 0xf15a, + fa_black_tie = 0xf27e, + fa_blind = 0xf29d, + fa_bluetooth = 0xf293, + fa_bluetooth_b = 0xf294, + fa_bold = 0xf032, + fa_bolt = 0xf0e7, + fa_bomb = 0xf1e2, + fa_book = 0xf02d, + fa_bookmark = 0xf02e, + fa_bookmark_o = 0xf097, + fa_braille = 0xf2a1, + fa_briefcase = 0xf0b1, + fa_btc = 0xf15a, + fa_bug = 0xf188, + fa_building = 0xf1ad, + fa_building_o = 0xf0f7, + fa_bullhorn = 0xf0a1, + fa_bullseye = 0xf140, + fa_bus = 0xf207, + fa_buysellads = 0xf20d, + fa_cab = 0xf1ba, + fa_calculator = 0xf1ec, + fa_calendar = 0xf073, + fa_calendar_check_o = 0xf274, + fa_calendar_minus_o = 0xf272, + fa_calendar_o = 0xf133, + fa_calendar_plus_o = 0xf271, + fa_calendar_times_o = 0xf273, + fa_camera = 0xf030, + fa_camera_retro = 0xf083, + fa_car = 0xf1b9, + fa_caret_down = 0xf0d7, + fa_caret_left = 0xf0d9, + fa_caret_right = 0xf0da, + fa_caret_square_o_down = 0xf150, + fa_caret_square_o_left = 0xf191, + fa_caret_square_o_right = 0xf152, + fa_caret_square_o_up = 0xf151, + fa_caret_up = 0xf0d8, + fa_cart_arrow_down = 0xf218, + fa_cart_plus = 0xf217, + fa_cc = 0xf20a, + fa_cc_amex = 0xf1f3, + fa_cc_diners_club = 0xf24c, + fa_cc_discover = 0xf1f2, + fa_cc_jcb = 0xf24b, + fa_cc_mastercard = 0xf1f1, + fa_cc_paypal = 0xf1f4, + fa_cc_stripe = 0xf1f5, + fa_cc_visa = 0xf1f0, + fa_certificate = 0xf0a3, + fa_chain = 0xf0c1, + fa_chain_broken = 0xf127, + fa_check = 0xf00c, + fa_check_circle = 0xf058, + fa_check_circle_o = 0xf05d, + fa_check_square = 0xf14a, + fa_check_square_o = 0xf046, + fa_chevron_circle_down = 0xf13a, + fa_chevron_circle_left = 0xf137, + fa_chevron_circle_right = 0xf138, + fa_chevron_circle_up = 0xf139, + fa_chevron_down = 0xf078, + fa_chevron_left = 0xf053, + fa_chevron_right = 0xf054, + fa_chevron_up = 0xf077, + fa_child = 0xf1ae, + fa_chrome = 0xf268, + fa_circle = 0xf111, + fa_circle_o = 0xf10c, + fa_circle_o_notch = 0xf1ce, + fa_circle_thin = 0xf1db, + fa_clipboard = 0xf0ea, + fa_clock_o = 0xf017, + fa_clone = 0xf24d, + fa_close = 0xf00d, + fa_cloud = 0xf0c2, + fa_cloud_download = 0xf0ed, + fa_cloud_upload = 0xf0ee, + fa_cny = 0xf157, + fa_code = 0xf121, + fa_code_fork = 0xf126, + fa_codepen = 0xf1cb, + fa_codiepie = 0xf284, + fa_coffee = 0xf0f4, + fa_cog = 0xf013, + fa_cogs = 0xf085, + fa_columns = 0xf0db, + fa_comment = 0xf075, + fa_comment_o = 0xf0e5, + fa_commenting = 0xf27a, + fa_commenting_o = 0xf27b, + fa_comments = 0xf086, + fa_comments_o = 0xf0e6, + fa_compass = 0xf14e, + fa_compress = 0xf066, + fa_connectdevelop = 0xf20e, + fa_contao = 0xf26d, + fa_copy = 0xf0c5, + fa_copyright = 0xf1f9, + fa_creative_commons = 0xf25e, + fa_credit_card = 0xf09d, + fa_credit_card_alt = 0xf283, + fa_crop = 0xf125, + fa_crosshairs = 0xf05b, + fa_css3 = 0xf13c, + fa_cube = 0xf1b2, + fa_cubes = 0xf1b3, + fa_cut = 0xf0c4, + fa_cutlery = 0xf0f5, + fa_dashboard = 0xf0e4, + fa_dashcube = 0xf210, + fa_database = 0xf1c0, + fa_deaf = 0xf2a4, + fa_deafness = 0xf2a4, + fa_dedent = 0xf03b, + fa_delicious = 0xf1a5, + fa_desktop = 0xf108, + fa_deviantart = 0xf1bd, + fa_diamond = 0xf219, + fa_digg = 0xf1a6, + fa_dollar = 0xf155, + fa_dot_circle_o = 0xf192, + fa_download = 0xf019, + fa_dribbble = 0xf17d, + fa_drivers_license = 0xf2c2, + fa_drivers_license_o = 0xf2c3, + fa_dropbox = 0xf16b, + fa_drupal = 0xf1a9, + fa_edge = 0xf282, + fa_edit = 0xf044, + fa_eercast = 0xf2da, + fa_eject = 0xf052, + fa_ellipsis_h = 0xf141, + fa_ellipsis_v = 0xf142, + fa_empire = 0xf1d1, + fa_envelope = 0xf0e0, + fa_envelope_o = 0xf003, + fa_envelope_open = 0xf2b6, + fa_envelope_open_o = 0xf2b7, + fa_envelope_square = 0xf199, + fa_envira = 0xf299, + fa_eraser = 0xf12d, + fa_etsy = 0xf2d7, + fa_eur = 0xf153, + fa_euro = 0xf153, + fa_exchange = 0xf0ec, + fa_exclamation = 0xf12a, + fa_exclamation_circle = 0xf06a, + fa_exclamation_triangle = 0xf071, + fa_expand = 0xf065, + fa_expeditedssl = 0xf23e, + fa_external_link = 0xf08e, + fa_external_link_square = 0xf14c, + fa_eye = 0xf06e, + fa_eye_slash = 0xf070, + fa_eyedropper = 0xf1fb, + fa_fa = 0xf2b4, + fa_facebook = 0xf09a, + fa_facebook_f = 0xf09a, + fa_facebook_official = 0xf230, + fa_facebook_square = 0xf082, + fa_fast_backward = 0xf049, + fa_fast_forward = 0xf050, + fa_fax = 0xf1ac, + fa_feed = 0xf09e, + fa_female = 0xf182, + fa_fighter_jet = 0xf0fb, + fa_file = 0xf15b, + fa_file_archive_o = 0xf1c6, + fa_file_audio_o = 0xf1c7, + fa_file_code_o = 0xf1c9, + fa_file_excel_o = 0xf1c3, + fa_file_image_o = 0xf1c5, + fa_file_movie_o = 0xf1c8, + fa_file_o = 0xf016, + fa_file_pdf_o = 0xf1c1, + fa_file_photo_o = 0xf1c5, + fa_file_picture_o = 0xf1c5, + fa_file_powerpoint_o = 0xf1c4, + fa_file_sound_o = 0xf1c7, + fa_file_text = 0xf15c, + fa_file_text_o = 0xf0f6, + fa_file_video_o = 0xf1c8, + fa_file_word_o = 0xf1c2, + fa_file_zip_o = 0xf1c6, + fa_files_o = 0xf0c5, + fa_film = 0xf008, + fa_filter = 0xf0b0, + fa_fire = 0xf06d, + fa_fire_extinguisher = 0xf134, + fa_firefox = 0xf269, + fa_first_order = 0xf2b0, + fa_flag = 0xf024, + fa_flag_checkered = 0xf11e, + fa_flag_o = 0xf11d, + fa_flash = 0xf0e7, + fa_flask = 0xf0c3, + fa_flickr = 0xf16e, + fa_floppy_o = 0xf0c7, + fa_folder = 0xf07b, + fa_folder_o = 0xf114, + fa_folder_open = 0xf07c, + fa_folder_open_o = 0xf115, + fa_font = 0xf031, + fa_font_awesome = 0xf2b4, + fa_fonticons = 0xf280, + fa_fort_awesome = 0xf286, + fa_forumbee = 0xf211, + fa_forward = 0xf04e, + fa_foursquare = 0xf180, + fa_free_code_camp = 0xf2c5, + fa_frown_o = 0xf119, + fa_futbol_o = 0xf1e3, + fa_gamepad = 0xf11b, + fa_gavel = 0xf0e3, + fa_gbp = 0xf154, + fa_ge = 0xf1d1, + fa_gear = 0xf013, + fa_gears = 0xf085, + fa_genderless = 0xf22d, + fa_get_pocket = 0xf265, + fa_gg = 0xf260, + fa_gg_circle = 0xf261, + fa_gift = 0xf06b, + fa_git = 0xf1d3, + fa_git_square = 0xf1d2, + fa_github = 0xf09b, + fa_github_alt = 0xf113, + fa_github_square = 0xf092, + fa_gitlab = 0xf296, + fa_gittip = 0xf184, + fa_glass = 0xf000, + fa_glide = 0xf2a5, + fa_glide_g = 0xf2a6, + fa_globe = 0xf0ac, + fa_google = 0xf1a0, + fa_google_plus = 0xf0d5, + fa_google_plus_circle = 0xf2b3, + fa_google_plus_official = 0xf2b3, + fa_google_plus_square = 0xf0d4, + fa_google_wallet = 0xf1ee, + fa_graduation_cap = 0xf19d, + fa_gratipay = 0xf184, + fa_grav = 0xf2d6, + fa_group = 0xf0c0, + fa_h_square = 0xf0fd, + fa_hacker_news = 0xf1d4, + fa_hand_grab_o = 0xf255, + fa_hand_lizard_o = 0xf258, + fa_hand_o_down = 0xf0a7, + fa_hand_o_left = 0xf0a5, + fa_hand_o_right = 0xf0a4, + fa_hand_o_up = 0xf0a6, + fa_hand_paper_o = 0xf256, + fa_hand_peace_o = 0xf25b, + fa_hand_pointer_o = 0xf25a, + fa_hand_rock_o = 0xf255, + fa_hand_scissors_o = 0xf257, + fa_hand_spock_o = 0xf259, + fa_hand_stop_o = 0xf256, + fa_handshake_o = 0xf2b5, + fa_hard_of_hearing = 0xf2a4, + fa_hashtag = 0xf292, + fa_hdd_o = 0xf0a0, + fa_header = 0xf1dc, + fa_headphones = 0xf025, + fa_heart = 0xf004, + fa_heart_o = 0xf08a, + fa_heartbeat = 0xf21e, + fa_history = 0xf1da, + fa_home = 0xf015, + fa_hospital_o = 0xf0f8, + fa_hotel = 0xf236, + fa_hourglass = 0xf254, + fa_hourglass_1 = 0xf251, + fa_hourglass_2 = 0xf252, + fa_hourglass_3 = 0xf253, + fa_hourglass_end = 0xf253, + fa_hourglass_half = 0xf252, + fa_hourglass_o = 0xf250, + fa_hourglass_start = 0xf251, + fa_houzz = 0xf27c, + fa_html5 = 0xf13b, + fa_i_cursor = 0xf246, + fa_id_badge = 0xf2c1, + fa_id_card = 0xf2c2, + fa_id_card_o = 0xf2c3, + fa_ils = 0xf20b, + fa_image = 0xf03e, + fa_imdb = 0xf2d8, + fa_inbox = 0xf01c, + fa_indent = 0xf03c, + fa_industry = 0xf275, + fa_info = 0xf129, + fa_info_circle = 0xf05a, + fa_inr = 0xf156, + fa_instagram = 0xf16d, + fa_institution = 0xf19c, + fa_internet_explorer = 0xf26b, + fa_intersex = 0xf224, + fa_ioxhost = 0xf208, + fa_italic = 0xf033, + fa_joomla = 0xf1aa, + fa_jpy = 0xf157, + fa_jsfiddle = 0xf1cc, + fa_key = 0xf084, + fa_keyboard_o = 0xf11c, + fa_krw = 0xf159, + fa_language = 0xf1ab, + fa_laptop = 0xf109, fa_lastfm = 0xf202, fa_lastfm_square = 0xf203, + fa_leaf = 0xf06c, + fa_leanpub = 0xf212, + fa_legal = 0xf0e3, + fa_lemon_o = 0xf094, + fa_level_down = 0xf149, + fa_level_up = 0xf148, + fa_life_bouy = 0xf1cd, + fa_life_buoy = 0xf1cd, + fa_life_ring = 0xf1cd, + fa_life_saver = 0xf1cd, + fa_lightbulb_o = 0xf0eb, + fa_line_chart = 0xf201, + fa_link = 0xf0c1, + fa_linkedin = 0xf0e1, + fa_linkedin_square = 0xf08c, + fa_linode = 0xf2b8, + fa_linux = 0xf17c, + fa_list = 0xf03a, + fa_list_alt = 0xf022, + fa_list_ol = 0xf0cb, + fa_list_ul = 0xf0ca, + fa_location_arrow = 0xf124, + fa_lock = 0xf023, + fa_long_arrow_down = 0xf175, + fa_long_arrow_left = 0xf177, + fa_long_arrow_right = 0xf178, + fa_long_arrow_up = 0xf176, + fa_low_vision = 0xf2a8, + fa_magic = 0xf0d0, + fa_magnet = 0xf076, + fa_mail_forward = 0xf064, + fa_mail_reply = 0xf112, + fa_mail_reply_all = 0xf122, + fa_male = 0xf183, + fa_map = 0xf279, + fa_map_marker = 0xf041, + fa_map_o = 0xf278, + fa_map_pin = 0xf276, + fa_map_signs = 0xf277, + fa_mars = 0xf222, + fa_mars_double = 0xf227, + fa_mars_stroke = 0xf229, + fa_mars_stroke_h = 0xf22b, + fa_mars_stroke_v = 0xf22a, + fa_maxcdn = 0xf136, + fa_meanpath = 0xf20c, + fa_medium = 0xf23a, + fa_medkit = 0xf0fa, + fa_meetup = 0xf2e0, + fa_meh_o = 0xf11a, + fa_mercury = 0xf223, + fa_microchip = 0xf2db, + fa_microphone = 0xf130, + fa_microphone_slash = 0xf131, + fa_minus = 0xf068, + fa_minus_circle = 0xf056, + fa_minus_square = 0xf146, + fa_minus_square_o = 0xf147, + fa_mixcloud = 0xf289, + fa_mobile = 0xf10b, + fa_mobile_phone = 0xf10b, + fa_modx = 0xf285, + fa_money = 0xf0d6, + fa_moon_o = 0xf186, + fa_mortar_board = 0xf19d, + fa_motorcycle = 0xf21c, + fa_mouse_pointer = 0xf245, + fa_music = 0xf001, + fa_navicon = 0xf0c9, + fa_neuter = 0xf22c, + fa_newspaper_o = 0xf1ea, + fa_object_group = 0xf247, + fa_object_ungroup = 0xf248, + fa_odnoklassniki = 0xf263, + fa_odnoklassniki_square = 0xf264, + fa_opencart = 0xf23d, + fa_openid = 0xf19b, + fa_opera = 0xf26a, + fa_optin_monster = 0xf23c, + fa_outdent = 0xf03b, + fa_pagelines = 0xf18c, + fa_paint_brush = 0xf1fc, + fa_paper_plane = 0xf1d8, + fa_paper_plane_o = 0xf1d9, + fa_paperclip = 0xf0c6, + fa_paragraph = 0xf1dd, + fa_paste = 0xf0ea, + fa_pause = 0xf04c, + fa_pause_circle = 0xf28b, + fa_pause_circle_o = 0xf28c, + fa_paw = 0xf1b0, + fa_paypal = 0xf1ed, + fa_pencil = 0xf040, + fa_pencil_square = 0xf14b, + fa_pencil_square_o = 0xf044, + fa_percent = 0xf295, + fa_phone = 0xf095, + fa_phone_square = 0xf098, + fa_photo = 0xf03e, + fa_picture_o = 0xf03e, + fa_pie_chart = 0xf200, + fa_pied_piper = 0xf2ae, + fa_pied_piper_alt = 0xf1a8, + fa_pied_piper_pp = 0xf1a7, + fa_pinterest = 0xf0d2, + fa_pinterest_p = 0xf231, + fa_pinterest_square = 0xf0d3, + fa_plane = 0xf072, + fa_play = 0xf04b, + fa_play_circle = 0xf144, + fa_play_circle_o = 0xf01d, + fa_plug = 0xf1e6, + fa_plus = 0xf067, + fa_plus_circle = 0xf055, + fa_plus_square = 0xf0fe, + fa_plus_square_o = 0xf196, + fa_podcast = 0xf2ce, + fa_power_off = 0xf011, + fa_print = 0xf02f, + fa_product_hunt = 0xf288, + fa_puzzle_piece = 0xf12e, + fa_qq = 0xf1d6, + fa_qrcode = 0xf029, + fa_question = 0xf128, + fa_question_circle = 0xf059, + fa_question_circle_o = 0xf29c, + fa_quora = 0xf2c4, + fa_quote_left = 0xf10d, + fa_quote_right = 0xf10e, + fa_ra = 0xf1d0, + fa_random = 0xf074, + fa_ravelry = 0xf2d9, + fa_rebel = 0xf1d0, + fa_recycle = 0xf1b8, + fa_reddit = 0xf1a1, + fa_reddit_alien = 0xf281, + fa_reddit_square = 0xf1a2, + fa_refresh = 0xf021, + fa_registered = 0xf25d, + fa_remove = 0xf00d, + fa_renren = 0xf18b, + fa_reorder = 0xf0c9, + fa_repeat = 0xf01e, + fa_reply = 0xf112, + fa_reply_all = 0xf122, + fa_resistance = 0xf1d0, + fa_retweet = 0xf079, + fa_rmb = 0xf157, + fa_road = 0xf018, + fa_rocket = 0xf135, + fa_rotate_left = 0xf0e2, + fa_rotate_right = 0xf01e, + fa_rouble = 0xf158, + fa_rss = 0xf09e, + fa_rss_square = 0xf143, + fa_rub = 0xf158, + fa_ruble = 0xf158, + fa_rupee = 0xf156, + fa_s15 = 0xf2cd, + fa_safari = 0xf267, + fa_save = 0xf0c7, + fa_scissors = 0xf0c4, + fa_scribd = 0xf28a, + fa_search = 0xf002, + fa_search_minus = 0xf010, + fa_search_plus = 0xf00e, + fa_sellsy = 0xf213, + fa_send = 0xf1d8, + fa_send_o = 0xf1d9, + fa_server = 0xf233, + fa_share = 0xf064, + fa_share_alt = 0xf1e0, + fa_share_alt_square = 0xf1e1, + fa_share_square = 0xf14d, + fa_share_square_o = 0xf045, + fa_shekel = 0xf20b, + fa_sheqel = 0xf20b, + fa_shield = 0xf132, + fa_ship = 0xf21a, + fa_shirtsinbulk = 0xf214, + fa_shopping_bag = 0xf290, + fa_shopping_basket = 0xf291, + fa_shopping_cart = 0xf07a, + fa_shower = 0xf2cc, + fa_sign_in = 0xf090, + fa_sign_language = 0xf2a7, + fa_sign_out = 0xf08b, + fa_signal = 0xf012, + fa_signing = 0xf2a7, + fa_simplybuilt = 0xf215, + fa_sitemap = 0xf0e8, + fa_skyatlas = 0xf216, + fa_skype = 0xf17e, + fa_slack = 0xf198, + fa_sliders = 0xf1de, + fa_slideshare = 0xf1e7, + fa_smile_o = 0xf118, + fa_snapchat = 0xf2ab, + fa_snapchat_ghost = 0xf2ac, + fa_snapchat_square = 0xf2ad, + fa_snowflake_o = 0xf2dc, + fa_soccer_ball_o = 0xf1e3, + fa_sort = 0xf0dc, + fa_sort_alpha_asc = 0xf15d, + fa_sort_alpha_desc = 0xf15e, + fa_sort_amount_asc = 0xf160, + fa_sort_amount_desc = 0xf161, + fa_sort_asc = 0xf0de, + fa_sort_desc = 0xf0dd, + fa_sort_down = 0xf0dd, + fa_sort_numeric_asc = 0xf162, + fa_sort_numeric_desc = 0xf163, + fa_sort_up = 0xf0de, + fa_soundcloud = 0xf1be, + fa_space_shuttle = 0xf197, + fa_spinner = 0xf110, + fa_spoon = 0xf1b1, + fa_spotify = 0xf1bc, + fa_square = 0xf0c8, + fa_square_o = 0xf096, + fa_stack_exchange = 0xf18d, + fa_stack_overflow = 0xf16c, + fa_star = 0xf005, + fa_star_half = 0xf089, + fa_star_half_empty = 0xf123, + fa_star_half_full = 0xf123, + fa_star_half_o = 0xf123, + fa_star_o = 0xf006, + fa_steam = 0xf1b6, + fa_steam_square = 0xf1b7, + fa_step_backward = 0xf048, + fa_step_forward = 0xf051, + fa_stethoscope = 0xf0f1, + fa_sticky_note = 0xf249, + fa_sticky_note_o = 0xf24a, + fa_stop = 0xf04d, + fa_stop_circle = 0xf28d, + fa_stop_circle_o = 0xf28e, + fa_street_view = 0xf21d, + fa_strikethrough = 0xf0cc, + fa_stumbleupon = 0xf1a4, + fa_stumbleupon_circle = 0xf1a3, + fa_subscript = 0xf12c, + fa_subway = 0xf239, + fa_suitcase = 0xf0f2, + fa_sun_o = 0xf185, + fa_superpowers = 0xf2dd, + fa_superscript = 0xf12b, + fa_support = 0xf1cd, + fa_table = 0xf0ce, + fa_tablet = 0xf10a, + fa_tachometer = 0xf0e4, + fa_tag = 0xf02b, + fa_tags = 0xf02c, + fa_tasks = 0xf0ae, + fa_taxi = 0xf1ba, + fa_telegram = 0xf2c6, + fa_television = 0xf26c, + fa_tencent_weibo = 0xf1d5, + fa_terminal = 0xf120, + fa_text_height = 0xf034, + fa_text_width = 0xf035, + fa_th = 0xf00a, + fa_th_large = 0xf009, + fa_th_list = 0xf00b, + fa_themeisle = 0xf2b2, + fa_thermometer = 0xf2c7, + fa_thermometer_0 = 0xf2cb, + fa_thermometer_1 = 0xf2ca, + fa_thermometer_2 = 0xf2c9, + fa_thermometer_3 = 0xf2c8, + fa_thermometer_4 = 0xf2c7, + fa_thermometer_empty = 0xf2cb, + fa_thermometer_full = 0xf2c7, + fa_thermometer_half = 0xf2c9, + fa_thermometer_quarter = 0xf2ca, + fa_thermometer_three_quarters = 0xf2c8, + fa_thumb_tack = 0xf08d, + fa_thumbs_down = 0xf165, + fa_thumbs_o_down = 0xf088, + fa_thumbs_o_up = 0xf087, + fa_thumbs_up = 0xf164, + fa_ticket = 0xf145, + fa_times = 0xf00d, + fa_times_circle = 0xf057, + fa_times_circle_o = 0xf05c, + fa_times_rectangle = 0xf2d3, + fa_times_rectangle_o = 0xf2d4, + fa_tint = 0xf043, + fa_toggle_down = 0xf150, + fa_toggle_left = 0xf191, fa_toggle_off = 0xf204, fa_toggle_on = 0xf205, - fa_bicycle = 0xf206, - fa_bus = 0xf207, - fa_ioxhost = 0xf208, - fa_angellist = 0xf209, - fa_cc = 0xf20a, - fa_ils = 0xf20b, - fa_meanpath = 0xf20c, + fa_toggle_right = 0xf152, + fa_toggle_up = 0xf151, + fa_trademark = 0xf25c, + fa_train = 0xf238, + fa_transgender = 0xf224, + fa_transgender_alt = 0xf225, + fa_trash = 0xf1f8, + fa_trash_o = 0xf014, + fa_tree = 0xf1bb, + fa_trello = 0xf181, + fa_tripadvisor = 0xf262, + fa_trophy = 0xf091, + fa_truck = 0xf0d1, + fa_try = 0xf195, + fa_tty = 0xf1e4, + fa_tumblr = 0xf173, + fa_tumblr_square = 0xf174, + fa_turkish_lira = 0xf195, + fa_tv = 0xf26c, + fa_twitch = 0xf1e8, + fa_twitter = 0xf099, + fa_twitter_square = 0xf081, + fa_umbrella = 0xf0e9, + fa_underline = 0xf0cd, + fa_undo = 0xf0e2, + fa_universal_access = 0xf29a, + fa_university = 0xf19c, + fa_unlink = 0xf127, + fa_unlock = 0xf09c, + fa_unlock_alt = 0xf13e, + fa_unsorted = 0xf0dc, + fa_upload = 0xf093, + fa_usb = 0xf287, + fa_usd = 0xf155, + fa_user = 0xf007, + fa_user_circle = 0xf2bd, + fa_user_circle_o = 0xf2be, + fa_user_md = 0xf0f0, + fa_user_o = 0xf2c0, + fa_user_plus = 0xf234, + fa_user_secret = 0xf21b, + fa_user_times = 0xf235, + fa_users = 0xf0c0, + fa_vcard = 0xf2bb, + fa_vcard_o = 0xf2bc, + fa_venus = 0xf221, + fa_venus_double = 0xf226, + fa_venus_mars = 0xf228, + fa_viacoin = 0xf237, + fa_viadeo = 0xf2a9, + fa_viadeo_square = 0xf2aa, + fa_video_camera = 0xf03d, + fa_vimeo = 0xf27d, + fa_vimeo_square = 0xf194, + fa_vine = 0xf1ca, + fa_vk = 0xf189, + fa_volume_control_phone = 0xf2a0, + fa_volume_down = 0xf027, + fa_volume_off = 0xf026, + fa_volume_up = 0xf028, + fa_warning = 0xf071, + fa_wechat = 0xf1d7, + fa_weibo = 0xf18a, + fa_weixin = 0xf1d7, + fa_whatsapp = 0xf232, + fa_wheelchair = 0xf193, + fa_wheelchair_alt = 0xf29b, + fa_wifi = 0xf1eb, + fa_wikipedia_w = 0xf266, + fa_window_close = 0xf2d3, + fa_window_close_o = 0xf2d4, + fa_window_maximize = 0xf2d0, + fa_window_minimize = 0xf2d1, + fa_window_restore = 0xf2d2, + fa_windows = 0xf17a, + fa_won = 0xf159, + fa_wordpress = 0xf19a, + fa_wpbeginner = 0xf297, + fa_wpexplorer = 0xf2de, + fa_wpforms = 0xf298, + fa_wrench = 0xf0ad, + fa_xing = 0xf168, + fa_xing_square = 0xf169, + fa_y_combinator = 0xf23b, + fa_y_combinator_square = 0xf1d4, + fa_yahoo = 0xf19e, + fa_yc = 0xf23b, + fa_yc_square = 0xf1d4, + fa_yelp = 0xf1e9, + fa_yen = 0xf157, + fa_yoast = 0xf2b1, + fa_youtube = 0xf167, + fa_youtube_play = 0xf16a, + fa_youtube_square = 0xf166, // gamemode icons in circles fa_osu_osu_o = 0xe000, diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs index 47385861ab..ee6cd137df 100644 --- a/osu.Game/Graphics/UserInterface/StarCounter.cs +++ b/osu.Game/Graphics/UserInterface/StarCounter.cs @@ -120,7 +120,7 @@ namespace osu.Game.Graphics.UserInterface { TextAwesome star = new TextAwesome { - Icon = FontAwesome.star, + Icon = FontAwesome.fa_star, Anchor = Anchor.CentreLeft, Origin = Anchor.Centre, TextSize = StarSize, diff --git a/osu.Game/Overlays/Toolbar.cs b/osu.Game/Overlays/Toolbar.cs index d6ac57a94c..2931bf55d1 100644 --- a/osu.Game/Overlays/Toolbar.cs +++ b/osu.Game/Overlays/Toolbar.cs @@ -58,14 +58,14 @@ namespace osu.Game.Overlays { new ToolbarButton { - Icon = FontAwesome.gear, + Icon = FontAwesome.fa_gear, TooltipMain = "Settings", TooltipSub = "Change your settings", Action = () => OnSettings?.Invoke() }, new ToolbarButton { - Icon = FontAwesome.home, + Icon = FontAwesome.fa_home, TooltipMain = "Home", TooltipSub = "Return to the main menu", Action = () => OnHome?.Invoke() @@ -87,15 +87,15 @@ namespace osu.Game.Overlays { new ToolbarButton { - Icon = FontAwesome.search + Icon = FontAwesome.fa_search }, userButton = new ToolbarButton { - Icon = FontAwesome.user, + Icon = FontAwesome.fa_user, }, new ToolbarButton { - Icon = FontAwesome.bars + Icon = FontAwesome.fa_bars }, } } From 8797b04dc209a2628f7425e819af9109204bce29 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 7 Nov 2016 19:44:48 +0900 Subject: [PATCH 11/11] Update resources. --- osu-resources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-resources b/osu-resources index 5ce2639887..10dd6161a6 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit 5ce263988735b3f15c1195568b65fef40756198c +Subproject commit 10dd6161a65972c53e310e26a09c92cffca33a08