Merge branch 'master' into check-before-btn-change

2025-02-15 14:42:56 +08:00 · 2018-10-22 17:29:26 +09:00 · 2018-10-22 17:29:26 +09:00 · 412f65bb70
commit 412f65bb70
parent 05d89180c8 a13f3068c5
7 changed files with 25 additions and 43 deletions
--- a/appveyor_deploy.yml
+++ b/appveyor_deploy.yml
@ -1,30 +0,0 @@
-clone_depth: 1
-version: '{build}'
-skip_non_tags: true
-image: Visual Studio 2017
-install:
-  - git clone https://github.com/ppy/osu-deploy
-before_build:
-  - ps: if($env:appveyor_repo_tag -eq 'True') { Update-AppveyorBuild -Version $env:appveyor_repo_tag_name }
-  - cmd: git submodule update --init --recursive --depth=5
-  - cmd: nuget restore -verbosity quiet
-build_script:
-  - ps: iex ((New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/appveyor/secure-file/master/install.ps1'))
-  - appveyor DownloadFile https://www.dropbox.com/s/f7hv069mr5tqi2j/deanherbert.pfx.enc?dl=1 # signing certificate
-  - cmd: appveyor-tools\secure-file -decrypt deanherbert.pfx.enc -secret %decode_secret% -out %HOMEPATH%\deanherbert.pfx
-  - appveyor DownloadFile https://puu.sh/A6g75/fdc6f19b04.enc # deploy configuration
-  - cd osu-deploy
-  - nuget restore -verbosity quiet
-  - msbuild osu.Desktop.Deploy.csproj
-  - cmd: ..\appveyor-tools\secure-file -decrypt ..\fdc6f19b04.enc -secret %decode_secret% -out bin\Debug\netcoreapp2.1\osu.Desktop.Deploy.dll.config
-  - dotnet bin/Debug/netcoreapp2.1/osu.Desktop.Deploy.dll %code_signing_password% %APPVEYOR_REPO_TAG_NAME%
-environment:
-  decode_secret:
-    secure: i67IC2xj6DjjxmA6Oj2jing3+MwzLkq6CbGsjfZ7rdY=
-  code_signing_password:
-    secure: 34tLNqvjmmZEi97MLKfrnQ==
-artifacts:
-  - path: 'osu-deploy/releases/*'
-deploy:
-  - provider: Environment
-    name: github
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@ -27,7 +27,7 @@
  </ItemGroup>
  <ItemGroup Label="Package References">
    <PackageReference Include="System.IO.Packaging" Version="4.5.0" />
-    <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.1" />
+    <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.2" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.4" />
  </ItemGroup>
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
@ -43,7 +43,10 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                    Position = positionData?.Position ?? Vector2.Zero,
                    NewCombo = comboData?.NewCombo ?? false,
                    ComboOffset = comboData?.ComboOffset ?? 0,
-                    LegacyLastTickOffset = legacyOffset?.LegacyLastTickOffset
+                    LegacyLastTickOffset = legacyOffset?.LegacyLastTickOffset,
+                    // prior to v8, speed multipliers don't adjust for how many ticks are generated over the same distance.
+                    // this results in more (or less) ticks being generated in <v8 maps for the same time duration.
+                    TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1f / beatmap.ControlPointInfo.DifficultyPointAt(original.StartTime).SpeedMultiplier : 1
                };
            }
            else if (endTimeData != null)
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@ -75,15 +75,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
            {
                computeSliderCursorPosition(lastSlider);
                lastCursorPosition = lastSlider.LazyEndPosition ?? lastCursorPosition;
+
+                TravelDistance = lastSlider.LazyTravelDistance * scalingFactor;
            }

            // Don't need to jump to reach spinners
            if (!(BaseObject is Spinner))
                JumpDistance = (BaseObject.StackedPosition * scalingFactor - lastCursorPosition * scalingFactor).Length;
-
-            // Todo: BUG!!! Last slider's travel distance is considered ONLY IF we ourselves are also a slider!
-            if (BaseObject is Slider)
-                TravelDistance = (lastSlider?.LazyTravelDistance ?? 0) * scalingFactor;
        }

        private void setTimingValues()
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@ -92,8 +92,21 @@ namespace osu.Game.Rulesets.Osu.Objects
        /// </summary>
        public double SpanDuration => Duration / this.SpanCount();

-        public double Velocity;
-        public double TickDistance;
+        /// <summary>
+        /// Velocity of this <see cref="Slider"/>.
+        /// </summary>
+        public double Velocity { get; private set; }
+
+        /// <summary>
+        /// Spacing between <see cref="SliderTick"/>s of this <see cref="Slider"/>.
+        /// </summary>
+        public double TickDistance { get; private set; }
+
+        /// <summary>
+        /// An extra multiplier that affects the number of <see cref="SliderTick"/>s generated by this <see cref="Slider"/>.
+        /// An increase in this value increases <see cref="TickDistance"/>, which reduces the number of ticks generated.
+        /// </summary>
+        public double TickDistanceMultiplier = 1;

        public HitCircle HeadCircle;
        public SliderTailCircle TailCircle;
@ -108,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Objects
            double scoringDistance = base_scoring_distance * difficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier;

            Velocity = scoringDistance / timingPoint.BeatLength;
-            TickDistance = scoringDistance / difficulty.SliderTickRate;
+            TickDistance = scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier;
        }

        protected override void CreateNestedHitObjects()
--- a/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
@ -49,9 +49,7 @@ namespace osu.Game.Tests.Visual
                            Vector2.Zero,
                            new Vector2(216, 0),
                        },
-                        Distance = 400,
-                        Velocity = 1,
-                        TickDistance = 100,
+                        Distance = 216,
                        Scale = 0.5f,
                    }
                },
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@ -18,7 +18,7 @@
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.1.4" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2018.1012.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2018.1018.0" />
    <PackageReference Include="SharpCompress" Version="0.22.0" />
    <PackageReference Include="NUnit" Version="3.11.0" />
    <PackageReference Include="SharpRaven" Version="2.4.0" />