Dean Herbert
39059ed82d
Remove unnecessary null coalesce check
2021-02-19 14:36:51 +09:00
Dean Herbert
df05c57f44
Merge branch 'master' into playlists-freemod-support
2021-02-19 14:35:20 +09:00
Dean Herbert
95d62d03e2
Merge pull request #11826 from frenzibyte/fix-score-type-wrong-order
...
Fix misordered hit error in score meter types
2021-02-19 14:16:57 +09:00
Dan Balasescu
f32a2739ec
Merge pull request #11823 from peppy/online-overlay-login-placeholder
...
Add login placeholder logic to OnlineOverlay
2021-02-19 11:53:04 +09:00
Dan Balasescu
6240d3964c
Merge pull request #11817 from peppy/fix-collection-dropdown-cross-thread-manipulation
...
Fix potential crash from cross-thread drawable manipulation in CollectionFilterDropdown
2021-02-19 10:06:42 +09:00
Dan Balasescu
19a2ef1148
Merge pull request #11799 from frenzibyte/fix-tournament-user-population
...
Fix multiple issues with user population in tournament client
2021-02-19 10:06:30 +09:00
Dan Balasescu
28550f19e8
Merge branch 'master' into online-overlay-login-placeholder
2021-02-19 10:06:25 +09:00
Dean Herbert
10ec4cd8e0
Revert change to loading layer's default state
2021-02-18 22:38:17 +09:00
Dan Balasescu
6358ab9aa9
Merge branch 'master' into fix-tournament-user-population
2021-02-18 20:47:27 +09:00
Dan Balasescu
cea9ecc2cc
Merge pull request #11820 from smoogipoo/fix-offthread-collection-import
...
Fix collections being imported from BDL thread
2021-02-18 19:52:37 +09:00
Dan Balasescu
8b8d03dfd6
Merge pull request #11822 from peppy/chat-login-placeholder
...
Add login placeholder for chat overlay
2021-02-18 19:36:30 +09:00
smoogipoo
8a1a4ea2d4
Set Current directly
2021-02-18 19:33:04 +09:00
Salman Ahmed
a01896a652
Fix misordered hit error in score meter types
2021-02-18 13:04:22 +03:00
Dean Herbert
990c1b1d6e
Revert accidental removal of newlines
2021-02-18 18:19:57 +09:00
Dean Herbert
0bd1964d8e
Add login placeholder logic to OnlineOverlay
...
A perfect implementation of this would probably leave the filter/header
content visible, but that requires some re-thinking and restructuring to
how the content is displayed in these overlays (ie. the header
component shouldn't be inside the `ScrollContainer` as it is fixed).
Supersedes and closes #10774 .
Closes #933 .
Addresses most pieces of #7417 .
2021-02-18 18:07:24 +09:00
Dean Herbert
58d8f0733c
Allow using OnlineViewContainer without deriving it
2021-02-18 18:07:24 +09:00
Dean Herbert
c3f66a0c74
Add login placeholder for chat overlay
2021-02-18 17:46:07 +09:00
Dan Balasescu
46b67dd7bc
Merge pull request #11821 from peppy/fix-carousel-border-additive-alplha
...
Fix carousel items' borders getting blown out when selected and hovered
2021-02-18 17:45:58 +09:00
Dean Herbert
71316bbee5
Allow using OnlineViewContainer without deriving it
2021-02-18 17:45:58 +09:00
Dan Balasescu
1d567e2b2d
Merge pull request #11818 from peppy/fix-default-preview-time
...
Fix preview point not being set correctly for beatmaps which don't specify an explicit time value
2021-02-18 17:40:12 +09:00
smoogipoo
668cc144f6
Fix test failures + multiple filter operations firing
2021-02-18 17:39:01 +09:00
Dean Herbert
b713eb2eae
Make field readonly
2021-02-18 17:13:48 +09:00
Dean Herbert
c3a98b6ad1
Fix carousel items' borders getting blown out when selected and hovered
...
I tried restructuring the hierarchy to avoid needing this added property
(moving the hover layer out of the border container) but this leads to
some subpixel leakage outside the borders which looks even worse.
Closes #6915 .
2021-02-18 16:59:44 +09:00
smoogipoo
46ba5de32c
Fix collections being imported from BDL thread
2021-02-18 16:19:36 +09:00
Dean Herbert
421cdb6650
Consume new method in existing usages (and remove some unnecessary set/unset code)
2021-02-18 15:01:11 +09:00
Dean Herbert
dfedea9ea2
Move preview point logic to a specific method in WorkingBeatmap
2021-02-18 14:55:44 +09:00
Dean Herbert
49589b64c3
Intro track should not restart from preview point
2021-02-18 14:55:15 +09:00
Dean Herbert
90dce52042
Fix potential crash from cross-thread drawable manipulation in CollectionFilterDropdown
2021-02-18 14:10:28 +09:00
Dean Herbert
e7308193e7
Add xmldoc explaining how PreviewTime is intended to work
2021-02-18 13:03:29 +09:00
Dan Balasescu
e30fb72ee2
Merge pull request #11811 from peppy/fix-mod-display-thread-safety
...
Fix ModDisplay potentially being operated on before loaded completely
2021-02-18 00:05:31 +09:00
Dan Balasescu
d8b10eca0c
Merge pull request #11802 from peppy/fix-import-contention
...
Fix long-running import tasks holding up user interactive imports
2021-02-17 23:35:48 +09:00
Dan Balasescu
cb4f1f2f7d
Merge pull request #11809 from peppy/fix-audio-preview-volume
...
Fix audio previews not being adjusted in volume correctly
2021-02-17 23:35:18 +09:00
Dean Herbert
3208b2c5bf
Fix potential nullref if mods are never set
2021-02-17 23:13:51 +09:00
Dean Herbert
403536ef80
Fix ModDisplay potentially being operated on before loaded completely
...
Closes https://github.com/ppy/osu/issues/11810 .
2021-02-17 21:11:46 +09:00
Dean Herbert
9c298fac4a
Merge pull request #11801 from peppy/fix-import-always-importing
...
Fix intro beatmap always being imported even if already in a good state
2021-02-17 20:59:33 +09:00
Dean Herbert
172e2e9b3f
Fix audio previews not being adjusted in volume correctly
2021-02-17 20:51:17 +09:00
Dean Herbert
0196ee882a
Redirect batch imports to a separate task scheduler to avoid contention with interactive actions
2021-02-17 19:41:18 +09:00
Dean Herbert
c1db33e075
Improve some xmldoc on ArchiveModelManager for methods which are not going to trigger user interactive flow
2021-02-17 19:40:56 +09:00
Dan Balasescu
d757dfa05c
Merge pull request #11738 from peppy/fix-multiplayer-mod-propagation-race
...
Make server authoritative in which mods the client should be using when gameplay starts
2021-02-17 19:26:34 +09:00
Dean Herbert
c1620ce21b
Fix intro beatmap always being imported even if already in a good state
2021-02-17 19:19:49 +09:00
Salman Ahmed
61bf9a64bb
Revert failed user requests changes with returning user ID instead
2021-02-17 11:22:03 +03:00
Dan Balasescu
57ede6eb37
Merge branch 'master' into fix-multiplayer-mod-propagation-race
2021-02-17 16:22:51 +09:00
Dean Herbert
86faa7f465
Merge pull request #11798 from smoogipoo/multiplayer-long-types
...
Use long type where required in multiplayer
2021-02-17 15:50:12 +09:00
smoogipoo
9a7b6ebe50
Fix missed occurrence
2021-02-17 14:30:52 +09:00
Salman Ahmed
85ebc8e06c
Fix potentially overwriting user ID from failed request
2021-02-17 07:50:14 +03:00
Salman Ahmed
705e926749
Fix attempting to populate users with invalid IDs
2021-02-17 07:50:14 +03:00
Salman Ahmed
3b4e02e5c7
Fix user population not immediate on bracket loading
2021-02-17 07:50:14 +03:00
Bartłomiej Dach
8f72631c31
Fix typo in comment
2021-02-16 21:48:19 +01:00
Dan Balasescu
bef0e5cfa1
Merge pull request #11790 from peppy/playlists-show-remaining-attempts
...
Display remaining attempts for playlist rooms with room-level attempt limits
2021-02-16 21:10:19 +09:00
Dan Balasescu
ffa90c1a23
Remove whitespace
2021-02-16 20:23:19 +09:00
