smoogipoo
|
100097d78f
|
Fix playlist not being handled correctly for non-joined cases
|
2021-02-16 21:32:35 +09:00 |
|
smoogipoo
|
379393fe10
|
Merge branch 'multiplayer-long-types' into multiplayer-no-playlist-mangling
|
2021-02-16 19:37:55 +09:00 |
|
smoogipoo
|
3e802531d3
|
Use long type where required in multiplayer
|
2021-02-16 19:34:01 +09:00 |
|
smoogipoo
|
e24a5949c5
|
Fix resolve
|
2021-02-16 19:26:51 +09:00 |
|
smoogipoo
|
2a1096a3c8
|
Make BeatmapSelectionControl use the selected item
|
2021-02-16 19:02:16 +09:00 |
|
smoogipoo
|
3ff9e14e35
|
Make StatefulMultiplayerClient control current playlist item
|
2021-02-16 18:56:13 +09:00 |
|
smoogipoo
|
855d24dce7
|
Cache selected item bindable from RoomSubScreen
|
2021-02-16 17:38:33 +09:00 |
|
smoogipoo
|
f25b5147ef
|
Select last playlist item in match subscreen
|
2021-02-16 15:37:45 +09:00 |
|
Dan Balasescu
|
6bfc7da671
|
Fix sample potentially playing at the wrong frequency
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2021-02-15 18:10:45 +09:00 |
|
smoogipoo
|
c6ed3efa4a
|
Merge branch 'master' into non-concurrent-sample-playback
|
2021-02-15 14:47:32 +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 |
|
smoogipoo
|
d3f0c0730d
|
Merge branch 'master' into non-concurrent-sample-playback
|
2021-02-12 17:22:15 +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 |
|
Dan Balasescu
|
92599aa02b
|
Merge branch 'master' into user-beatmap-downloading-states-2
|
2021-02-09 21:06:09 +09:00 |
|
Dean Herbert
|
5fbed05d04
|
Merge pull request #11551 from smoogipoo/fix-leave-room-race-2
Fix client potentially not leaving a room on exiting multiplayer
|
2021-02-08 19:23:14 +09:00 |
|
smoogipoo
|
a08c51f213
|
Remove duplicate code
|
2021-02-08 19:23:10 +09:00 |
|
Dean Herbert
|
34a1918d03
|
Merge branch 'master' into user-beatmap-downloading-states-2
|
2021-02-06 00:27:55 +09:00 |
|
Dean Herbert
|
dd4207cb4e
|
Merge pull request #11661 from peppy/playlist-max-room-attempts
Add support for setting the maximum attempt count for a playlist
|
2021-02-05 23:40:38 +09:00 |
|
Dean Herbert
|
7f82a06a61
|
Remove no longer used using directive
|
2021-02-05 23:08:31 +09:00 |
|
Dean Herbert
|
0679901e4d
|
Update error handling
|
2021-02-05 22:53:40 +09:00 |
|
Dean Herbert
|
3ca64a1cb2
|
Merge branch 'master' into playlist-max-room-attempts
|
2021-02-05 22:13:13 +09:00 |
|
smoogipoo
|
95ad7ea8f7
|
Fix mods on participant panels flashing when changed
|
2021-02-05 18:44:33 +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
|
1b6a052798
|
Refactor logic to suck a bit less
|
2021-02-05 15:46:03 +09:00 |
|
Dean Herbert
|
d1f9aa52a4
|
Inline variable
|
2021-02-05 15:33:48 +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 |
|
Dean Herbert
|
fc37d8b7df
|
Refactor content redirection logic to be easier to parse
|
2021-02-05 14:25:19 +09:00 |
|
Dean Herbert
|
9258836f10
|
Merge pull request #11641 from smoogipoo/freemods
Add support for optional per-user mods in multiplayer (aka freemod)
|
2021-02-05 13:59:30 +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
|
2e85ce5b82
|
Rename UserMods -> Mods for MultiplayerRoomUser
|
2021-02-05 12:40:16 +09:00 |
|
Dan Balasescu
|
a71d6a4c97
|
Merge branch 'master' into multiplayer-beatmap-tracker
|
2021-02-05 12:25:36 +09:00 |
|
smoogipoo
|
a2fdba3e51
|
Rename to OnlinePlayBeatmapAvailabilityTracker
|
2021-02-05 12:24:38 +09:00 |
|
smoogipoo
|
cf5233c6ab
|
Merge branch 'master' into freemods
|
2021-02-05 00:27:14 +09:00 |
|
Dean Herbert
|
f23ca7c7cf
|
Centralise selection animation logic
|
2021-02-04 18:10:55 +09:00 |
|
Dean Herbert
|
daf7ab9422
|
Apply the expected font to the checkbox's label
|
2021-02-04 16:58:15 +09:00 |
|
Dean Herbert
|
48a58e790e
|
Don't specify arbitrary width
|
2021-02-04 16:57:39 +09:00 |
|
Bartłomiej Dach
|
cb87da2bb8
|
Merge branch 'master' into freemod-select-overlay
|
2021-02-03 22:19:35 +01:00 |
|
Dean Herbert
|
b06f4ee124
|
Merge branch 'master' into solo-mod-select-overlay
|
2021-02-03 23:44:08 +09:00 |
|
Dean Herbert
|
17072a5dda
|
Merge pull request #11664 from smoogipoo/modselect-dynamic-isvalid
Make it possible to change IsValidMod in mod selection
|
2021-02-03 23:43:36 +09:00 |
|
Dean Herbert
|
2a52851e68
|
Merge branch 'master' into modselect-dynamic-isvalid
|
2021-02-03 22:11:33 +09:00 |
|