1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 17:17:26 +08:00
Commit Graph

180 Commits

Author SHA1 Message Date
Dean Herbert
0658cfb986 Throw exceptions rather than silently failing if attempting to add a clock for a non-tracked user 2021-07-06 14:56:00 +09:00
Dean Herbert
229bba14e6 Fix master clock becoming incorrectly paused when all spectator players are too far ahead 2021-07-05 17:45:08 +09:00
smoogipoo
6dd3c6fe93 Make MultiSpectatorScreen and tests more resillient to timing 2021-06-29 22:45:51 +09:00
smoogipoo
bfdbe3c3fe Fix clocks getting added a second time 2021-06-29 17:29:25 +09:00
smoogipoo
9f163f7f20 Use switch statement to be more explicit about state 2021-06-11 19:23:25 +09:00
smoogipoo
0a8daab4f7 Pause master clock when too far ahead 2021-06-11 19:15:53 +09:00
smoogipoo
59eda70c12 Seek to the least most-recent frame instead 2021-06-11 18:40:56 +09:00
smoogipoo
263b8ff097 Wait for full player load 2021-06-11 18:14:37 +09:00
smoogipoo
a99cb79738 Seek master clock on multi-spectator start 2021-06-11 16:25:45 +09:00
smoogipoo
75d825c85c Dont control master clock from sync manager 2021-06-11 16:24:52 +09:00
smoogipoo
1c67ef7c91 Make catchup clock support seeking 2021-06-11 16:23:59 +09:00
smoogipoo
c3ea1b26e1 Fix DT being doubled in multiplayer spectator 2021-06-08 22:51:42 +09:00
Dean Herbert
a15cac6f53 Change the way Score is initialised in Player to better lend to population of metadata 2021-06-02 15:44:04 +09:00
smoogipoo
a74405d0ed Merge branch 'master' into restructure-spectator-client 2021-05-20 18:53:42 +09:00
smoogipoo
6beeb7f7c4 Rename SpectatorStreamingClient -> SpectatorClient 2021-05-20 15:55:07 +09:00
smoogipoo
d197a7f6f5 Rename multiplayer client classes 2021-05-20 15:39:45 +09:00
Dean Herbert
54abf8f6f6 Vertically centre leaderboard for now 2021-05-03 14:48:04 +09:00
Dean Herbert
b1a19b6dd6 Add xmldoc for PlayerIsolationContainer 2021-05-03 14:41:55 +09:00
Dean Herbert
2aa21e2aff Adjust documentation in CatchUpSyncManager 2021-05-03 14:37:11 +09:00
Dean Herbert
c065092e72 Fix weird access to userIds in MultiplayerSpectatorScreen 2021-05-03 14:25:52 +09:00
Dean Herbert
6da4105da6 Remove Sync namespace (feels unnecessary) 2021-05-03 13:38:53 +09:00
smoogipoo
630a6dc46a Fix missing dependency 2021-04-26 22:23:44 +09:00
smoogipoo
ed93e26e52 Use single method for starting/restarting spectator screen 2021-04-26 21:56:15 +09:00
smoogipoo
7e11d520d5 Remove finished players from multi spectator screen 2021-04-26 21:25:46 +09:00
smoogipoo
94d0b06493 Expose mute adjustment instead 2021-04-26 19:01:30 +09:00
smoogipoo
d7618b63fa Fix test failure 2021-04-26 17:35:13 +09:00
smoogipoo
6626e70c95 Pass in master clock instead of slave clock 2021-04-26 17:30:27 +09:00
smoogipoo
5b4cb71cc7 Change terminology from "slave" to "player clock" 2021-04-26 17:19:44 +09:00
smoogipoo
63a9484255 Expose WaitingOnFrames as mutable bindable 2021-04-23 19:11:47 +09:00
smoogipoo
575ec7c528 Document + refactor max player limitation 2021-04-23 19:11:35 +09:00
smoogipoo
4f0857f946 Xmldocs and general refactorings 2021-04-22 23:52:22 +09:00
smoogipoo
ee25949751 Rename classes 2021-04-22 23:39:02 +09:00
smoogipoo
8a0ba3a055 Merge GameplayIsolationContainer into PlayerInstance, remove track 2021-04-22 23:38:51 +09:00
smoogipoo
64579d50ac Use only single PlayerInstance for hit sample playback 2021-04-22 22:59:47 +09:00
smoogipoo
6588859c32 Remove loggings 2021-04-22 22:29:18 +09:00
smoogipoo
1ca2152e61 Privatise + rename to SlaveGameplayClockContainer 2021-04-21 23:22:36 +09:00
smoogipoo
2bea625613 Fix initial playback states not being correct 2021-04-21 23:22:11 +09:00
smoogipoo
f32d00c0d9 Fix post-merge errors 2021-04-21 17:13:01 +09:00
smoogipoo
724fe3d378 Remove unnecessary method 2021-04-16 22:57:34 +09:00
smoogipoo
72ebcb157f Dispose track on dispose 2021-04-16 22:57:27 +09:00
smoogipoo
4c5d4752b1 Rename classes to reduce redundant naming 2021-04-16 22:47:52 +09:00
smoogipoo
7d5d7088cd Remove now unnecessary override 2021-04-16 20:51:07 +09:00
smoogipoo
1c086d99de Add loading spinner 2021-04-16 13:28:32 +09:00
smoogipoo
5ac0eb02cd Always add player instances at first, populate later 2021-04-16 12:25:29 +09:00
smoogipoo
b391a8f94e Properly bind WaitingOnFrames 2021-04-15 19:37:45 +09:00
smoogipoo
33cc5c5cb3 A few more xmldocs 2021-04-15 19:35:57 +09:00
smoogipoo
82fcabb8f0 More refactorings/renamespacings/xmldocs 2021-04-15 19:32:55 +09:00
smoogipoo
df4fce2c57 Rename classes 2021-04-15 19:16:00 +09:00
smoogipoo
1705d472b5 Reimplement multiplayer syncing using new master/slave clocks 2021-04-15 19:12:52 +09:00
smoogipoo
33ad7850cb Remove LastFrameTime 2021-04-15 16:45:59 +09:00
smoogipoo
6fc7488a67 Reimplement syncing logic as a new component 2021-04-15 16:33:59 +09:00
smoogipoo
774cca38c4 Make spectating instances use custom GCC 2021-04-14 20:39:14 +09:00
smoogipoo
69b01e7270 Add some debugging 2021-04-14 00:58:03 +09:00
smoogipoo
3039b7b0f9 Make tests a bit more resilient 2021-04-13 22:40:24 +09:00
smoogipoo
20823abb30 Make resyncing a bit more resilient 2021-04-13 22:10:35 +09:00
smoogipoo
627dd960b0 Disable player input for now 2021-04-13 20:52:20 +09:00
smoogipoo
5b53a2b211 Merge branch 'master' into multiplayer-spectator-screen 2021-04-13 20:07:56 +09:00
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
dd1925aaed Remove temporary input ignore 2021-04-12 14:29:27 +09:00
smoogipoo
4409c1a36f Increase sync offset to prevent constant catchups 2021-04-09 22:01:21 +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
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