1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 00:23:22 +08:00
Commit Graph

401 Commits

Author SHA1 Message Date
Dean Herbert
2884ed3ab9
Merge pull request #12350 from smoogipoo/multiplayer-spectator-player-grid
Add the multiplayer spectator player grid
2021-04-13 19:25:32 +09:00
smoogipoo
c531e38a36 Rework to create a derived tracked user data instead 2021-04-12 22:00:27 +09:00
Dean Herbert
0eab9daf13 Update existing overlay containers to not block scroll input 2021-04-12 16:41:36 +09:00
Dean Herbert
dd1925aaed Remove temporary input ignore 2021-04-12 14:29:27 +09:00
Dean Herbert
9be3163592 Merge branch 'master' into multiplayer-spectator-player-grid 2021-04-12 14:14:13 +09:00
smoogipoo
4409c1a36f Increase sync offset to prevent constant catchups 2021-04-09 22:01:21 +09:00
smoogipoo
6eddc6c59e Enable spectating multiplayer matches 2021-04-09 21:03:50 +09:00
smoogipoo
3e46d6401e Remove some unnecessary code 2021-04-09 20:23:11 +09:00
smoogipoo
eccd269cce Implement maximum start delay 2021-04-09 20:17:57 +09:00
smoogipoo
49b7519c53 Refactor gameplay starting logic 2021-04-09 20:03:34 +09:00
smoogipoo
c93ce73123 Move catchup logic inside PlayerInstance, fixup some edge cases 2021-04-09 19:59:34 +09:00
smoogipoo
f8dfb9544b Merge branch 'multiplayer-spectator-leaderboard' into multiplayer-spectator-screen 2021-04-09 18:42:04 +09:00
smoogipoo
d2c37e6cf8 Remove unnecessary parameter 2021-04-09 18:41:58 +09:00
smoogipoo
4fa51d5ec8 Add leaderboard to multiplayer spectate screen 2021-04-09 18:41:48 +09:00
smoogipoo
950e4e05ef Merge branch 'multiplayer-spectator-leaderboard' into multiplayer-spectator-screen 2021-04-09 18:30:21 +09:00
smoogipoo
90e243eea5 Rename methods 2021-04-09 18:15:27 +09:00
smoogipoo
3b86f0eb2f Fix exception with 0 frames 2021-04-09 18:15:23 +09:00
smoogipoo
bb15baf118 Add initial multiplayer spectator leaderboard 2021-04-09 17:31:14 +09:00
smoogipoo
ecd0b84d94 Use max_sync_offset constant 2021-04-08 22:15:07 +09:00
smoogipoo
1b5679b0d7 Refactor ctor 2021-04-08 22:14:26 +09:00
smoogipoo
7d276144b8 Fix player sizing + masking 2021-04-08 22:13:54 +09:00
smoogipoo
709016f0d6 Add initial multiplayer screen implementation 2021-04-08 22:07:00 +09:00
smoogipoo
d64b236f86 Add a container that provides an isolated gameplay context 2021-04-08 21:27:16 +09:00
smoogipoo
125358158b Merge branch 'master' into multiplayer-spectator-screen 2021-04-08 21:13:37 +09:00
smoogipoo
fd2a14a0bf Only set button state once 2021-04-08 16:31:40 +09:00
Dean Herbert
a55e62188e Change state icon to binoculars so the eye isn't staring at me 2021-04-08 15:54:58 +09:00
Dean Herbert
b73860cb5f Slightly alter button colour scheme to make text more legible and reduce saturation 2021-04-08 15:47:55 +09:00
smoogipoo
72a42ceaf7 Merge branch 'multiplayer-spectator-player-grid' into multiplayer-spectator-screen 2021-04-08 00:19:00 +09:00
smoogipoo
5dc939c2f3 More documentation 2021-04-08 00:12:21 +09:00
smoogipoo
024adb699c Add test and fix several issues 2021-04-08 00:12:21 +09:00
smoogipoo
648a9d5258 Add multiplayer spectator player grid 2021-04-08 00:12:21 +09:00
smoogipoo
99bee73ac1 Merge branch 'master' into add-spectate-button-and-state 2021-04-07 22:07:52 +09:00
smoogipoo
93c5935ebc Add match subscreen support + test 2021-04-07 20:46:30 +09:00
smoogipoo
abd637ffaa Add button to footer 2021-04-07 17:35:18 +09:00
smoogipoo
56c13148f1 Fix typo in class name 2021-04-07 16:45:10 +09:00
smoogipoo
c744f77cfa Add participant panel state 2021-04-07 16:40:24 +09:00
smoogipoo
6be9c9f0f4 Link up ready button to spectate state 2021-04-07 16:35:50 +09:00
smoogipoo
6de91d7b6b Add spectate button + test 2021-04-06 21:37:27 +09:00
Dean Herbert
6a4157d193 Remove unused using statement 2021-03-26 16:13:43 +09:00
Dean Herbert
7faca766e4 Fix crash on attempting to join lobby using key press during a pending join
Closes https://github.com/ppy/osu/issues/12040.
2021-03-26 14:49:05 +09:00
Dean Herbert
84b2f9a848 Make token private 2021-03-24 13:20:44 +09:00
Dean Herbert
3cd8bf2d7f Move token request construction to LoadAsyncComplete to better allow DI usage 2021-03-23 18:20:55 +09:00
Dean Herbert
571124669d Remove all references to "score submission" from Player 2021-03-23 18:20:55 +09:00
Dean Herbert
12f050264a Further split out a player class which submits to "rooms" 2021-03-23 18:20:55 +09:00
Dean Herbert
7045fce555 Move score submission logic in general out to its own Player type 2021-03-23 18:20:55 +09:00
Dean Herbert
9c690f9545 Fix second usage 2021-03-23 14:08:00 +09:00
Dean Herbert
b1cd01ceb8 Apply ConfigureAwait changes to game side 2021-03-08 14:36:35 +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
90e8308716 Merge branch 'master' into localisation-refactor-framework 2021-02-25 17:28:55 +09:00
Dean Herbert
e82eaffaed Flip order back to original for romanisable strings 2021-02-25 14:14:07 +09:00
Dean Herbert
8a97e2e28d Update LocalisedString usages to RomanisedString 2021-02-22 19:01:42 +09:00
Dean Herbert
1fd76ea3fb Apply changes to UI components overriding functions with changing signatures 2021-02-22 19:01:42 +09:00
smoogipoo
ccb83ef3a3 Fix checkbox not being updated 2021-02-22 15:47:47 +09:00
smoogipoo
8d463987dd Fix being able to select incompatible freemods 2021-02-22 13:24:24 +09:00
Dan Balasescu
8037b101cb
Merge branch 'master' into perform-from-subscreen-support 2021-02-22 11:55:51 +09:00
Dan Balasescu
9fc57b2145
Merge pull request #11832 from peppy/leaderboard-compact-mode
Show compact leaderboard during gameplay to reduce distractions
2021-02-19 18:17:46 +09:00
Dean Herbert
362e4802f7 Add the ability for PerformFromMenuRunner to inspect nested screen stacks 2021-02-19 17:58:04 +09:00
Dean Herbert
b8c1e8ed7a
Merge pull request #11708 from frenzibyte/multiplayer-participant-rank
Display user global rank for multiplayer room participants
2021-02-19 16:57:30 +09:00
Dean Herbert
9d02f589fe Compact leaderboard during gameplay 2021-02-19 16:51:39 +09:00
Dean Herbert
484968d797
Fix weird bool check
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-02-19 14:46:10 +09:00
Dean Herbert
4504023a23 Merge branch 'master' into playlists-freemod-support 2021-02-19 14:43:59 +09:00
Dean Herbert
39059ed82d Remove unnecessary null coalesce check 2021-02-19 14:36:51 +09:00
Dean Herbert
df05c57f44 Merge branch 'master' into playlists-freemod-support 2021-02-19 14:35:20 +09:00
Dean Herbert
a2aec6bcdc
Merge pull request #11808 from smoogipoo/multiplayer-no-playlist-mangling
Rework multiplayer playlist handling to support multiple items
2021-02-19 14:33:53 +09:00
smoogipoo
bc10fcafae Remove now unnecessary schedule 2021-02-19 13:23:51 +09:00
Dean Herbert
b68dbbceff
Merge branch 'master' into multiplayer-participant-rank 2021-02-19 13:16:44 +09:00
Salman Ahmed
e14a59f272 Fix creating ruleset instances per LINQ select 2021-02-18 15:26:59 +03:00
smoogipoo
e911760318 Split OnlinePlayComposite to remove if-statement 2021-02-18 15:47:33 +09:00
Dean Herbert
421cdb6650 Consume new method in existing usages (and remove some unnecessary set/unset code) 2021-02-18 15:01:11 +09:00
smoogipoo
6ef235c4c5 Fix beatmap panel flickering multiple times 2021-02-17 21:54:43 +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
smoogipoo
604add04e4 Fix song select mods being reset incorrectly 2021-02-17 19:06:37 +09:00
smoogipoo
70a995919c Update comments 2021-02-17 17:58:24 +09:00
Dan Balasescu
57ede6eb37
Merge branch 'master' into fix-multiplayer-mod-propagation-race 2021-02-17 16:22:51 +09:00
Dean Herbert
86faa7f465
Merge pull request #11798 from smoogipoo/multiplayer-long-types
Use long type where required in multiplayer
2021-02-17 15:50:12 +09:00
Salman Ahmed
a845e96b7a Replace Ranks.Global completely with a GlobalRank property 2021-02-17 08:52:04 +03:00
Salman Ahmed
d7c91a7c6f Merge branch 'fix-tournament-user-population' into multiplayer-participant-rank 2021-02-17 08:42:59 +03:00
Bartłomiej Dach
8f72631c31 Fix typo in comment 2021-02-16 21:48:19 +01:00
smoogipoo
100097d78f Fix playlist not being handled correctly for non-joined cases 2021-02-16 21:32:35 +09:00
Dan Balasescu
bef0e5cfa1
Merge pull request #11790 from peppy/playlists-show-remaining-attempts
Display remaining attempts for playlist rooms with room-level attempt limits
2021-02-16 21:10:19 +09:00
Dan Balasescu
ffa90c1a23
Remove whitespace 2021-02-16 20:23:19 +09:00
Dan Balasescu
8e077c2857
Merge pull request #11791 from peppy/rooms-container-fix-click-deselection
Add the ability to deselect the currently selected room via clicking away
2021-02-16 20:22:24 +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
Dean Herbert
fdcb6384cb Add user mod selection to playlists room screen 2021-02-16 15:14:56 +09:00
Dean Herbert
97a7572cb8 Move UserModSelectOverlay to RoomSubScreen for Playlists consumption 2021-02-16 15:14:48 +09:00
Dean Herbert
fff1cb0b35 Fix allowed mods not being copied when populating playlist items 2021-02-16 15:14:21 +09:00
Dean Herbert
da42c6d282 Expose FreeMods from OnlinePlaySongSelect 2021-02-16 15:14:21 +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
Dean Herbert
31a5cdd8ac Fix current selection not updating visually after creating a new playlist 2021-02-16 14:02:21 +09:00
Dean Herbert
e969ca8974 Remove unused using statement that rider could not identify 2021-02-16 13:52:42 +09:00
Dean Herbert
e82922f8c5 Add the ability to deselect the currently selected room via clicking away
Always felt wrong that you couldn't do this until now.
2021-02-16 13:44:37 +09:00
Salman Ahmed
0e7f52b5cc Always use JSON property global_rank for global ranks instead 2021-02-16 07:33:16 +03:00
Salman Ahmed
5b4999e8af Update user statistics retrieval with API changes 2021-02-16 07:33:13 +03:00
Dean Herbert
02417697e9 Display remaining attempts for playlist rooms with room-level attempt limits 2021-02-16 13:32:14 +09:00
Salman Ahmed
d15ffff9a5 Simplifiy user statistics retrieval to one-time on deserialization 2021-02-16 04:48:36 +03:00
Salman Ahmed
a1496cd8f3 Remove necessity of using CurrentModeRank as a fallback 2021-02-16 04:48:36 +03:00
Salman Ahmed
90aa6256d7 Merge branch 'master' into multiplayer-participant-rank 2021-02-16 04:44:57 +03: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
Dean Herbert
889a99c49c Use AddOnce everywhere to reduce potential call count 2021-02-11 16:00:52 +09: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
Dan Balasescu
92599aa02b
Merge branch 'master' into user-beatmap-downloading-states-2 2021-02-09 21:06:09 +09:00
Salman Ahmed
d101add159 Display user global rank for selected ruleset in participants panel 2021-02-08 21:25:50 +03: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