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

132 Commits

Author SHA1 Message Date
Dan Balasescu
6057037e35 Move playlist item beatmap population to MatchSubScreen 2021-12-10 20:08:59 +09:00
Dean Herbert
0ea7a69084 Ensure user is returned to the RoomSubScreen before gameplay is started
This covers the scenario where a user may be at the song select screen
while another user (the room host) starts the match. This was only made
possible with the new queue modes, so is quite a recent regression.
2021-12-06 14:03:52 +09:00
Dan Balasescu
132bb59203 Update working beatmap when returning to match 2021-11-24 19:56:02 +09:00
Dean Herbert
5489b19c57 Update PlaylistItem to use IRulesetInfo 2021-11-15 16:13:03 +09:00
Dean Herbert
6a098a8634 Rename BeatmapInfo.OnlineBeatmapID to OnlineID to match interface 2021-11-12 17:46:24 +09:00
Dean Herbert
54f72d68ca Revert weird event flow in model manager/importers 2021-11-05 19:12:49 +09:00
Dean Herbert
3453160a8b Change PlaylistItem.Beatmap to be an IBeatmapInfo 2021-11-04 13:16:56 +09:00
Dean Herbert
414d920ca2 Revert to previous exposure of RoomSubScreen.BeatmapAvailability 2021-10-29 12:02:10 +09:00
Dean Herbert
746d6a4c16 Fix some oversights and test failures 2021-10-27 23:42:27 +09:00
Dean Herbert
f524e913e1 Move AllowTrackAdjustments specification to RoomSubScreen 2021-09-17 13:24:01 +09:00
Dean Herbert
9e21f5a59c Rename LocalPlayer to User in mod select prefixes 2021-09-01 17:22:52 +09:00
smoogipoo
f85d3665d8 Cleanups 2021-08-20 21:45:24 +09:00
smoogipoo
5192ee3b57 Fix initial display in room background 2021-08-20 21:40:35 +09:00
smoogipoo
5c8ca32ea4 Simplify lounge implementation 2021-08-20 21:33:21 +09:00
smoogipoo
9458cd5a31 Make DrawableMatchRoom background load instantly 2021-08-20 21:07:51 +09:00
smoogipoo
c22c6f3a49 Initial room background implementation 2021-08-20 18:14:12 +09:00
smoogipoo
610a162271 Merge branch 'master' into remove-current-room 2021-08-20 16:23:36 +09:00
Dean Herbert
8fce5911a9 Adjust spacing and padding of footer buttons 2021-08-19 19:08:46 +09:00
Dean Herbert
4d1582d721 Play settings hide animation if visible when exiting RoomSubScreen 2021-08-19 18:14:45 +09:00
smoogipoo
6b6d52c23b Add dependency container to RoomSubScreen 2021-08-19 16:53:07 +09:00
smoogipoo
c31af96f1d Pass room into RoomSettingsOverlay 2021-08-19 16:41:21 +09:00
smoogipoo
eadf02933a Split lounge-specific implementation from DrawableRoom 2021-08-18 20:56:44 +09:00
smoogipoo
63af67f61b Cleanup around footers 2021-08-18 20:25:48 +09:00
smoogipoo
9220d17202 Adjust paddings/spacings 2021-08-18 17:28:20 +09:00
smoogipoo
6dc96fdb83 Disable edit button in playlists 2021-08-18 16:56:42 +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
744b6749d1 Resolve room settings layout issues 2021-08-18 15:29:01 +09:00
smoogipoo
c5268c9a99 Simplify by reusing same room panel 2021-08-18 15:19:24 +09:00
smoogipoo
0853554c24 Fix settings overlay not being initially visible 2021-08-18 15:11:52 +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
6840ec6716 Actually show the room in the sub screen 2021-08-17 17:58:24 +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
Dean Herbert
df24f7a81e
Merge pull request #14256 from smoogipoo/multiplayer-header-redesign
Update multiplayer header to the latest designs
2021-08-13 16:16:25 +09:00
smoogipoo
755b6460b6 Fix multiplayer navigation test failure 2021-08-13 14:05:44 +09:00
smoogipoo
050f2d6b0d Add background to room subscreen 2021-08-12 19:51:03 +09:00
smoogipoo
b75c20fee4 Adjust positioning and paddings 2021-08-12 18:02:00 +09:00
Dean Herbert
abc96057b2 Remove relative height specification and use constant height 2021-05-21 17:55:46 +09:00
timiimit
1fd00d1313 Change from fullscreen to 0.7 2021-05-18 21:52:28 +02:00
timiimit
ac5fe0c18c Change larger freemod selection overlay 2021-05-18 18:50:42 +02:00
Salman Ahmed
8338f702c3 Remove not required null conditional 2021-05-14 09:32:56 +03:00
Dean Herbert
48672f8afd Add very basic test logic to ensure PlayerLoader is present for playlists 2021-05-14 15:02:36 +09:00
smoogipoo
fd0b030cf4 Refactor gameplay screen creation 2021-04-22 23:37:33 +09:00
smoogipoo
6eddc6c59e Enable spectating multiplayer matches 2021-04-09 21:03:50 +09:00
smoogipoo
56c13148f1 Fix typo in class name 2021-04-07 16:45:10 +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
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
8930ff4465 Merge branch 'master' into multiplayer-no-playlist-mangling 2021-02-17 19:29:01 +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
Dean Herbert
97a7572cb8 Move UserModSelectOverlay to RoomSubScreen for Playlists consumption 2021-02-16 15:14:48 +09:00
Dean Herbert
0ca747b39f Merge branch 'master' into fix-multiplayer-mod-propagation-race 2021-02-16 14:25:27 +09: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
21f66a19fd Make server authoritative in which mods the client should be using when gameplay starts 2021-02-11 15:55:18 +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
a2fdba3e51 Rename to OnlinePlayBeatmapAvailabilityTracker 2021-02-05 12:24:38 +09:00
Salman Ahmed
50d57a3931 Move tracker loading into BDL 2021-02-02 17:22:48 +03:00
smoogipoo
89a42d60fb General cleanup 2021-02-01 18:50:32 +09:00
smoogipoo
f538963607 Extra mods -> user mods 2021-02-01 17:57:32 +09:00
Dean Herbert
1d8de2f718 Rename class to better match purpose 2021-02-01 17:32:54 +09:00
smoogipoo
b846146f16 Update mods when resuming room subscreen 2021-02-01 13:58:44 +09:00
smoogipoo
4ae10b1e1c Add initial UI for selecting extra mods 2021-02-01 13:40:59 +09:00
Salman Ahmed
34612ae233 Forward internal management to a container alongside tracker 2021-01-19 20:01:22 +03:00
smoogipoo
de9d075f94 Initial sample + samplechannel rework 2021-01-19 17:11:40 +09:00
Salman Ahmed
4e6c1a3906 Update client beatmap availability in-line with tracker 2021-01-18 10:51:39 +03:00
Salman Ahmed
cf23781036 Cache beatmap tracker and bind to selected item in RoomSubScreen 2021-01-17 00:01:11 +03:00
Bartłomiej Dach
e5064ee930 Rename {Multiplayer -> OnlinePlay}SubScreen 2020-12-25 17:02:35 +01:00
Bartłomiej Dach
4caf75850b Rename {Multiplayer -> OnlinePlay}Screen 2020-12-25 17:00:00 +01:00
Bartłomiej Dach
83fb7c7a1a Re-namespace all files in OnlinePlay directory 2020-12-25 16:50:09 +01:00
Bartłomiej Dach
e797e5ce7a Rename Multi directory to OnlinePlay 2020-12-25 16:50:02 +01:00