Commit Graph

67 Commits

Author SHA1 Message Date
4504023a23 Merge branch 'master' into playlists-freemod-support 2021-02-19 14:43:59 +09:00
df05c57f44 Merge branch 'master' into playlists-freemod-support 2021-02-19 14:35:20 +09:00
bc10fcafae Remove now unnecessary schedule 2021-02-19 13:23:51 +09:00
2a1bb2f578 Fix selected item potentially changing during gameplay 2021-02-17 21:40:21 +09:00
8930ff4465 Merge branch 'master' into multiplayer-no-playlist-mangling 2021-02-17 19:29:01 +09:00
8f72631c31 Fix typo in comment 2021-02-16 21:48:19 +01:00
3ff9e14e35 Make StatefulMultiplayerClient control current playlist item 2021-02-16 18:56:13 +09:00
f25b5147ef Select last playlist item in match subscreen 2021-02-16 15:37:45 +09:00
97a7572cb8 Move UserModSelectOverlay to RoomSubScreen for Playlists consumption 2021-02-16 15:14:48 +09:00
52e544aa67 Revert "Remove redundant double call to ValueChanged on UserMods change"
This reverts commit 9ed45ce1ca.
2021-02-16 14:42:31 +09:00
9ed45ce1ca Remove redundant double call to ValueChanged on UserMods change 2021-02-16 14:31:00 +09:00
0ca747b39f Merge branch 'master' into fix-multiplayer-mod-propagation-race 2021-02-16 14:25:27 +09:00
b28a906197 Fix extra mod settings overflowing from screen 2021-02-12 10:29:29 -08:00
52975c5185 Remove hardcoded padding from main content 2021-02-12 10:23:33 -08:00
549e7520c5 Move scheduler logic to client callback rather than inside the update method 2021-02-11 16:00:52 +09:00
21f66a19fd Make server authoritative in which mods the client should be using when gameplay starts 2021-02-11 15:55:18 +09:00
86682cdb34 Add client/room null check 2021-02-10 20:16:26 +09:00
6fff7c39da Ensure tracker is disposed 2021-02-10 20:09:45 +09:00
822c66033f Add local-user freemod configuration 2021-02-10 19:56:59 +09:00
f338fa114b Merge branch 'master' into user-beatmap-downloading-states-2 2021-02-05 18:02:40 +09:00
791cbb7f03 Don't reset ready state if the map is locally available 2021-02-05 17:17:29 +09:00
3e750feaa4 Subclass LocalPlayerModSelectOverlay to correctly deselect incompatible mods on free mod selection 2021-02-05 16:42:35 +09:00
be91f54349 Add back edge case with comment 2021-02-05 16:19:45 +09:00
9ba5ae3db7 Remove lots of unnecessary client side logic 2021-02-05 16:17:02 +09:00
9e9e382bee Merge branch 'master' into user-beatmap-downloading-states-2 2021-02-05 15:27:17 +09:00
2fc3a97f56 Merge pull request #11516 from frenzibyte/ready-button-clean-up
Replace ready button beatmap logic with using `MultiplayerBeatmapTracker` instead
2021-02-05 15:09:25 +09:00
de8724b1f6 Use AddRangeInternal for simplicity, but disallow ClearInternal for safety 2021-02-05 14:39:25 +09:00
78ea2d50bb Merge branch 'master' into ready-button-clean-up 2021-02-05 07:23:11 +03:00
df2da5950f Add back vertical spacer 2021-02-05 13:09:13 +09:00
21d5f842fc Re-layout to reduce movement 2021-02-03 14:53:55 +09:00
6453367a9c Merge branch 'freemod-select-overlay' into freemods 2021-02-02 21:43:35 +09:00
e5ca9b1e50 Remove usage of removed method 2021-02-01 19:28:33 +09:00
9c4c47599f Merge branch 'master' into freemods 2021-02-01 19:28:10 +09:00
ee92ec0a5c Disallow local user mod customisation 2021-02-01 18:54:47 +09:00
51cb288717 Reduce mod selection height 2021-02-01 18:18:59 +09:00
e134af82f5 Stack freemods for the local user 2021-02-01 18:16:38 +09:00
3e74f8fd9e Disable customisation of freemods, move stacking to property 2021-02-01 18:11:20 +09:00
f538963607 Extra mods -> user mods 2021-02-01 17:57:32 +09:00
ac2a995041 Add user and panel states 2021-02-01 17:54:56 +09:00
4ae10b1e1c Add initial UI for selecting extra mods 2021-02-01 13:40:59 +09:00
a61444690e Remove all usage of CatchUnobservedExceptions
This should no longer be required with the recent framework side change
that stops a game from crashing on unobserved exceptions
(https://github.com/ppy/osu-framework/pull/4171).
2021-01-29 16:32:29 +09:00
34612ae233 Forward internal management to a container alongside tracker 2021-01-19 20:01:22 +03:00
052e9eef02 Added inline comments 2021-01-19 09:16:39 -05:00
33677f5770 Use BindValueChanged to show main content for new multiplayer and playlist rooms when the settings overlay is hidden. 2021-01-19 08:52:43 -05:00
6d1d488831 Revert "Use the client.RoomUpdated action instead of binding the value of the settings overlay visibility and creating an event from it based on its ValueChanged action."
This reverts commit cbfb999c28.
2021-01-19 08:24:14 -05:00
9b7187e3c8 Revert "Use fades instead of event listening. Fixed same issue in the playlist room creation."
This reverts commit 3a7608275d.
2021-01-19 08:23:31 -05:00
3a7608275d Use fades instead of event listening. Fixed same issue in the playlist room creation. 2021-01-19 00:35:56 -05:00
cbfb999c28 Use the client.RoomUpdated action instead of binding the value of the settings overlay visibility and creating an event from it based on its ValueChanged action. 2021-01-18 17:13:24 -05:00
5233a0449a Hide main room subscreen on initial mp room creation. Toggle mp room subscreen visibility based on settings overlay visibility before room is created. 2021-01-18 16:08:06 -05:00
e6ceaad732 Revert user state back to idle upon availability change 2021-01-18 17:23:51 +03:00