1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 04:42:55 +08:00
Commit Graph

53975 Commits

Author SHA1 Message Date
Salman Ahmed
f1133ca8f6
Merge branch 'master' into fix-multiplayer-participant-panel-null-ruleset 2022-07-18 18:15:32 +03:00
Dean Herbert
e14e2cca45
Merge pull request #19212 from peppy/fix-audio-equality-fuck
Fix audio/background equality not correctly using `BeatmapInfo` local filenames
2022-07-18 19:28:51 +09:00
Salman Ahmed
2789a97e68
Merge branch 'master' into fix-multiplayer-participant-panel-null-ruleset 2022-07-18 12:55:41 +03:00
Dean Herbert
d6dd98a5a1
Merge pull request #19138 from frenzibyte/remove-countries-json
Remove `countries.json` map in tournament client and replace with `Country` enum
2022-07-18 18:54:54 +09:00
Salman Ahmed
2befcfedbb
Merge branch 'master' into fix-multiplayer-participant-panel-null-ruleset 2022-07-18 12:24:47 +03:00
Dean Herbert
0c75245806
Merge pull request #19139 from frenzibyte/score-country-storage
Support storing user country on databased scores
2022-07-18 18:13:57 +09:00
Salman Ahmed
b6750961a0
Merge pull request #19192 from tsunyoku/fix-user-profile-overlay
Update profile web overlay to use `SoloScoreInfo`
2022-07-18 12:08:02 +03:00
Dean Herbert
22a9e7e275 Fix audio/background equality not correctly using BeatmapInfo local filenames 2022-07-18 17:05:21 +09:00
Dean Herbert
18da9ddfbf Add test coverage of two beatmaps in same set with different audio files 2022-07-18 17:05:21 +09:00
Dean Herbert
caa44ce01e Update naming 2022-07-18 16:40:11 +09:00
Dean Herbert
d909a1fd46 Merge branch 'master' into remove-countries-json 2022-07-18 16:38:53 +09:00
Salman Ahmed
b5c7d07ba8
Merge branch 'master' into fix-user-profile-overlay 2022-07-18 10:27:33 +03:00
Dean Herbert
b8c90266de
Merge pull request #19209 from 3stantedja/make-contracted-stats-titlecase
Make sure stats name are title-cased when score panel is contracted
2022-07-18 16:26:20 +09:00
Dean Herbert
933a41554b
Merge pull request #19187 from peppy/fix-reconnect-new-spectator-session
Fix spectator client not correctly reconnecting after shutdown
2022-07-18 16:25:04 +09:00
Dean Herbert
1e151baae8 Use Unknown instead of default 2022-07-18 16:24:08 +09:00
Dean Herbert
51f91fe62e Update naming 2022-07-18 16:17:20 +09:00
Dean Herbert
eddf106f7c
Merge branch 'master' into score-country-storage 2022-07-18 16:12:40 +09:00
Dean Herbert
a7f19cc796
Merge pull request #19137 from frenzibyte/country-enum
Replace `Country` class with enumeration
2022-07-18 16:12:24 +09:00
Salman Ahmed
e86a35fe33 Fix NRE on footer button mods 2022-07-18 10:09:14 +03:00
Salman Ahmed
045602b27d
Merge branch 'master' into fix-reconnect-new-spectator-session 2022-07-18 09:55:19 +03:00
Salman Ahmed
e4d11febc5 Remove no longer necessary fallback 2022-07-18 09:47:40 +03:00
Dean Herbert
a21cd1cd47
Merge pull request #19169 from tsunyoku/retry-icon
Change retry button icon from ArrowCircleLeft to Redo
2022-07-18 15:47:24 +09:00
Salman Ahmed
84c1c26a7f
Merge branch 'master' into fix-user-profile-overlay 2022-07-18 09:45:25 +03:00
Dean Herbert
e8b57379b2
Merge pull request #19210 from peppy/non-null-ended-at
Make `SoloScoreInfo.EndedAt` non-null
2022-07-18 15:42:33 +09:00
Dean Herbert
24836e2b21
Merge pull request #19207 from frenzibyte/standalone-display-show-chat
Fix "Start Chat" on multiplayer/playlist chat not opening overlay
2022-07-18 15:42:13 +09:00
Salman Ahmed
1b302910b1
Merge branch 'master' into fix-reconnect-new-spectator-session 2022-07-18 09:30:29 +03:00
Dean Herbert
a036632c8b Fix potential crash when attempting to create mod display using null ruleset 2022-07-18 15:30:21 +09:00
Dean Herbert
21bf7ee448 Turn on nullability in ParticipantPanel 2022-07-18 15:27:55 +09:00
Salman Ahmed
018da74fe8 Replace default with CountryCode.Unknown 2022-07-18 08:54:35 +03:00
Salman Ahmed
cf99849478 CountryCode.XX -> CountryCode.Unknown 2022-07-18 08:45:54 +03:00
Salman Ahmed
05d692bd55 Move Country to end of class 2022-07-18 08:43:41 +03:00
Dean Herbert
566bad0b5f Make SoloScoreInfo.EndedAt non-null
Seems to already be the case for databased scores. Will be assured by
https://github.com/ppy/osu-web/issues/9116.

I've updated the `osu-score-statistics-processor` with this
consideration.
2022-07-18 14:42:43 +09:00
Salman Ahmed
ef6e16b1cb UserCountry -> Country 2022-07-18 08:40:43 +03:00
Salman Ahmed
100c53f9ef Country -> CountryCode 2022-07-18 08:40:34 +03:00
Dean Herbert
0533249d11 Update all OnlineSpectatorCalls to InvokeAsync 2022-07-18 14:34:02 +09:00
Salman Ahmed
eddae7b143 Fix mod overlay and footer not updating multiplayer on settings change 2022-07-18 07:38:56 +03:00
Salman Ahmed
222a50c457
Merge pull request #19201 from tsunyoku/cinema-repel-incompatible
Fix "Cinema" mod not marking "Repel" as incompatible
2022-07-18 07:30:15 +03:00
Salman Ahmed
32ba58109b Remove score multiplier on difficulty-increasing mods with customised settings 2022-07-18 07:29:03 +03:00
Salman Ahmed
6bfa5e53e0 Add property for whether mod uses default configuration 2022-07-18 07:29:03 +03:00
Fyra Tedja
6ad7723d60 Make sure stats name are title-cased when score panel is contracted 2022-07-17 22:13:08 -06:00
Salman Ahmed
0ac3391d54
Merge branch 'master' into cinema-repel-incompatible 2022-07-18 06:55:43 +03:00
Salman Ahmed
eb3410ce79
Merge pull request #19200 from tsunyoku/perfect-autopilot-incompatible
Fix "Perfect" mod not marking "Autopilot" as incompatible
2022-07-18 06:54:54 +03:00
Salman Ahmed
b33f8aa0fc Fix "Start Chat" on multiplayer/playlist chat not opening overlay 2022-07-18 06:45:00 +03:00
Salman Ahmed
b86d08ae82
Merge branch 'master' into perfect-autopilot-incompatible 2022-07-18 06:24:22 +03:00
Salman Ahmed
b659e5e6ad
Merge pull request #19196 from peppy/silence-ruleset-config-failures
Don't send ruleset configuration failures to sentry
2022-07-18 06:23:51 +03:00
Salman Ahmed
a1a9132600
Merge branch 'master' into silence-ruleset-config-failures 2022-07-18 05:52:12 +03:00
Salman Ahmed
4dcb9387f7
Merge pull request #19188 from peppy/silence-missing-background
Don't show "missing background" messages to user
2022-07-18 04:19:52 +03:00
Salman Ahmed
7e4ce89981 Include mod settings in profile score mod icons 2022-07-18 04:03:18 +03:00
Salman Ahmed
dc8dabfdf1
Merge branch 'master' into silence-ruleset-config-failures 2022-07-18 03:52:40 +03:00
Salman Ahmed
ee98ebf801
Merge branch 'master' into silence-missing-background 2022-07-18 03:46:35 +03:00