Commit Graph

36132 Commits

Author SHA1 Message Date
1f12b2bd09 Rename download state Downloaded to Importing 2021-01-13 18:04:53 +03:00
43daa7c7c0 Use Colour2 of orange theme for explicit pill 2021-01-13 17:07:42 +03:00
e275dd02e0 Create static colour properties for now 2021-01-13 17:07:11 +03:00
9d59d784f8 Add Colour{1-4} properties to OverlayColourProvider 2021-01-13 17:06:44 +03:00
268f9d661f Dispose of local config on disposal 2021-01-13 13:00:14 +03:00
a5f99ed8e6 Merge branch 'explicit-beatmap-markers' into explicit-search-control 2021-01-13 12:53:57 +03:00
f827c62081 Add empty online info to test beatmap
This is for `BeatmapSetOverlay` to not eat a null reference trying to access `Beatmap.OnlineInfo`.
2021-01-13 12:27:15 +03:00
7fd55efc43 Add test cases for displaying explicit beatmaps 2021-01-13 12:27:15 +03:00
1502b07ea8 Add explicit pill to playlist items 2021-01-13 12:27:15 +03:00
78631323ba Add explicit pill to beatmap overlay 2021-01-13 12:13:14 +03:00
f6637eec36 Add explicit pill to beatmap panels 2021-01-13 12:13:14 +03:00
ee6baeb57e Add "explicit" marker pill 2021-01-13 12:13:14 +03:00
e8daea91d2 Add online beatmap "explicit content" property 2021-01-13 12:13:14 +03:00
80bcd78a48 Removed unnecessary using. 2021-01-13 02:04:59 -05:00
7bfb5954a8 Fix whitespace formatting. 2021-01-13 00:25:54 -05:00
5f10bcce02 Added beatmap colour settings checkbox and associated tests. 2021-01-13 00:09:22 -05:00
10fd4cf7c9 Merge pull request #11467 from bdach/fix-multiplayer-non-host-crash
Fix non-hosts crashing on load requested
2021-01-13 11:38:59 +09:00
2d3cacca11 Fix non-hosts crashing on load requested
`onLoadRequested()` always released the `readyClickOperation` ongoing
operation, without checking whether it actually needs to/should (it
should only do so if the action initiating the operation was starting
the game by the host). This would crash all other consumers, who already
released the operation when their ready-up operation completed server
side.

To resolve, relax the constraint such that the operation can be ended
multiple times in any order. At the end of the day the thing that
matters is that the operation is done and the ready button is unblocked.
2021-01-13 00:58:53 +01:00
becd52b5d2 Merge pull request #11465 from smoogipoo/fix-taiko-conversion-2 2021-01-12 20:43:37 +01:00
7298adc9d9 Fix non-threadsafe usage of MultiplayerClient.IsConnected 2021-01-12 19:04:16 +09:00
b51b07c3a9 Fix unstable multiplayer room ordering when selection is made 2021-01-12 18:05:29 +09:00
9a22df2b88 Fix BPM multiplier not working in all cases 2021-01-12 17:50:22 +09:00
22a0f99f35 Add failing test 2021-01-12 17:49:21 +09:00
422260797b Revert polling changes to fix participant list display
It turns out this polling was necessary to get extra data that isn't
included in the main listing request. It was removed deemed useless, and
in order to fix the order of rooms changing when selecting a room.
Weirdly, I can't reproduce this happening any more, and on close
inspection of the code can't see how it could happen in the first place.

For now, let's revert this change and iterate from there, if/when the
same issue arises again.

I've discussed avoiding this second poll by potentially including more
data (just `user_id`s?) in the main listing request, but not 100% sure
on this - even if the returned data is minimal it's an extra join
server-side, which could cause performance issues for large numbers of
rooms.
2021-01-12 17:26:00 +09:00
80fa2cf693 Add test coverage 2021-01-12 11:14:05 +03:00
24c1839739 Add global web setting for allowing explicit content 2021-01-12 11:10:25 +03:00
249be461d5 Add "explicit maps" search filter control 2021-01-12 11:09:55 +03:00
0d5fbb15ac Fix up code comments
Default value restated in xmldoc was snipped because it's made redundant
by the initialiser and possibly bound to be outdated at some point.
2021-01-11 20:31:52 +01:00
90fb67b377 Update code in-line with decided direction 2021-01-11 20:52:24 +03:00
dd809df076 Merge pull request #11118 from MiraiSubject/tourney-switching-ui
Add the ability to switch tournaments to the SetupScreen
2021-01-11 16:36:45 +09:00
f65042cf44 Add missing licence headers 2021-01-11 15:47:27 +09:00
c9466426b7 Change field to local variable 2021-01-11 14:45:01 +09:00
7a7c583ded Move setup screen classes out of single file and into their own namespace 2021-01-11 14:44:07 +09:00
bd627534b7 Use disabled state instead of hiding button 2021-01-11 14:38:51 +09:00
ba3a7a0501 Clean up code 2021-01-11 14:38:42 +09:00
49057e8cbc Cache TournamentStorage explicitly for better safety 2021-01-11 14:38:42 +09:00
2286e3679f Downloaded -> Importing 2021-01-11 08:21:07 +03:00
a8dfa5e2a9 Rename typo'd method 2021-01-11 08:04:00 +03:00
e99310b59c Add JsonConstructor attribute 2021-01-11 08:02:57 +03:00
2abeda5e0f Merge pull request #11447 from bdach/fix-play-button-crashes
Fix track previews crashing on completion
2021-01-11 03:10:18 +09:00
d2ca6da0fd Remove unused constant 2021-01-11 01:56:09 +09:00
bd37723788 Expose as IBindable for added safety 2021-01-11 01:55:54 +09:00
e4eb44df6e Merge branch 'master' into fix-play-button-crashes 2021-01-11 01:46:41 +09:00
f466791b69 Move assignments to the TournamentSwitcher component
This also adds conditional checks for displaying the "Close osu!" button
2021-01-10 17:34:20 +01:00
959696c296 Merge branch 'master' into tourney-switching-ui 2021-01-10 17:34:03 +01:00
e5c670f843 Merge branch 'master' into tourney-switching-ui 2021-01-10 17:33:52 +01:00
b79e8d0192 Merge pull request #11386 from frenzibyte/fix-mod-buttons-not-copying-settings 2021-01-10 16:37:25 +01:00
d110ed9e95 Merge branch 'master' into fix-mod-buttons-not-copying-settings 2021-01-10 15:42:33 +01:00
e006891db0 Merge pull request #11452 from bdach/ongoing-operation-tracker-safety 2021-01-10 15:41:13 +01:00
4b4adc927c Rename param to match method body 2021-01-10 15:35:53 +01:00