1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 14:47:26 +08:00
Commit Graph

29022 Commits

Author SHA1 Message Date
Dean Herbert
73b09f3b3d
Merge pull request #15409 from smoogipoo/fix-pp-counter-rate-adjust
Fix PP counter showing incorrect values with rate adjustment mods
2021-11-03 00:06:13 +09:00
smoogipoo
81aaef719f Add xmldoc to CalculateTimed() 2021-11-02 17:55:00 +09:00
smoogipoo
168a7a588b Add xmldoc to ctor also 2021-11-02 17:19:14 +09:00
smoogipoo
efba7a9c4d Missed hyphen 2021-11-02 17:18:02 +09:00
smoogipoo
0cdd2898fe Expose non-adjusted time from CalculateTimed() 2021-11-02 17:17:14 +09:00
Dean Herbert
135df0e190 Avoid adding null users to RecentParticipants 2021-11-02 17:13:37 +09:00
Dean Herbert
1bfa1365a0 Rename "null user" tests to better explain purpose 2021-11-02 17:13:37 +09:00
Dean Herbert
b0bd39fc49 Fix multiplayer room participants display not updating as new users join/leave
Can add tests on request, but not sure the code around this area is here
to stay permanently. Should be pretty low risk.

- Closes https://github.com/ppy/osu/issues/14788.
2021-11-02 17:13:37 +09:00
smoogipoo
eaeee80a26 Fix PP counter showing incorrect values with rate adjustment mods 2021-11-02 16:55:20 +09:00
Dan Balasescu
6f941a8916
Merge pull request #15405 from peppy/legacy-decoder-default-section
Default legacy decoder to `General` section, rather than none
2021-11-02 15:42:25 +09:00
smoogipoo
1e9211c00b Use explicit type 2021-11-02 15:41:25 +09:00
Dean Herbert
5d784b2ef8 Perform a consistency check by decoding the newly written skin.ini during ComputeHash
As this has regressed twice now, let's play it safe and bail rather than
stack overflowing. Note that as all the underlying issues that could
trigger this have been fixed, no additional tests have been added. To
test, comment out `SkinManager.cs` line 228-229 to cause a failure. The
new logic will kick in and show a log output message, but all tests will
still (correctly) pass.
2021-11-02 14:11:25 +09:00
Dean Herbert
2e66ab453d Always write automated changes to skin metadata at the end of the file
Apart from being cleaner (and allowing removal at the point of export,
if that is ever requires), this also gives us a better guarantee that
the metadata is going to take effect.

By writing the `[General]` section ourselves, we avoid any issues that
may be present from a user constructing the file (incorrectly)
themselves, such as multiple `Title:` entries or a malformed `[General]`
marker.

The main goal is to ensure that the name is updated to what we expect it
to be.
2021-11-02 14:11:25 +09:00
Dean Herbert
15c770e155 Remove no longer used Section.None 2021-11-02 14:01:41 +09:00
Dean Herbert
ab28948744 Default legacy decoder to General section, rather than none
This is mainly to reach parity with how stable handles such cases for
skins specifically. It was brought to our attention after finding a skin
with a malformed `\[General]` tag which did not break further parsing of
the file on stable, but did on lazer.

Note that stable defaults to an "unknown" section for beatmaps, but
functionally I can't think of a regression case from changing this to a
"general" default.
2021-11-02 13:59:13 +09:00
Bartłomiej Dach
90fb536a25
Merge branch 'dependabot/nuget/Microsoft.AspNetCore.SignalR.Client-5.0.11' into update-dependencies 2021-11-01 20:53:43 +01:00
Bartłomiej Dach
d05d0f2b88
Merge branch 'dependabot/nuget/Sentry-3.10.0' into update-dependencies 2021-11-01 20:53:19 +01:00
Bartłomiej Dach
bfcd7948fe
Merge branch 'dependabot/nuget/Microsoft.AspNetCore.SignalR.Protocols.MessagePack-5.0.11' into update-dependencies 2021-11-01 20:52:56 +01:00
Bartłomiej Dach
e4672981d8
Merge branch 'dependabot/nuget/SharpCompress-0.30.0' into update-dependencies 2021-11-01 20:52:44 +01:00
dependabot[bot]
3b7379b777
Bump Microsoft.AspNetCore.SignalR.Client from 5.0.10 to 5.0.11
Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/dotnet/aspnetcore) from 5.0.10 to 5.0.11.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.10...v5.0.11)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.SignalR.Client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 17:02:20 +00:00
dependabot[bot]
e0a940be1d
Bump Sentry from 3.9.4 to 3.10.0
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 3.9.4 to 3.10.0.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/3.9.4...3.10.0)

---
updated-dependencies:
- dependency-name: Sentry
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 17:02:14 +00:00
dependabot[bot]
f215439b4f
Bump Microsoft.AspNetCore.SignalR.Protocols.MessagePack
Bumps [Microsoft.AspNetCore.SignalR.Protocols.MessagePack](https://github.com/dotnet/aspnetcore) from 5.0.10 to 5.0.11.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.10...v5.0.11)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.SignalR.Protocols.MessagePack
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 17:02:10 +00:00
dependabot[bot]
f8f4b9d3d3
Bump SharpCompress from 0.29.0 to 0.30.0
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.29.0 to 0.30.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.29...0.30)

---
updated-dependencies:
- dependency-name: SharpCompress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 17:02:04 +00:00
dependabot[bot]
f893556b80
Bump Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/dotnet/aspnetcore) from 5.0.10 to 5.0.11.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.10...v5.0.11)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 17:02:00 +00:00
Dean Herbert
3a5aed1182 Ensure APIScoreInfo.Mods is non-null 2021-11-01 22:59:12 +09:00
Dean Herbert
caa9d8997b Merge branch 'master' into score-refactor/less-create-score-info 2021-11-01 22:59:11 +09:00
Bartłomiej Dach
793c384ecd
Remove unnecessary null-conditional access 2021-11-01 12:02:37 +01:00
Bartłomiej Dach
5dcff7d8b7
Merge branch 'master' into score-refactor/less-create-score-info 2021-11-01 11:41:20 +01:00
Dan Balasescu
95b1f5830d
Merge branch 'master' into beatmap-refactor/beatmap-overlays 2021-11-01 19:32:07 +09:00
Dan Balasescu
8c38698506
Merge pull request #15363 from peppy/beatmap-refactor/get-and-present
Update `GetScoreRequest` and `PresentBeatmap` to accept interface types
2021-11-01 19:28:28 +09:00
Dan Balasescu
65d2b54ef6
Merge pull request #15387 from bdach/fix-score-download-tracker
Fix incorrect state transition in score download tracker
2021-11-01 18:36:35 +09:00
Dean Herbert
b21e0e7efb Merge branch 'beatmap-refactor/get-and-present' into beatmap-refactor/beatmap-overlays 2021-11-01 18:07:51 +09:00
Dean Herbert
602fe372c2 Merge branch 'score-refactor/isolated-serialisation' into beatmap-refactor/get-and-present 2021-11-01 18:06:53 +09:00
Dean Herbert
5dcc940864
Merge branch 'master' into fix-score-download-tracker 2021-11-01 17:50:34 +09:00
Bartłomiej Dach
f5feed138d
Merge branch 'master' into score-refactor/isolated-serialisation 2021-11-01 09:43:51 +01:00
Bartłomiej Dach
cd4681496a
Fix incorrect state transition in score download tracker 2021-11-01 09:35:02 +01:00
Dean Herbert
63c9512ab1 Update dashboard components to use APIBeatmapSet 2021-11-01 16:04:01 +09:00
Dean Herbert
722e0d50bb Fix BeatmapInfo not being correctly populated in CreateScoreInfo call 2021-11-01 15:54:39 +09:00
Dan Balasescu
c51349de57
Merge pull request #15358 from peppy/online-id-potentially-zero
Add a note about `OnlineID` potentially being zero in non-autoincrement cases
2021-11-01 15:54:08 +09:00
Dean Herbert
b98faf6159 Merge branch 'master' into score-refactor/isolated-serialisation 2021-11-01 15:49:25 +09:00
Dan Balasescu
9e633a1b17
Merge pull request #15321 from peppy/beatmap-refactor/download-tracker
Replace `DownloadTrackingComposite` with instantiable `DownloadTracker` components
2021-11-01 15:48:12 +09:00
smoogipoo
94dce3f92a Remove whitespace 2021-11-01 15:43:19 +09:00
Dan Balasescu
cd9ee7723a
Merge pull request #15384 from peppy/fix-tourney-map-pool-creator-shows-twice
Fix beatmap creator showing twice in tournament map pool panels
2021-11-01 15:24:54 +09:00
Dean Herbert
227963047a Fix hash validity check function returning incorrect results after soft deleting a beatmap
The soft-deleted one would potentially match before the newly imported
copy, resulting in a false-positive hash mismatch.
2021-11-01 15:15:45 +09:00
Dean Herbert
123b10f647 Fix playlist item download button being clickable when it shouldn't 2021-11-01 15:10:32 +09:00
Dean Herbert
21e0074d3b Add missing AddInternal call for BeatmapSetHeaderContent's download tracker 2021-11-01 14:43:32 +09:00
Dean Herbert
10a9266956 Fix beatmap creator showing twice in tournament map pool panels 2021-11-01 14:33:24 +09:00
Dean Herbert
6b250955d7 Add missing verbatim string markers 2021-11-01 14:24:38 +09:00
Dean Herbert
5bfb16efe2 Ignore case when searching for existing skin.ini 2021-11-01 14:24:38 +09:00
Dean Herbert
708b57348d Change loose api ordering requirement to throw instead 2021-11-01 13:22:16 +09:00