Commit Graph

10293 Commits

Author SHA1 Message Date
a5a9922f81 Fix lounge screen content not matching current room playlist item 2021-12-20 13:32:42 +01:00
6907a9a3cc Name some screen stacks for better logging context 2021-12-20 18:24:14 +09:00
cbb65e1e07 Merge branch 'master' into beatmap-card-expanded-state-fix 2021-12-15 22:20:30 +01:00
cd8dfac625 Merge pull request #16097 from smoogipoo/forego-resetting-spectate-state
Don't reset spectating state if spectator exited after gameplay finishes
2021-12-15 22:30:41 +09:00
33cf4ba7f6 Merge pull request #16075 from smoogipoo/prevent-idle-transition-during-load
Add AbortGameplay() to fix state transition race conditions during multiplayer load
2021-12-15 19:59:19 +09:00
9e82a3e79a Merge branch 'master' into forego-resetting-spectate-state 2021-12-15 18:05:06 +09:00
18d7b79207 Don't reset spectating state if gameplay is finished 2021-12-15 17:40:30 +09:00
740a6f16c7 Fix exception when updating the room's visual playlist 2021-12-15 16:53:25 +09:00
ef4ab74565 Also only expose Expanded state of BeatmapCard as read-only 2021-12-15 16:26:19 +09:00
9ade8069a1 Rename to AbortGameplay() and handle additional states 2021-12-15 06:40:28 +09:00
4c81fd8b7c Merge pull request #16068 from peppy/fix-fail-animation-background-dim
Improve appearance of player-wide background after failing with low background dim
2021-12-15 06:32:02 +09:00
00154fe86d Merge branch 'master' into fix-menu-background-desync 2021-12-14 21:31:10 +01:00
8c6f50ddb1 Fix BackgroundScreenDefault incorrectly updating current background after being inactive
If the beatmap was changed but then reverted to the previously displayed
map, the background may have displayed incorrectly on resuming.

Closes #15804.
2021-12-14 16:40:50 +09:00
b6a272e31a Add failing test coverage of BackgroundScreeNDefault's beatmap background tracking when active/non-active 2021-12-14 16:40:34 +09:00
7e576ae9d3 Add note about how the background colour is restored 2021-12-14 13:25:19 +09:00
2f1dc91211 Add AbortLoad() method to abort gameplay loads 2021-12-14 11:30:42 +09:00
70045494ba Re-simplify code by removing BeatmapManager event instead 2021-12-13 16:09:54 +09:00
cac684c044 Improve appearance of player-wide background after failing with low background dim 2021-12-13 14:53:11 +09:00
c097dc8048 Add note about reasoning behind MultiplayerClient.GetAPIBeatmap call 2021-12-13 13:39:32 +09:00
3ea07b426b Merge branch 'master' into multiplayer-local-beatmap-query 2021-12-13 13:27:34 +09:00
2cd2b10ce1 Fix results sometimes showing incorrect score position 2021-12-13 06:54:57 +09:00
bf3abb2455 Merge branch 'master' into multiplayer-local-beatmap-query 2021-12-12 16:37:41 +09:00
a6e77f172d Add some comments 2021-12-12 16:30:37 +09:00
d6c08fae48 Fix incorrect global beatmap with availability changes 2021-12-11 23:08:21 +09:00
ece2cddb7f Fix DrawableRoomPlaylistItem lookup interfering with tests 2021-12-11 22:51:20 +09:00
25b274c323 Fix starting gameplay too early after import 2021-12-11 22:47:50 +09:00
1aac978a7b Merge pull request #16029 from peppy/editor-mod-reset
Fix editor not resetting mods when entering
2021-12-11 20:20:11 +09:00
63a017bc8e Use Array.Empty instead 2021-12-11 19:33:37 +09:00
cdb8237a4b Merge branch 'master' into pre-realm-score-tidy 2021-12-11 19:25:39 +09:00
6057037e35 Move playlist item beatmap population to MatchSubScreen 2021-12-10 20:08:59 +09:00
c1b3ee6bb2 Fix editor not resetting mods when entering
Would leave the user potentially in a test mode that is in a weird
state (ie. if cinema mod was enabled). Eventually we'll add the ability
to choose mods for test play, but that will be done in a saner way.

Closes #15870.
2021-12-10 18:57:45 +09:00
f7c5a3f506 Use similar method of consuming OnlineID as done in beatmap classes 2021-12-10 18:34:31 +09:00
e98060ac37 Remove unused using 2021-12-10 17:55:18 +09:00
970a9ae074 Add update thread asserts to RoomManager methods 2021-12-10 17:22:24 +09:00
3633494509 Merge pull request #16020 from smoogipoo/host-enqueue-2
Add support for enqueueing items in host-only mode, and changing arbitrary playlist items
2021-12-10 16:23:48 +09:00
dbb08f7d46 Use OnlineID for set operations 2021-12-10 16:11:48 +09:00
bf1418bafc Use OnlineID instead of legacy IDs for equality and lookups 2021-12-10 16:11:48 +09:00
4e6286920c Merge pull request #16017 from peppy/fix-child-set-after-disposal
Fix potential crash due to children being mutated after disposal
2021-12-10 15:38:34 +09:00
de0f37b08d Separate editing and adding playlist items 2021-12-10 15:26:48 +09:00
88670c3b01 Document OpenSongSelection and mark null param 2021-12-10 14:14:22 +09:00
50bf2f368d Merge branch 'master' into host-enqueue-2 2021-12-10 14:09:19 +09:00
9ac8e6c81c Add missing null check before attempting to populate bpm info 2021-12-10 13:53:48 +09:00
612f47bb9f Add the ability to create playlists of 2 weeks ~ 3 months in duration 2021-12-10 13:45:29 +09:00
1952819db2 Merge pull request #16019 from smoogipoo/cleanup-playlist-item-buttons
Cleanup duplicated classes in DrawableRoomPlaylistItem
2021-12-10 12:01:26 +09:00
35a208a478 Merge pull request #15999 from peppy/restore-user-volume-muted-notification
Fix the unmute notification potentially overwriting user's volume levels unnecessarily
2021-12-10 02:58:59 +09:00
671582a925 Allow host to enqeue items and items to be edited 2021-12-10 01:15:19 +09:00
048a495115 Add edit button to DrawableRoomPlaylistItem 2021-12-10 01:08:54 +09:00
05aa9635a8 Privatise button again 2021-12-10 00:38:18 +09:00
f9af239ed9 Cleanup duplicated classes in DrawableRoomPlaylistItem 2021-12-09 23:56:49 +09:00
538a822760 Merge branch 'master' into multiplayer-playlist-deletion 2021-12-09 19:04:06 +09:00