Commit Graph

1019 Commits

Author SHA1 Message Date
c5ac996e3f Restore ruleset using current playlist item on resuming room sub screen
Ensures that the ruleset selected at the multiplayer song selection
screen does not overwrite the current playlist item's ruleset.
2022-01-08 14:56:01 +01:00
675bdd3213 Fix MultiplayerMatchSubScreen mutating mods outside of bindable lease
As seen at https://github.com/peppy/osu/runs/4674501626?check_suite_focus=true.
2022-01-01 12:13:59 +09:00
7de43e3aba Fix most open compound words in identifiers being closed 2021-12-27 20:26:28 -08:00
a43cc20ae2 Apply changes to GameplayCompleted from reviews 2021-12-24 21:58:20 +09:00
c6854b37c8 Unbind event on disposal 2021-12-24 21:58:09 +09:00
727335dcad Improve reliability of exiting gameplay 2021-12-24 14:23:09 +09:00
a88800c99a Merge pull request #16198 from smoogipoo/fix-current-item-before-population
Fix delete button showing on current item before beatmap retrieval
2021-12-22 13:15:07 +09:00
4ce61d4260 Directly bind to room updates
Currently doesn't really cause any difference, however it may in the
future if we decide the queueing algorithm shouldn't update PlaylistOrder
when an item has been played.
2021-12-21 18:40:29 +09:00
a34d24fb20 Disallow expired items from showing delete button
This isn't possible in practice since expired items are removed from the
queue list, but this helps out in tests.
2021-12-21 18:37:42 +09:00
4ba5a939db Merge pull request #16178 from bdach/lounge-background-screen-correct
Fix lounge screen showing information sourced from wrong playlist item
2021-12-21 17:36:23 +09:00
51b7e920c0 Fix delete button being able to show on current item 2021-12-21 16:57:58 +09:00
d08b66a5ff Also add logging to OnlinePlayScreen 2021-12-21 15:07:06 +09:00
ddadf3c4b5 Add logging of MultiplayerMatchSubScreen exiting from room loss 2021-12-21 14:53:24 +09:00
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
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
9ade8069a1 Rename to AbortGameplay() and handle additional states 2021-12-15 06:40:28 +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
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
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
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
bf1418bafc Use OnlineID instead of legacy IDs for equality and lookups 2021-12-10 16:11:48 +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
612f47bb9f Add the ability to create playlists of 2 weeks ~ 3 months in duration 2021-12-10 13:45:29 +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
dfe19f3509 Minor code reformatting 2021-12-09 17:53:40 +09:00
0963b00453 Disallow item selection in playlists song select 2021-12-09 17:33:59 +09:00
17d676200b Xmldoc fixes from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-12-09 17:33:36 +09:00
1a0945daba Siplify condition, allow host to always remove items 2021-12-09 14:33:50 +09:00
8398f86440 Don't consider expired items in visibility check 2021-12-09 04:02:16 +09:00