1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 20:07:25 +08:00
Commit Graph

37045 Commits

Author SHA1 Message Date
Dean Herbert
b8c1e8ed7a
Merge pull request #11708 from frenzibyte/multiplayer-participant-rank
Display user global rank for multiplayer room participants
2021-02-19 16:57:30 +09:00
Dean Herbert
e4d3c91ff4
Merge pull request #11819 from peppy/update-framework
Update implementation of AdjustableAudioComponents in line with framework changes
2021-02-19 16:57:03 +09:00
Dean Herbert
781379826b
Merge pull request #11793 from peppy/playlists-freemod-support
Add "free mod" user mod selection support to the playlists system
2021-02-19 16:56:21 +09:00
Dan Balasescu
a6d163619a
Merge pull request #11827 from peppy/perform-from-screen-subclass-support
Allow beatmap imports from any derived version of SongSelect, rather than only PlaySongSelect
2021-02-19 15:05:18 +09:00
Dean Herbert
484968d797
Fix weird bool check
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-02-19 14:46:10 +09:00
Dean Herbert
4504023a23 Merge branch 'master' into playlists-freemod-support 2021-02-19 14:43:59 +09:00
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
a2aec6bcdc
Merge pull request #11808 from smoogipoo/multiplayer-no-playlist-mangling
Rework multiplayer playlist handling to support multiple items
2021-02-19 14:33:53 +09:00
Dean Herbert
1701d69a60 Fix calls to IsAssignableFrom being back-to-front 2021-02-19 14:33:08 +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
Dean Herbert
87edf67879 Update framework 2021-02-19 14:07:39 +09:00
smoogipoo
c0e0bd4f42 Add compatibility with old server build 2021-02-19 13:57:04 +09:00
Dean Herbert
85a844a378 Restructure class slightly 2021-02-19 13:40:12 +09:00
smoogipoo
183a481a34 Refactor playlist update to remove .Contains() check 2021-02-19 13:32:32 +09:00
Dean Herbert
841c2c56d9 Remove confusing pp_rank include (will be removed osu-web side too) 2021-02-19 13:30:42 +09:00
smoogipoo
bc10fcafae Remove now unnecessary schedule 2021-02-19 13:23:51 +09:00
Dean Herbert
b68dbbceff
Merge branch 'master' into multiplayer-participant-rank 2021-02-19 13:16:44 +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
Dean Herbert
4caca9653a Update framework 2021-02-19 10:39:56 +09:00
Dean Herbert
ce0011f710 Merge branch 'master' into update-framework 2021-02-19 10:39:50 +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
Salman Ahmed
f6df5a9d2b Suppress false warning 2021-02-18 15:55:45 +03:00
Salman Ahmed
a407bfe73b Privatize UserRanks and expose a similar CountryRank field instead 2021-02-18 15:37:52 +03:00
Salman Ahmed
e14a59f272 Fix creating ruleset instances per LINQ select 2021-02-18 15:26:59 +03: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
Dean Herbert
d85a4a22e5 Allow beatmap imports from any derived version of SongSelect, rather than only PlaySongSelect 2021-02-18 19:19:28 +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
smoogipoo
e911760318 Split OnlinePlayComposite to remove if-statement 2021-02-18 15:47:33 +09:00
Dean Herbert
143e145670 Update implementation of AdjustableAudioComponents 2021-02-18 15:44:23 +09:00
smoogipoo
56e9e10ff5 Make server authoritative in playlist item id 2021-02-18 15:30:31 +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