xdi1
diff --git a/‎.github/workflows/diffcalc.yml
+3-1 b/‎.github/workflows/diffcalc.yml
+3-1
diff --git a/‎Templates/README.md
+1-1 b/‎Templates/README.md
+1-1
diff --git a/‎osu.Android.props
+1-1 b/‎osu.Android.props
+1-1
diff --git a/‎osu.Android/AndroidMouseSettings.cs
+1-1 b/‎osu.Android/AndroidMouseSettings.cs
+1-1
diff --git a/‎osu.Android/OsuGameAndroid.cs
+4 b/‎osu.Android/OsuGameAndroid.cs
+4
diff --git a/‎osu.Desktop/Updater/SquirrelUpdateManager.cs
+2-2 b/‎osu.Desktop/Updater/SquirrelUpdateManager.cs
+2-2
diff --git a/‎osu.Desktop/osu.Desktop.csproj
+1-1 b/‎osu.Desktop/osu.Desktop.csproj
+1-1
diff --git a/‎osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
+2-2 b/‎osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
+2-2
diff --git a/‎osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+29 b/‎osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+29
diff --git a/‎osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-0.png
5 KB b/‎osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-0.png
5 KB
diff --git a/‎osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-1.png
5 KB b/‎osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-1.png
5 KB
diff --git a/‎osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-2.png
5.01 KB b/‎osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-2.png
5.01 KB
diff --git a/‎osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-3.png
5 KB b/‎osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-3.png
5 KB
diff --git a/‎osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
+2 b/‎osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
+2
diff --git a/‎osu.Game.Rulesets.Mania/ManiaRuleset.cs
+13-11 b/‎osu.Game.Rulesets.Mania/ManiaRuleset.cs
+13-11
diff --git a/‎osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+13 b/‎osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+13
diff --git a/‎osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+1-1 b/‎osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+1-1
diff --git a/‎osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
+11-11 b/‎osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
+11-11
diff --git a/‎osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+1-1 b/‎osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+1-1
@@ -185,9 +185,11 @@ jobs:
 
       - name: Add comment environment
         if: ${{ github.event_name == 'issue_comment' }}
+        env:
+          COMMENT_BODY: ${{ github.event.comment.body }}
         run: |
           # Add comment environment
-          echo '${{ github.event.comment.body }}' | sed -r 's/\r$//' | grep -E '^\w+=' | while read -r line; do
+          echo $COMMENT_BODY | sed -r 's/\r$//' | grep -E '^\w+=' | while read -r line; do
               opt=$(echo ${line} | cut -d '=' -f1)
               sed -i "s;^${opt}=.*$;${line};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
           done
 
@@ -7,7 +7,7 @@ Templates for use when creating osu! dependent projects. Create a fully-testable
 ```bash
 # install (or update) templates package.
 # this only needs to be done once
-dotnet new -i ppy.osu.Game.Templates
+dotnet new install ppy.osu.Game.Templates
 
 # create an empty freeform ruleset
 dotnet new ruleset -n MyCoolRuleset
 
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1012.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1111.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
 
@@ -70,7 +70,7 @@ private void load(OsuConfigManager osuConfig)
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = MouseSettingsStrings.DisableMouseButtons,
+                    LabelText = MouseSettingsStrings.DisableClicksDuringGameplay,
                     Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons),
                 },
             });
 
@@ -11,6 +11,7 @@
 using osu.Framework.Platform;
 using osu.Game;
 using osu.Game.Overlays.Settings;
+using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Updater;
 using osu.Game.Utils;
 
@@ -97,6 +98,9 @@ public override SettingsSubsection CreateSettingsSubsectionFor(InputHandler hand
                 case AndroidJoystickHandler jh:
                     return new AndroidJoystickSettings(jh);
 
+                case AndroidTouchHandler th:
+                    return new TouchSettings(th);
+
                 default:
                     return base.CreateSettingsSubsectionFor(handler);
             }
 
@@ -10,8 +10,8 @@
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Screens.Play;
-using Squirrel;
 using Squirrel.SimpleSplat;
+using Squirrel.Sources;
 using LogLevel = Squirrel.SimpleSplat.LogLevel;
 using UpdateManager = osu.Game.Updater.UpdateManager;
 
@@ -63,7 +63,7 @@ private async Task<bool> checkForUpdateAsync(bool useDeltaPatching = true, Updat
                 if (localUserInfo?.IsPlaying.Value == true)
                     return false;
 
-                updateManager ??= new GithubUpdateManager(@"https://github.com/ppy/osu", false, github_token, @"osulazer");
+                updateManager ??= new Squirrel.UpdateManager(new GithubSource(@"https://github.com/ppy/osu", github_token, false), @"osulazer");
 
                 var info = await updateManager.CheckForUpdate(!useDeltaPatching).ConfigureAwait(false);
 
 
@@ -23,7 +23,7 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Clowd.Squirrel" Version="2.9.42" />
+    <PackageReference Include="Clowd.Squirrel" Version="2.10.2" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="7.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
 
@@ -28,9 +28,9 @@ public void TestCatchSkinColourDecoding()
 
         private class TestLegacySkin : LegacySkin
         {
-            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage)
+            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> fallbackStore)
                 // Bypass LegacySkinResourceStore to avoid returning null for retrieving files due to bad skin info (SkinInfo.Files = null).
-                : base(skin, null, storage)
+                : base(skin, null, fallbackStore)
             {
             }
         }
 
@@ -10,6 +10,7 @@
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
@@ -179,5 +180,33 @@ public override SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePositio
                     return null;
             }
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            updateDistanceSnapGrid();
+        }
+
+        private void updateDistanceSnapGrid()
+        {
+            if (DistanceSnapProvider.DistanceSnapToggle.Value != TernaryState.True)
+            {
+                distanceSnapGrid.Hide();
+                return;
+            }
+
+            var sourceHitObject = getDistanceSnapGridSourceHitObject();
+
+            if (sourceHitObject == null)
+            {
+                distanceSnapGrid.Hide();
+                return;
+            }
+
+            distanceSnapGrid.Show();
+            distanceSnapGrid.StartTime = sourceHitObject.GetEndTime();
+            distanceSnapGrid.StartX = sourceHitObject.EffectiveX;
+        }
     }
 }
@@ -4,6 +4,7 @@ Version: 2.5
 [Mania]
 Keys: 4
 ColumnLineWidth: 3,1,3,1,1
+LightFramePerSecond: 15
 // some skins found in the wild had configuration keys where the @2x suffix was included in the values.
 // the expected compatibility behaviour is that the presence of the @2x suffix shouldn't change anything
 // if @2x assets are present.
@@ -15,5 +16,6 @@ Hit300: mania/hit300@2x
 Hit300g: mania/hit300g@2x
 StageLeft: mania/stage-left
 StageRight: mania/stage-right
+StageLight: mania/stage-light
 NoteImage0L: LongNoteTailWang
 NoteImage1L: LongNoteTailWang
@@ -255,24 +255,26 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new MultiMod(new ManiaModKey4(),
-                            new ManiaModKey5(),
-                            new ManiaModKey6(),
-                            new ManiaModKey7(),
-                            new ManiaModKey8(),
-                            new ManiaModKey9(),
-                            new ManiaModKey10(),
-                            new ManiaModKey1(),
-                            new ManiaModKey2(),
-                            new ManiaModKey3()),
                         new ManiaModRandom(),
                         new ManiaModDualStages(),
                         new ManiaModMirror(),
                         new ManiaModDifficultyAdjust(),
                         new ManiaModClassic(),
                         new ManiaModInvert(),
                         new ManiaModConstantSpeed(),
-                        new ManiaModHoldOff()
+                        new ManiaModHoldOff(),
+                        new MultiMod(
+                            new ManiaModKey1(),
+                            new ManiaModKey2(),
+                            new ManiaModKey3(),
+                            new ManiaModKey4(),
+                            new ManiaModKey5(),
+                            new ManiaModKey6(),
+                            new ManiaModKey7(),
+                            new ManiaModKey8(),
+                            new ManiaModKey9(),
+                            new ManiaModKey10()
+                        ),
                     };
 
                 case ModType.Automation:
 
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
@@ -160,6 +161,18 @@ public ManiaArgonSkinTransformer(ISkin skin, IBeatmap beatmap)
                         }
 
 
+                        float width;
+
+                        bool isSpecialColumn = stage.IsSpecialColumn(columnIndex);
+
+                        // Best effort until we have better mobile support.
+                        if (RuntimeInfo.IsMobile)
+                            width = 170 * Math.Min(1, 7f / beatmap.TotalColumns) * (isSpecialColumn ? 1.8f : 1);
+                        else
+                            width = 60 * (isSpecialColumn ? 2 : 1);
+
+                        return SkinUtils.As<TValue>(new Bindable<float>(width));
+
                     case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
 
                         var colour = getColourForLayout(columnIndex, stage);
 
@@ -91,7 +91,7 @@ private void load(ISkinSource skin, IScrollingInfo scrollingInfo, DrawableHitObj
             direction.BindTo(scrollingInfo.Direction);
             isHitting.BindTo(holdNote.IsHitting);
 
-            bodySprite = skin.GetAnimation(imageName, wrapMode, wrapMode, true, true).With(d =>
+            bodySprite = skin.GetAnimation(imageName, wrapMode, wrapMode, true, true, frameLength: 30).With(d =>
             {
                 if (d == null)
                     return;
 
@@ -5,7 +5,6 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -20,7 +19,7 @@ public partial class LegacyColumnBackground : LegacyManiaColumnElement, IKeyBind
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         private Container lightContainer = null!;
-        private Sprite light = null!;
+        private Drawable light = null!;
 
         public LegacyColumnBackground()
         {
@@ -39,23 +38,24 @@ private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
             Color4 lightColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
                                  ?? Color4.White;
 
+            int lightFramePerSecond = skin.GetManiaSkinConfig<int>(LegacyManiaSkinConfigurationLookups.LightFramePerSecond)?.Value ?? 60;
+
             InternalChildren = new[]
             {
                 lightContainer = new Container
                 {
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Bottom = lightPosition },
-                    Child = light = new Sprite
+                    Child = light = skin.GetAnimation(lightImage, true, true, frameLength: 1000d / lightFramePerSecond)?.With(l =>
                     {
-                        Anchor = Anchor.BottomCentre,
-                        Origin = Anchor.BottomCentre,
-                        Colour = LegacyColourCompatibility.DisallowZeroAlpha(lightColour),
-                        Texture = skin.GetTexture(lightImage),
-                        RelativeSizeAxes = Axes.X,
-                        Width = 1,
-                        Alpha = 0
-                    }
+                        l.Anchor = Anchor.BottomCentre;
+                        l.Origin = Anchor.BottomCentre;
+                        l.Colour = LegacyColourCompatibility.DisallowZeroAlpha(lightColour);
+                        l.RelativeSizeAxes = Axes.X;
+                        l.Width = 1;
+                        l.Alpha = 0;
+                    }) ?? Empty(),
                 }
             };
 
 
@@ -138,7 +138,7 @@ private Drawable getResult(HitResult result)
             string filename = this.GetManiaSkinConfig<string>(hit_result_mapping[result])?.Value
                               ?? default_hit_result_skin_filenames[result];
 
-            var animation = this.GetAnimation(filename, true, true);
+            var animation = this.GetAnimation(filename, true, true, frameLength: 1000 / 20d);
             return animation == null ? null : new LegacyManiaJudgementPiece(result, animation);
         }
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ private void load(OsuConfigManager osuConfig)`
`70`	`70`	`},`
`71`	`71`	`new SettingsCheckbox`
`72`	`72`	`{`
`73`		`- LabelText = MouseSettingsStrings.DisableMouseButtons,`
	`73`	`+ LabelText = MouseSettingsStrings.DisableClicksDuringGameplay,`
`74`	`74`	`Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons),`
`75`	`75`	`},`
`76`	`76`	`});`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@ public void TestCatchSkinColourDecoding()`
`28`	`28`
`29`	`29`	`private class TestLegacySkin : LegacySkin`
`30`	`30`	`{`
`31`		`- public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage)`
	`31`	`+ public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> fallbackStore)`
`32`	`32`	`// Bypass LegacySkinResourceStore to avoid returning null for retrieving files due to bad skin info (SkinInfo.Files = null).`
`33`		`- : base(skin, null, storage)`
	`33`	`+ : base(skin, null, fallbackStore)`
`34`	`34`	`{`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ private void load(ISkinSource skin, IScrollingInfo scrollingInfo, DrawableHitObj`
`91`	`91`	`direction.BindTo(scrollingInfo.Direction);`
`92`	`92`	`isHitting.BindTo(holdNote.IsHitting);`
`93`	`93`
`94`		`- bodySprite = skin.GetAnimation(imageName, wrapMode, wrapMode, true, true).With(d =>`
	`94`	`+ bodySprite = skin.GetAnimation(imageName, wrapMode, wrapMode, true, true, frameLength: 30).With(d =>`
`95`	`95`	`{`
`96`	`96`	`if (d == null)`
`97`	`97`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ private Drawable getResult(HitResult result)`
`138`	`138`	`string filename = this.GetManiaSkinConfig<string>(hit_result_mapping[result])?.Value`
`139`	`139`	`?? default_hit_result_skin_filenames[result];`
`140`	`140`
`141`		`- var animation = this.GetAnimation(filename, true, true);`
	`141`	`+ var animation = this.GetAnimation(filename, true, true, frameLength: 1000 / 20d);`
`142`	`142`	`return animation == null ? null : new LegacyManiaJudgementPiece(result, animation);`
`143`	`143`	`}`
`144`	`144`