diff --git a/osu.Android.props b/osu.Android.props
index 0bf415e764..147d236d98 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,11 +51,14 @@
-
-
+
+
+
+
+
diff --git a/osu.Android/Linker.xml b/osu.Android/Linker.xml
new file mode 100644
index 0000000000..c7d31fe087
--- /dev/null
+++ b/osu.Android/Linker.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuHitObjectGenerationUtilsTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuHitObjectGenerationUtilsTest.cs
new file mode 100644
index 0000000000..daa914cac2
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/OsuHitObjectGenerationUtilsTest.cs
@@ -0,0 +1,91 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Osu.Utils;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+ [TestFixture]
+ public class OsuHitObjectGenerationUtilsTest
+ {
+ private static Slider createTestSlider()
+ {
+ var slider = new Slider
+ {
+ Position = new Vector2(128, 128),
+ Path = new SliderPath
+ {
+ ControlPoints =
+ {
+ new PathControlPoint(new Vector2(), PathType.Linear),
+ new PathControlPoint(new Vector2(-64, -128), PathType.Linear), // absolute position: (64, 0)
+ new PathControlPoint(new Vector2(-128, 0), PathType.Linear) // absolute position: (0, 128)
+ }
+ },
+ RepeatCount = 1
+ };
+ slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+ return slider;
+ }
+
+ [Test]
+ public void TestReflectSliderHorizontallyAlongPlayfield()
+ {
+ var slider = createTestSlider();
+
+ OsuHitObjectGenerationUtils.ReflectHorizontallyAlongPlayfield(slider);
+
+ Assert.That(slider.Position, Is.EqualTo(new Vector2(OsuPlayfield.BASE_SIZE.X - 128, 128)));
+ Assert.That(slider.NestedHitObjects.OfType().Single().Position, Is.EqualTo(new Vector2(OsuPlayfield.BASE_SIZE.X - 0, 128)));
+ Assert.That(slider.Path.ControlPoints.Select(point => point.Position), Is.EquivalentTo(new[]
+ {
+ new Vector2(),
+ new Vector2(64, -128),
+ new Vector2(128, 0)
+ }));
+ }
+
+ [Test]
+ public void TestReflectSliderVerticallyAlongPlayfield()
+ {
+ var slider = createTestSlider();
+
+ OsuHitObjectGenerationUtils.ReflectVerticallyAlongPlayfield(slider);
+
+ Assert.That(slider.Position, Is.EqualTo(new Vector2(128, OsuPlayfield.BASE_SIZE.Y - 128)));
+ Assert.That(slider.NestedHitObjects.OfType().Single().Position, Is.EqualTo(new Vector2(0, OsuPlayfield.BASE_SIZE.Y - 128)));
+ Assert.That(slider.Path.ControlPoints.Select(point => point.Position), Is.EquivalentTo(new[]
+ {
+ new Vector2(),
+ new Vector2(-64, 128),
+ new Vector2(-128, 0)
+ }));
+ }
+
+ [Test]
+ public void TestFlipSliderInPlaceHorizontally()
+ {
+ var slider = createTestSlider();
+
+ OsuHitObjectGenerationUtils.FlipSliderInPlaceHorizontally(slider);
+
+ Assert.That(slider.Position, Is.EqualTo(new Vector2(128, 128)));
+ Assert.That(slider.NestedHitObjects.OfType().Single().Position, Is.EqualTo(new Vector2(256, 128)));
+ Assert.That(slider.Path.ControlPoints.Select(point => point.Position), Is.EquivalentTo(new[]
+ {
+ new Vector2(),
+ new Vector2(64, -128),
+ new Vector2(128, 0)
+ }));
+ }
+ }
+}
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
index 5430929143..19d4a1bf83 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
{
var osuObject = (OsuHitObject)hitObject;
- OsuHitObjectGenerationUtils.ReflectVertically(osuObject);
+ OsuHitObjectGenerationUtils.ReflectVerticallyAlongPlayfield(osuObject);
}
}
}
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModMirror.cs b/osu.Game.Rulesets.Osu/Mods/OsuModMirror.cs
index 0a54d58718..6d01808fb5 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModMirror.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModMirror.cs
@@ -27,16 +27,16 @@ namespace osu.Game.Rulesets.Osu.Mods
switch (Reflection.Value)
{
case MirrorType.Horizontal:
- OsuHitObjectGenerationUtils.ReflectHorizontally(osuObject);
+ OsuHitObjectGenerationUtils.ReflectHorizontallyAlongPlayfield(osuObject);
break;
case MirrorType.Vertical:
- OsuHitObjectGenerationUtils.ReflectVertically(osuObject);
+ OsuHitObjectGenerationUtils.ReflectVerticallyAlongPlayfield(osuObject);
break;
case MirrorType.Both:
- OsuHitObjectGenerationUtils.ReflectHorizontally(osuObject);
- OsuHitObjectGenerationUtils.ReflectVertically(osuObject);
+ OsuHitObjectGenerationUtils.ReflectHorizontallyAlongPlayfield(osuObject);
+ OsuHitObjectGenerationUtils.ReflectVerticallyAlongPlayfield(osuObject);
break;
}
}
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 1621bb50b1..307d731fd4 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -65,6 +65,11 @@ namespace osu.Game.Rulesets.Osu.Mods
flowDirection = !flowDirection;
}
+ if (positionInfos[i].HitObject is Slider slider && random.NextDouble() < 0.5)
+ {
+ OsuHitObjectGenerationUtils.FlipSliderInPlaceHorizontally(slider);
+ }
+
if (i == 0)
{
positionInfos[i].DistanceFromPrevious = (float)(random.NextDouble() * OsuPlayfield.BASE_SIZE.Y / 2);
diff --git a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
index 3a8b3f67d0..aa4cd0af14 100644
--- a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
+++ b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
@@ -112,44 +112,46 @@ namespace osu.Game.Rulesets.Osu.Utils
/// Reflects the position of the in the playfield horizontally.
///
/// The object to reflect.
- public static void ReflectHorizontally(OsuHitObject osuObject)
+ public static void ReflectHorizontallyAlongPlayfield(OsuHitObject osuObject)
{
osuObject.Position = new Vector2(OsuPlayfield.BASE_SIZE.X - osuObject.X, osuObject.Position.Y);
- if (!(osuObject is Slider slider))
+ if (osuObject is not Slider slider)
return;
- // No need to update the head and tail circles, since slider handles that when the new slider path is set
- slider.NestedHitObjects.OfType().ForEach(h => h.Position = new Vector2(OsuPlayfield.BASE_SIZE.X - h.Position.X, h.Position.Y));
- slider.NestedHitObjects.OfType().ForEach(h => h.Position = new Vector2(OsuPlayfield.BASE_SIZE.X - h.Position.X, h.Position.Y));
+ void reflectNestedObject(OsuHitObject nested) => nested.Position = new Vector2(OsuPlayfield.BASE_SIZE.X - nested.Position.X, nested.Position.Y);
+ static void reflectControlPoint(PathControlPoint point) => point.Position = new Vector2(-point.Position.X, point.Position.Y);
- var controlPoints = slider.Path.ControlPoints.Select(p => new PathControlPoint(p.Position, p.Type)).ToArray();
- foreach (var point in controlPoints)
- point.Position = new Vector2(-point.Position.X, point.Position.Y);
-
- slider.Path = new SliderPath(controlPoints, slider.Path.ExpectedDistance.Value);
+ modifySlider(slider, reflectNestedObject, reflectControlPoint);
}
///
/// Reflects the position of the in the playfield vertically.
///
/// The object to reflect.
- public static void ReflectVertically(OsuHitObject osuObject)
+ public static void ReflectVerticallyAlongPlayfield(OsuHitObject osuObject)
{
osuObject.Position = new Vector2(osuObject.Position.X, OsuPlayfield.BASE_SIZE.Y - osuObject.Y);
- if (!(osuObject is Slider slider))
+ if (osuObject is not Slider slider)
return;
- // No need to update the head and tail circles, since slider handles that when the new slider path is set
- slider.NestedHitObjects.OfType().ForEach(h => h.Position = new Vector2(h.Position.X, OsuPlayfield.BASE_SIZE.Y - h.Position.Y));
- slider.NestedHitObjects.OfType().ForEach(h => h.Position = new Vector2(h.Position.X, OsuPlayfield.BASE_SIZE.Y - h.Position.Y));
+ void reflectNestedObject(OsuHitObject nested) => nested.Position = new Vector2(nested.Position.X, OsuPlayfield.BASE_SIZE.Y - nested.Position.Y);
+ static void reflectControlPoint(PathControlPoint point) => point.Position = new Vector2(point.Position.X, -point.Position.Y);
- var controlPoints = slider.Path.ControlPoints.Select(p => new PathControlPoint(p.Position, p.Type)).ToArray();
- foreach (var point in controlPoints)
- point.Position = new Vector2(point.Position.X, -point.Position.Y);
+ modifySlider(slider, reflectNestedObject, reflectControlPoint);
+ }
- slider.Path = new SliderPath(controlPoints, slider.Path.ExpectedDistance.Value);
+ ///
+ /// Flips the position of the around its start position horizontally.
+ ///
+ /// The slider to be flipped.
+ public static void FlipSliderInPlaceHorizontally(Slider slider)
+ {
+ void flipNestedObject(OsuHitObject nested) => nested.Position = new Vector2(slider.X - (nested.X - slider.X), nested.Y);
+ static void flipControlPoint(PathControlPoint point) => point.Position = new Vector2(-point.Position.X, point.Position.Y);
+
+ modifySlider(slider, flipNestedObject, flipControlPoint);
}
///
@@ -160,14 +162,20 @@ namespace osu.Game.Rulesets.Osu.Utils
public static void RotateSlider(Slider slider, float rotation)
{
void rotateNestedObject(OsuHitObject nested) => nested.Position = rotateVector(nested.Position - slider.Position, rotation) + slider.Position;
+ void rotateControlPoint(PathControlPoint point) => point.Position = rotateVector(point.Position, rotation);
+ modifySlider(slider, rotateNestedObject, rotateControlPoint);
+ }
+
+ private static void modifySlider(Slider slider, Action modifyNestedObject, Action modifyControlPoint)
+ {
// No need to update the head and tail circles, since slider handles that when the new slider path is set
- slider.NestedHitObjects.OfType().ForEach(rotateNestedObject);
- slider.NestedHitObjects.OfType().ForEach(rotateNestedObject);
+ slider.NestedHitObjects.OfType().ForEach(modifyNestedObject);
+ slider.NestedHitObjects.OfType().ForEach(modifyNestedObject);
var controlPoints = slider.Path.ControlPoints.Select(p => new PathControlPoint(p.Position, p.Type)).ToArray();
foreach (var point in controlPoints)
- point.Position = rotateVector(point.Position, rotation);
+ modifyControlPoint(point);
slider.Path = new SliderPath(controlPoints, slider.Path.ExpectedDistance.Value);
}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModDifficultyAdjustSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModDifficultyAdjustSettings.cs
index 0d02a72d87..f45f5b9f59 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModDifficultyAdjustSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModDifficultyAdjustSettings.cs
@@ -126,6 +126,21 @@ namespace osu.Game.Tests.Visual.UserInterface
checkBindableAtValue("Circle Size", 9);
}
+ [Test]
+ public void TestExtendedLimitsRetainedAfterBoundCopyCreation()
+ {
+ setExtendedLimits(true);
+ setSliderValue("Circle Size", 11);
+
+ checkSliderAtValue("Circle Size", 11);
+ checkBindableAtValue("Circle Size", 11);
+
+ AddStep("create bound copy", () => _ = modDifficultyAdjust.CircleSize.GetBoundCopy());
+
+ checkSliderAtValue("Circle Size", 11);
+ checkBindableAtValue("Circle Size", 11);
+ }
+
[Test]
public void TestResetToDefault()
{
diff --git a/osu.Game/Database/LegacyImportManager.cs b/osu.Game/Database/LegacyImportManager.cs
index 901b953bf2..b5338fbe1f 100644
--- a/osu.Game/Database/LegacyImportManager.cs
+++ b/osu.Game/Database/LegacyImportManager.cs
@@ -42,8 +42,8 @@ namespace osu.Game.Database
[Resolved]
private RealmAccess realmAccess { get; set; } = null!;
- [Resolved(canBeNull: true)] // canBeNull required while we remain on mono for mobile platforms.
- private DesktopGameHost? desktopGameHost { get; set; }
+ [Resolved]
+ private GameHost gameHost { get; set; } = null!;
[Resolved]
private INotificationOverlay? notifications { get; set; }
@@ -52,7 +52,7 @@ namespace osu.Game.Database
public bool SupportsImportFromStable => RuntimeInfo.IsDesktop;
- public void UpdateStorage(string stablePath) => cachedStorage = new StableStorage(stablePath, desktopGameHost);
+ public void UpdateStorage(string stablePath) => cachedStorage = new StableStorage(stablePath, gameHost as DesktopGameHost);
public virtual async Task GetImportCount(StableContent content, CancellationToken cancellationToken)
{
diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 123589c552..8dd6eac7bb 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -240,7 +240,9 @@ namespace osu.Game.Graphics.Containers
headerBackgroundContainer.Height = expandableHeaderSize + fixedHeaderSize;
headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
- float smallestSectionHeight = Children.Count > 0 ? Children.Min(d => d.Height) : 0;
+ var flowChildren = scrollContentContainer.FlowingChildren.OfType();
+
+ float smallestSectionHeight = flowChildren.Any() ? flowChildren.Min(d => d.Height) : 0;
// scroll offset is our fixed header height if we have it plus 10% of content height
// plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
@@ -249,7 +251,7 @@ namespace osu.Game.Graphics.Containers
float scrollCentre = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_y_centre + selectionLenienceAboveSection;
- var presentChildren = Children.Where(c => c.IsPresent);
+ var presentChildren = flowChildren.Where(c => c.IsPresent);
if (lastClickedSection != null)
SelectedSection.Value = lastClickedSection;
diff --git a/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs b/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
index d723786f23..e4134980b1 100644
--- a/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
@@ -32,6 +32,7 @@ namespace osu.Game.Online.API.Requests
Loved,
Pending,
Guest,
- Graveyard
+ Graveyard,
+ Nominated,
}
}
diff --git a/osu.Game/Online/API/Requests/Responses/APIUser.cs b/osu.Game/Online/API/Requests/Responses/APIUser.cs
index d3ddcffaf5..2b6193f661 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUser.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUser.cs
@@ -164,6 +164,9 @@ namespace osu.Game.Online.API.Requests.Responses
[JsonProperty(@"guest_beatmapset_count")]
public int GuestBeatmapsetCount;
+ [JsonProperty(@"nominated_beatmapset_count")]
+ public int NominatedBeatmapsetCount;
+
[JsonProperty(@"scores_best_count")]
public int ScoresBestCount;
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index eaef940d5f..a4661dcbd7 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -529,6 +529,10 @@ namespace osu.Game.Online.Chat
{
Logger.Log($"Joined public channel {channel}");
joinChannel(channel, fetchInitialMessages);
+
+ // Required after joining public channels to mark the user as online in them.
+ // Todo: Temporary workaround for https://github.com/ppy/osu-web/issues/9602
+ SendAck();
};
req.Failure += e =>
{
diff --git a/osu.Game/Online/PersistentEndpointClientConnector.cs b/osu.Game/Online/PersistentEndpointClientConnector.cs
index be76644745..55e9190f99 100644
--- a/osu.Game/Online/PersistentEndpointClientConnector.cs
+++ b/osu.Game/Online/PersistentEndpointClientConnector.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Online
await disconnect(true);
if (ex != null)
- await handleErrorAndDelay(ex, cancellationToken).ConfigureAwait(false);
+ await handleErrorAndDelay(ex, CancellationToken.None).ConfigureAwait(false);
else
Logger.Log($"{ClientName} disconnected", LoggingTarget.Network);
diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index 8c1eea6520..56d9fb9ec6 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -58,6 +58,9 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
case BeatmapSetType.Guest:
return user.GuestBeatmapsetCount;
+ case BeatmapSetType.Nominated:
+ return user.NominatedBeatmapsetCount;
+
default:
return 0;
}
diff --git a/osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs b/osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs
index 9f2e79b371..cf80ebd66f 100644
--- a/osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs
@@ -25,7 +25,8 @@ namespace osu.Game.Overlays.Profile.Sections
new PaginatedBeatmapContainer(BeatmapSetType.Loved, User, UsersStrings.ShowExtraBeatmapsLovedTitle),
new PaginatedBeatmapContainer(BeatmapSetType.Guest, User, UsersStrings.ShowExtraBeatmapsGuestTitle),
new PaginatedBeatmapContainer(BeatmapSetType.Pending, User, UsersStrings.ShowExtraBeatmapsPendingTitle),
- new PaginatedBeatmapContainer(BeatmapSetType.Graveyard, User, UsersStrings.ShowExtraBeatmapsGraveyardTitle)
+ new PaginatedBeatmapContainer(BeatmapSetType.Graveyard, User, UsersStrings.ShowExtraBeatmapsGraveyardTitle),
+ new PaginatedBeatmapContainer(BeatmapSetType.Nominated, User, UsersStrings.ShowExtraBeatmapsNominatedTitle),
};
}
}
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index b1a9b2096e..386f95cf0a 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -205,7 +205,9 @@ namespace osu.Game.Overlays
protected override UserTrackingScrollContainer CreateScrollContainer() => new OverlayScrollContainer();
- protected override FlowContainer CreateScrollContentContainer() => new FillFlowContainer
+ // Reverse child ID is required so expanding beatmap panels can appear above sections below them.
+ // This can also be done by setting Depth when adding new sections above if using ReverseChildID turns out to have any issues.
+ protected override FlowContainer CreateScrollContentContainer() => new ReverseChildIDFillFlowContainer
{
Direction = FillDirection.Vertical,
AutoSizeAxes = Axes.Y,
diff --git a/osu.Game/Rulesets/Mods/DifficultyBindable.cs b/osu.Game/Rulesets/Mods/DifficultyBindable.cs
index cca72cf3ac..c21ce756c9 100644
--- a/osu.Game/Rulesets/Mods/DifficultyBindable.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyBindable.cs
@@ -118,11 +118,18 @@ namespace osu.Game.Rulesets.Mods
if (!(them is DifficultyBindable otherDifficultyBindable))
throw new InvalidOperationException($"Cannot bind to a non-{nameof(DifficultyBindable)}.");
+ // ensure that MaxValue and ExtendedMaxValue are copied across first before continuing.
+ // not doing so may cause the value of CurrentNumber to be truncated to 10.
+ otherDifficultyBindable.CopyTo(this);
+
+ // set up mutual binding for ExtendedLimits to correctly set the upper bound of CurrentNumber.
ExtendedLimits.BindTarget = otherDifficultyBindable.ExtendedLimits;
- // the actual values need to be copied after the max value constraints.
+ // set up mutual binding for CurrentNumber. this must happen after all of the above.
CurrentNumber.BindTarget = otherDifficultyBindable.CurrentNumber;
+ // finish up the binding by setting up weak references via the base call.
+ // unfortunately this will call `.CopyTo()` again, but fixing that is problematic and messy.
base.BindTo(them);
}
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index e30be72704..539d58d2d7 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Screens.Menu
"New features are coming online every update. Make sure to stay up-to-date!",
"If you find the UI too large or small, try adjusting UI scale in settings!",
"Try adjusting the \"Screen Scaling\" mode to change your gameplay or UI area, even in fullscreen!",
- "What used to be \"osu!direct\" is available to all users just like on the website. You can access it anywhere using Ctrl-D!",
+ "What used to be \"osu!direct\" is available to all users just like on the website. You can access it anywhere using Ctrl-B!",
"Seeking in replays is available by dragging on the difficulty bar at the bottom of the screen!",
"Multithreading support means that even with low \"FPS\" your input and judgements will be accurate!",
"Try scrolling down in the mod select panel to find a bunch of new fun mods!",
diff --git a/osu.Game/Screens/Utility/ButtonWithKeyBind.cs b/osu.Game/Screens/Utility/ButtonWithKeyBind.cs
index 29e9cd2515..7c78836b12 100644
--- a/osu.Game/Screens/Utility/ButtonWithKeyBind.cs
+++ b/osu.Game/Screens/Utility/ButtonWithKeyBind.cs
@@ -47,6 +47,8 @@ namespace osu.Game.Screens.Utility
Height = 100;
SpriteText.Colour = overlayColourProvider.Background6;
SpriteText.Font = OsuFont.TorusAlternate.With(size: 34);
+
+ Triangles?.Hide();
}
}
}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index a176d73854..8639ce6361 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,14 +29,14 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/osu.iOS.props b/osu.iOS.props
index e192467247..184e3303c8 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,8 +61,8 @@
-
-
+
+
@@ -82,7 +82,7 @@
-
+
diff --git a/osu.iOS/Linker.xml b/osu.iOS/Linker.xml
index 04591c55d0..b55be3be39 100644
--- a/osu.iOS/Linker.xml
+++ b/osu.iOS/Linker.xml
@@ -24,4 +24,8 @@
+
+
+
+