1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:53:21 +08:00
Commit Graph

36971 Commits

Author SHA1 Message Date
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
Dean Herbert
990c1b1d6e Revert accidental removal of newlines 2021-02-18 18:19:57 +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
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
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
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
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
Dan Balasescu
8e077c2857
Merge pull request #11791 from peppy/rooms-container-fix-click-deselection
Add the ability to deselect the currently selected room via clicking away
2021-02-16 20:22:24 +09:00
smoogipoo
3e802531d3 Use long type where required in multiplayer 2021-02-16 19:34:01 +09:00
Dan Balasescu
c9a70a6777
Merge pull request #11792 from peppy/rooms-fix-selection-after-create
Fix current selection not updating visually after creating a new playlist
2021-02-16 15:05:03 +09:00
Dean Herbert
52e544aa67 Revert "Remove redundant double call to ValueChanged on UserMods change"
This reverts commit 9ed45ce1ca.
2021-02-16 14:42:31 +09:00
Dean Herbert
9ed45ce1ca Remove redundant double call to ValueChanged on UserMods change 2021-02-16 14:31:00 +09:00
Dean Herbert
0ca747b39f Merge branch 'master' into fix-multiplayer-mod-propagation-race 2021-02-16 14:25:27 +09:00
Dean Herbert
0aded05e15
Merge pull request #11789 from Joehuu/fix-comment-edited-at-date-tooltip
Fix comment edited at date not showing tooltip
2021-02-16 14:05:05 +09:00
Dean Herbert
31a5cdd8ac Fix current selection not updating visually after creating a new playlist 2021-02-16 14:02:21 +09:00
Dean Herbert
e969ca8974 Remove unused using statement that rider could not identify 2021-02-16 13:52:42 +09:00
Dean Herbert
e82922f8c5 Add the ability to deselect the currently selected room via clicking away
Always felt wrong that you couldn't do this until now.
2021-02-16 13:44:37 +09:00
Dean Herbert
02417697e9 Display remaining attempts for playlist rooms with room-level attempt limits 2021-02-16 13:32:14 +09:00
Joehu
e838a5d9f0 Fix comment edited at date not showing tooltip 2021-02-15 19:04:23 -08:00
Dean Herbert
335af04764
Merge pull request #11544 from smoogipoo/non-concurrent-sample-playback 2021-02-15 23:40:24 +09:00
Dean Herbert
a1bee5d721
Merge branch 'master' into non-concurrent-sample-playback 2021-02-15 22:05:11 +09:00
Dean Herbert
30a9a09492
Merge pull request #11783 from peppy/hub-send-version-hash
Send client version hash on hub connection
2021-02-15 22:04:46 +09:00
Dean Herbert
72b2123500 Update nunit in line with framework 2021-02-15 21:42:35 +09:00
Dean Herbert
2e646882fa Merge branch 'master' into non-concurrent-sample-playback 2021-02-15 21:22:21 +09:00
Dean Herbert
1ac274e478 Update framework 2021-02-15 21:22:18 +09:00
Dan Balasescu
6641f4d5a9
Merge branch 'master' into hub-send-version-hash 2021-02-15 21:12:46 +09:00