From bca5bee72eb22df8f9885c8962efe2a9125417fa Mon Sep 17 00:00:00 2001 From: Gagah Pangeran Rosfatiputra Date: Mon, 10 May 2021 19:28:32 +0700 Subject: [PATCH 1/2] remove duplicate CreateSpriteText in OsuMarkdownTextFlowContainer --- .../Containers/Markdown/OsuMarkdownTextFlowContainer.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs index 1550b8401d..c3527fa99a 100644 --- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs +++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs @@ -6,7 +6,6 @@ using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers.Markdown; using osu.Framework.Graphics.Sprites; -using osu.Game.Graphics.Sprites; using osu.Game.Overlays; namespace osu.Game.Graphics.Containers.Markdown @@ -16,11 +15,6 @@ namespace osu.Game.Graphics.Containers.Markdown [Resolved] private OverlayColourProvider colourProvider { get; set; } - protected override SpriteText CreateSpriteText() => new OsuSpriteText - { - Font = OsuFont.GetFont(size: 14), - }; - protected override void AddLinkText(string text, LinkInline linkInline) => AddDrawable(new OsuMarkdownLinkText(text, linkInline)); From f1aa47f6df50456892f2c7da4d4281f5e288714f Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 10 May 2021 23:15:38 +0900 Subject: [PATCH 2/2] Update framework --- osu.Android.props | 2 +- osu.Game/osu.Game.csproj | 2 +- osu.iOS.props | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/osu.Android.props b/osu.Android.props index 80b1c5b52f..8c24df5c2e 100644 --- a/osu.Android.props +++ b/osu.Android.props @@ -52,6 +52,6 @@ - + diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 29189781a7..3eb5050e1a 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -29,7 +29,7 @@ - + diff --git a/osu.iOS.props b/osu.iOS.props index c4eb7aefba..f00e20a66e 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -70,7 +70,7 @@ - + @@ -93,7 +93,7 @@ - +