h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 13:32:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-tablet-mania-column-sizing

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-12-15 20:58:34 +01:00
commit df887abae9
No known key found for this signature in database
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Rulesets/Scoring/HitResult.cs
View File

@ -139,9 +139,12 @@ namespace osu.Game.Rulesets.Scoring
/// <summary>
/// A special result used as a padding value for legacy rulesets. It is a hit type and affects combo, but does not affect the base score (does not affect accuracy).
///
/// DO NOT USE FOR ANYTHING EVER.
/// </summary>
/// <remarks>
/// DO NOT USE.
/// This is used when dealing with legacy scores, which historically only have counts stored for 300/100/50/miss.
/// For these scores, we pad the hit statistics with `LegacyComboIncrease` to meet the correct max combo for the score.
/// </remarks>
[EnumMember(Value = "legacy_combo_increase")]
[Order(99)]

2
osu.Game/osu.Game.csproj
View File

@ -37,7 +37,7 @@
</PackageReference>
<PackageReference Include="Realm" Version="11.5.0" />
<PackageReference Include="ppy.osu.Framework" Version="2023.1213.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2023.1127.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2023.1215.0" />
<PackageReference Include="Sentry" Version="3.40.0" />
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
<PackageReference Include="SharpCompress" Version="0.33.0" />