smoogipoo
04b0529a7f
Fix list overflowing subscreen background
2021-10-22 22:17:26 +09:00
smoogipoo
95ab82fb58
Remove BeatmapSelectionControl and inline at usage sites
2021-10-22 19:41:36 +09:00
smoogipoo
2fd101ad50
Reorder elements to follow designs
2021-10-15 20:25:32 +09:00
smoogipoo
a70d7e4feb
Remove unnecessary extra GridContainer
2021-10-15 20:18:25 +09:00
Bartłomiej Dach
e503182a8d
Merge branch 'master' into activity-on-multiplayer-screens
2021-08-24 18:50:55 +02:00
smoogipoo
de0de451fe
Refactor to remove resolved dependency
2021-08-24 13:29:19 +09:00
smoogipoo
df170afbc4
Fix multiplayer crashing when entering gameplay
2021-08-24 13:22:06 +09:00
smoogipoo
f85d3665d8
Cleanups
2021-08-20 21:45:24 +09:00
smoogipoo
610a162271
Merge branch 'master' into remove-current-room
2021-08-20 16:23:36 +09:00
Dean Herbert
16aecfe934
Start free mod selection area hidden on screen display
2021-08-19 19:02:54 +09:00
Dean Herbert
be77498044
Move chat to right column in multiplayer match screen
2021-08-19 19:02:31 +09:00
smoogipoo
493f47787b
Disable condition for the time being
2021-08-19 18:18:42 +09:00
smoogipoo
c31af96f1d
Pass room into RoomSettingsOverlay
2021-08-19 16:41:21 +09:00
smoogipoo
63af67f61b
Cleanup around footers
2021-08-18 20:25:48 +09:00
smoogipoo
568f1fd345
Fix initial RoomId state not being handled correctly
2021-08-18 16:09:00 +09:00
smoogipoo
90a1be2e61
Move paddings up one level
2021-08-18 15:54:33 +09:00
smoogipoo
c5268c9a99
Simplify by reusing same room panel
2021-08-18 15:19:24 +09:00
smoogipoo
704af94d39
Add edit button to room panel
2021-08-18 15:13:10 +09:00
smoogipoo
c66abf85f7
Remove match header
2021-08-18 14:04:44 +09:00
smoogipoo
47d4a2e97f
Make SettingsOverlay protected
2021-08-17 20:05:26 +09:00
smoogipoo
590d814881
Move RoomSettingsOverlay to RoomSubScreen
2021-08-17 18:24:04 +09:00
smoogipoo
6416e64e06
Adjust sizings and paddings
2021-08-17 17:13:25 +09:00
smoogipoo
4b198d14eb
Initial refactor of RoomSubScreen
2021-08-17 17:05:20 +09:00
smoogipoo
08d347f10b
Merge branch 'master' into multi-polling-request-refactor
2021-08-16 13:12:08 +09:00
Dean Herbert
b8c63eb1cb
Merge branch 'master' into multiplayer-kick-support-events
2021-08-14 14:08:34 +09:00
smoogipoo
c71a581106
Fix exception when leaving match
2021-08-13 18:24:19 +09:00
smoogipoo
8910781bcd
Move listing polling component to LoungeSubScreen
2021-08-13 17:39:09 +09:00
Dean Herbert
b9721f5261
Centralise screen exit logic and guard against non-current screen
2021-08-13 14:39:03 +09:00
smoogipoo
755b6460b6
Fix multiplayer navigation test failure
2021-08-13 14:05:44 +09:00
Dan Balasescu
88f70e7f29
Merge branch 'master' into multiplayer-kick-support-events
2021-08-12 12:12:06 +09:00
Dean Herbert
31608a1bc6
Leave the match screen when kicked
2021-08-11 19:57:10 +09:00
Dean Herbert
a503274e1d
Pass through MultiplayerRoomUsers instead of ints to avoid re-retrieval
2021-08-10 18:39:20 +09:00
Dan Balasescu
0557761e51
Merge pull request #13862 from peppy/fix-multiplayer-create-game-failure-crash
...
Fix crash when multiplayer server join fails during game creation
2021-07-13 18:00:47 +09:00
Dean Herbert
60e17fc2b7
Fix disconnected-from-server multiplayer exit sequence being blocked by confirmation dialog
2021-07-13 17:12:35 +09:00
Dean Herbert
5cffaf4d3b
Add extra explanatory comment to avoid any confusion
2021-07-13 14:34:56 +09:00
Dean Herbert
c6bd58ea4b
Exit match sub screen when a room goes away
...
Closes #13847 .
I think we can probably get some test coverage of this if required, but
needs a bit of thought (basically an error needs to be thrown during the
multiplayer client portion of the join procedure, after `CurrentRoom` is
non-null but before the join completes).
Manual testing on password branch (#13861 ) is possible since it
currently errors due to missing method on the live/dev servers.
- Create game, which will fail with `MethodNotExists`.
- Note the fields on the settings screen are emptied.
- Fill fields again and press create game (crash).
2021-07-12 19:20:41 +09:00
Joseph Madamba
db86098062
Fix dialog not closing after spamming OS window close
2021-06-21 20:23:11 -07:00
Joseph Madamba
9bcd1e6922
Move confirm dialog logic to OnExiting
2021-06-21 20:22:18 -07:00
Dean Herbert
7774344f0e
Remove "Unranked" text from ModDisplay
2021-06-09 13:45:09 +09:00
smoogipoo
d197a7f6f5
Rename multiplayer client classes
2021-05-20 15:39:45 +09:00
Salman Ahmed
9e8c0a7e70
Fix online play subscreens not pushing player loaders when starting gameplay
2021-05-14 04:25:29 +03:00
smoogipoo
9ad1e5067e
Fix spectate being entered while not having the beatmap
2021-05-11 19:22:09 +09:00
Dean Herbert
dc5ee31d94
Use switch for screen construction
2021-05-03 14:04:20 +09:00
Dean Herbert
66ae6e58d1
Reword comment regarding LoadRequested special case to be easier to understand context
2021-05-03 14:01:10 +09:00
smoogipoo
ed93e26e52
Use single method for starting/restarting spectator screen
2021-04-26 21:56:15 +09:00
Dean Herbert
aa99c192d0
Fix type in inline comment
2021-04-26 16:21:12 +09:00
smoogipoo
90ecda91af
Fix exception
2021-04-23 00:06:54 +09:00
smoogipoo
fd0b030cf4
Refactor gameplay screen creation
2021-04-22 23:37:33 +09:00
smoogipoo
d49b90877e
Fix operation remaining in progress
2021-04-13 23:21:48 +09:00
smoogipoo
6eddc6c59e
Enable spectating multiplayer matches
2021-04-09 21:03:50 +09:00
smoogipoo
93c5935ebc
Add match subscreen support + test
2021-04-07 20:46:30 +09:00
Dean Herbert
23a46819dc
Merge branch 'master' into multiplayer-confirm-on-exit
2021-03-03 20:35:31 +09:00
Dean Herbert
0f5bce70ad
Split confirmation dialog classes apart
2021-03-03 20:34:37 +09:00
Dean Herbert
0ede28da2f
Fix test failures due to missing dependency
2021-03-03 15:24:55 +09:00
Dean Herbert
cb4c3503a0
Confirm exiting a multiplayer match
2021-03-03 14:54:18 +09:00
Dean Herbert
d332fd2414
Handle case where local user tries to change beatmap while not the host
2021-03-03 14:53:47 +09:00
Dean Herbert
36e1fb6da8
Add flow to allow MatchSubScreen to handle beatmap presentation locally
2021-03-03 14:13:51 +09:00
Dean Herbert
4504023a23
Merge branch 'master' into playlists-freemod-support
2021-02-19 14:43:59 +09:00
Dean Herbert
df05c57f44
Merge branch 'master' into playlists-freemod-support
2021-02-19 14:35:20 +09:00
smoogipoo
bc10fcafae
Remove now unnecessary schedule
2021-02-19 13:23:51 +09:00
smoogipoo
2a1bb2f578
Fix selected item potentially changing during gameplay
2021-02-17 21:40:21 +09:00
smoogipoo
8930ff4465
Merge branch 'master' into multiplayer-no-playlist-mangling
2021-02-17 19:29:01 +09:00
Bartłomiej Dach
8f72631c31
Fix typo in comment
2021-02-16 21:48:19 +01:00
smoogipoo
3ff9e14e35
Make StatefulMultiplayerClient control current playlist item
2021-02-16 18:56:13 +09:00
smoogipoo
f25b5147ef
Select last playlist item in match subscreen
2021-02-16 15:37:45 +09:00
Dean Herbert
97a7572cb8
Move UserModSelectOverlay to RoomSubScreen for Playlists consumption
2021-02-16 15:14:48 +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
Joehu
b28a906197
Fix extra mod settings overflowing from screen
2021-02-12 10:29:29 -08:00
Joehu
52975c5185
Remove hardcoded padding from main content
2021-02-12 10:23:33 -08:00
Dean Herbert
549e7520c5
Move scheduler logic to client callback rather than inside the update method
2021-02-11 16:00:52 +09:00
Dean Herbert
21f66a19fd
Make server authoritative in which mods the client should be using when gameplay starts
2021-02-11 15:55:18 +09:00
smoogipoo
86682cdb34
Add client/room null check
2021-02-10 20:16:26 +09:00
smoogipoo
6fff7c39da
Ensure tracker is disposed
2021-02-10 20:09:45 +09:00
smoogipoo
822c66033f
Add local-user freemod configuration
2021-02-10 19:56:59 +09:00
Dean Herbert
f338fa114b
Merge branch 'master' into user-beatmap-downloading-states-2
2021-02-05 18:02:40 +09:00
Dean Herbert
791cbb7f03
Don't reset ready state if the map is locally available
2021-02-05 17:17:29 +09:00
Dean Herbert
3e750feaa4
Subclass LocalPlayerModSelectOverlay to correctly deselect incompatible mods on free mod selection
2021-02-05 16:42:35 +09:00
Dean Herbert
be91f54349
Add back edge case with comment
2021-02-05 16:19:45 +09:00
Dean Herbert
9ba5ae3db7
Remove lots of unnecessary client side logic
2021-02-05 16:17:02 +09:00
Dean Herbert
9e9e382bee
Merge branch 'master' into user-beatmap-downloading-states-2
2021-02-05 15:27:17 +09:00
Dean Herbert
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
Dean Herbert
de8724b1f6
Use AddRangeInternal for simplicity, but disallow ClearInternal for safety
2021-02-05 14:39:25 +09:00
Salman Ahmed
78ea2d50bb
Merge branch 'master' into ready-button-clean-up
2021-02-05 07:23:11 +03:00
smoogipoo
df2da5950f
Add back vertical spacer
2021-02-05 13:09:13 +09:00
smoogipoo
21d5f842fc
Re-layout to reduce movement
2021-02-03 14:53:55 +09:00
smoogipoo
6453367a9c
Merge branch 'freemod-select-overlay' into freemods
2021-02-02 21:43:35 +09:00
smoogipoo
e5ca9b1e50
Remove usage of removed method
2021-02-01 19:28:33 +09:00
smoogipoo
9c4c47599f
Merge branch 'master' into freemods
2021-02-01 19:28:10 +09:00
smoogipoo
ee92ec0a5c
Disallow local user mod customisation
2021-02-01 18:54:47 +09:00
smoogipoo
51cb288717
Reduce mod selection height
2021-02-01 18:18:59 +09:00
smoogipoo
e134af82f5
Stack freemods for the local user
2021-02-01 18:16:38 +09:00
smoogipoo
3e74f8fd9e
Disable customisation of freemods, move stacking to property
2021-02-01 18:11:20 +09:00
smoogipoo
f538963607
Extra mods -> user mods
2021-02-01 17:57:32 +09:00
smoogipoo
ac2a995041
Add user and panel states
2021-02-01 17:54:56 +09:00
smoogipoo
4ae10b1e1c
Add initial UI for selecting extra mods
2021-02-01 13:40:59 +09:00
Dean Herbert
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
Salman Ahmed
34612ae233
Forward internal management to a container alongside tracker
2021-01-19 20:01:22 +03:00
Mysfit
052e9eef02
Added inline comments
2021-01-19 09:16:39 -05:00
