1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 09:42:54 +08:00
Commit Graph

53439 Commits

Author SHA1 Message Date
Dean Herbert
d909a1fd46 Merge branch 'master' into remove-countries-json 2022-07-18 16:38:53 +09: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
a7f19cc796
Merge pull request #19137 from frenzibyte/country-enum
Replace `Country` class with enumeration
2022-07-18 16:12:24 +09:00
Salman Ahmed
045602b27d
Merge branch 'master' into fix-reconnect-new-spectator-session 2022-07-18 09:55:19 +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
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
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
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
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
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
tsunyoku
83429d2f22 make cinema incompatible with repel 2022-07-17 20:45:17 +01:00
tsunyoku
491558261f remove unnecessary type-specification 2022-07-17 20:44:06 +01:00
tsunyoku
e13c1254e5 make perfect incompatible with autopilot 2022-07-17 20:41:43 +01:00
Dean Herbert
f8685bf7d6
Merge pull request #19195 from NotGumballer91/make-autoplay-incompatible-with-adaptivespeed
Make Autoplay Incompatible with Adaptive Speed
2022-07-18 03:58:48 +09:00
Dean Herbert
1cfa6676ea
Merge pull request #19175 from frenzibyte/fix-solo-score-info-mod-settings
Fix `SoloScoreInfo` not carrying mod settings in conversion methods
2022-07-18 01:37:25 +09:00
Dean Herbert
4e8bf1da52 Don't sent ruleset configuration failures to sentry 2022-07-18 01:23:46 +09:00
NotGumballer91
028653eb97
Update ModAdaptiveSpeed.cs 2022-07-18 00:10:49 +08:00
NotGumballer91
1caab78bdc
Update ModAutoplay.cs 2022-07-18 00:09:31 +08:00
Dean Herbert
51071be315 Don't show "missing background" messages to user
Bit of an oversight.

As reported on [twitter](https://twitter.com/emyl___/status/1548627793075998720) and somewhere else i forgot.
2022-07-17 21:20:51 +09:00
Dean Herbert
8e7e1e6b51 Fix spectator client not correctly reconnecting after shutdown 2022-07-17 21:07:11 +09:00
Salman Ahmed
9382636da9 Catch and log exceptions from mod setting copy failure 2022-07-17 06:34:50 +03:00
Salman Ahmed
6636e462dc Fix SoloScoreInfo not carrying mod settings in conversion methods 2022-07-17 06:18:59 +03:00
tsunyoku
bbb2398a8b change retry button icon from ArrowCircleLeft to Redo 2022-07-17 00:46:29 +01:00
Dan Balasescu
5b9be3e682
Merge pull request #19140 from peppy/single-tap-acronym
Change "single tap" mod acronym to not conflict with "strict tracking"
2022-07-16 17:49:22 +09:00
Dean Herbert
b93b6ba2ca Change "single tap" mod acronym to not conflict with "strict tracking" 2022-07-16 17:19:55 +09:00
Dean Herbert
acd5254f51 Add test coverage ensuring unique acronyms 2022-07-16 17:19:55 +09:00
Dean Herbert
9e945197dc Use "Unknown" instead of "Alient" for unknown countries 2022-07-16 14:49:14 +09:00
Dean Herbert
5df9f06480
Merge pull request #19136 from frenzibyte/handle-user-request-failure
Fix login overlay not displaying error message for disabled accounts
2022-07-16 14:40:28 +09:00
Salman Ahmed
a10c398cd5 Remove no longer necessary DI 2022-07-16 06:40:53 +03:00
Salman Ahmed
fd8a9a5382 Merge branch 'country-enum' into remove-countries-json 2022-07-16 06:40:23 +03:00
Salman Ahmed
4968859e69 Rename placeholder display flag property to make sense 2022-07-16 06:07:53 +03:00
Salman Ahmed
9c81241f4c Fix potential nullref on APIUser.Country
We need NRT sooner than later...
2022-07-16 06:02:05 +03:00
Salman Ahmed
7c6f4b798b Replace countries.json with country enum and acronym extension 2022-07-16 05:16:59 +03:00