1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 00:45:43 +08:00
Commit Graph

792 Commits

Author SHA1 Message Date
Dean Herbert
caf7ef6519 Add missing screen level mod application settings for some screens
Closes #7480. But based on discussion in there this solution may change.
2021-09-13 15:00:34 +09:00
Dean Herbert
7fe0eefb78 Add inline comment regarding team switch sample logic
Feels a bit convoluted without this. Don't really have a better
suggestion for now so a comment will do.
2021-09-13 14:12:19 +09:00
sh0ckR6
447001931c
Resolve LoungeSubScreen from PasswordEntryPopover
This is preferred over passing down the already-resolved LoungeSubScreen
2021-09-12 14:36:11 -04:00
sh0ckR6
e018071be4
Remove OnShakeFinish event 2021-09-11 19:50:41 -04:00
sh0ckR6
6cdc842452
Remove placeholder text response
Weird UX, doesn't feel right compared to the rest of lazer
2021-09-11 17:42:49 -04:00
sh0ckR6
b8a6925175
Use already-resolved LoungeSubScreen instead of nested delegates 2021-09-11 17:41:07 -04:00
Dean Herbert
6fc46792d3 Fix test regressions 2021-09-09 00:39:54 +09:00
Dean Herbert
136573982c Add fade in and fix incorrect wrapper bounds 2021-09-08 20:52:14 +09:00
Dean Herbert
7941240a00 Revert "Load DrawableLoungRooms asynchronously"
This reverts commit 0b55bb6913fbf05ebb8ecadfe711084d6797efe0.
2021-09-08 20:52:14 +09:00
Dean Herbert
3e41d8b32e Reduce initial fade transforms 2021-09-08 20:52:14 +09:00
Dean Herbert
bebb9d7e67 Wrap main content of DrawableRoom 2021-09-08 20:52:14 +09:00
Dean Herbert
037b9cfb59 Load DrawableLoungRooms asynchronously 2021-09-08 20:52:14 +09:00
Jamie Taylor
217ca754ae
Add sound for team swaps 2021-09-08 13:45:05 +09:00
sh0ckR6
b1f91596a7
Give user feedback on password attempt fail
Shake the popover
Set the input box's color to red and set the placeholder text to "incorrect password"
2021-09-07 20:05:24 -04:00
sh0ckR6
b8a1ebb786
Hide Popover after failed password attempt
Instead of throwing an error, just close the popover and let the user continue
2021-09-07 16:54:21 -04:00
smoogipoo
4658577b1d Factor in total score calculation time in results screen load 2021-09-07 15:19:09 +09:00
Dean Herbert
9e21f5a59c Rename LocalPlayer to User in mod select prefixes 2021-09-01 17:22:52 +09:00
Salman Ahmed
6154642075
Merge branch 'master' into local-popover-containers 2021-08-30 15:44:29 +03:00
Dan Balasescu
7be825f470
Merge pull request #14488 from frenzibyte/multi-spectator-player-leaving
Gray out and stop player instances who quit during multi-spectator sessions
2021-08-30 12:04:19 +09:00
Bartłomiej Dach
7457480b50
Add local popover container to lounge subscreen 2021-08-28 20:05:58 +02:00
Dean Herbert
2b06dacd0e Change debounce back to using scheduler
Should better allow for adjusting in the future, as well.
2021-08-27 18:57:19 +09:00
Jamie Taylor
56baecdde4
Add missing interaction sfx to MatchTypePicker 2021-08-26 15:30:20 +09:00
Jamie Taylor
e341f471b0
Add lobby sfx for join/leave/kick/ready/unready events 2021-08-26 15:29:22 +09:00
Salman Ahmed
196c74fce8 Gray out and remove player clock when users stop playing 2021-08-25 11:31:02 +03:00
Salman Ahmed
599145b46a Stop clocks when removing them from sync manager 2021-08-25 11:31:02 +03:00
Dean Herbert
e1ab3434ed Add ability to handle user join/leave/kick events in MultiplayerComposites 2021-08-25 14:37:14 +09:00
Bartłomiej Dach
e503182a8d
Merge branch 'master' into activity-on-multiplayer-screens 2021-08-24 18:50:55 +02:00
smoogipoo
16ddbcd208 Don't bind to RoomId where it's expected to be constant 2021-08-24 14:25:40 +09: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
956c1cc216 Merge branch 'master' into activity-on-multiplayer-screens 2021-08-24 12:33:34 +09:00
Dean Herbert
eaa4d479ac
Merge pull request #14408 from smoogipoo/remove-current-room
Remove the global "selected room" from online screens
2021-08-23 17:29:31 +09:00
Dean Herbert
99bb3032a5 Move gradient to be part of the background for now 2021-08-23 15:27:32 +09:00
Dean Herbert
58fb0c042b Remove background scale altogether
I'm not sure why this is required. Seems like something which was meant
to exist to handle parallax, but that is already handled elsewhere now.
2021-08-23 14:34:27 +09:00
smoogipoo
4f3a5fbad5 Fix test failure 2021-08-23 14:29:15 +09:00
Nathan Alo
2877b43824 split multiplayer and playlist activity 2021-08-22 09:54:07 +08:00
Dean Herbert
15d443f6b7 Use the UI mouse cursor when hovering gameplay chat in an interactive state 2021-08-21 14:44:54 +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
b1a732b9b7 Remove selectedRoom from OnlinePlayScreen 2021-08-20 21:28:48 +09:00
smoogipoo
ceb07826d7 Merge branch 'master' into remove-current-room 2021-08-20 21:10:41 +09:00
smoogipoo
9458cd5a31 Make DrawableMatchRoom background load instantly 2021-08-20 21:07:51 +09:00
smoogipoo
b190020c4b Block lounge background screen from exiting 2021-08-20 21:02:25 +09:00
smoogipoo
d304e283e4 Don't deselect online room when joined 2021-08-20 18:14:59 +09:00
smoogipoo
c22c6f3a49 Initial room background implementation 2021-08-20 18:14:12 +09:00
smoogipoo
258ba4674c Fix background overflows 2021-08-20 17:50:49 +09:00
smoogipoo
3d96da84e6 Set a default background 2021-08-20 17:05:46 +09:00
smoogipoo
8524937c82 Move screenstack up a level 2021-08-20 17:02:55 +09:00
smoogipoo
610a162271 Merge branch 'master' into remove-current-room 2021-08-20 16:23:36 +09:00
Dan Balasescu
c95bf735fe
Merge branch 'master' into multiplayer-chat 2021-08-20 11:54:42 +09:00
Dean Herbert
e25592f325
Merge branch 'master' into fix-lounge-loading 2021-08-19 20:01:47 +09:00
Dean Herbert
b09105e5a7
Merge pull request #14381 from smoogipoo/match-subscreen-redesign
Update layout of multiplayer room screens
2021-08-19 19:36:21 +09:00
smoogipoo
44e157447c Initial rework of backgrounds 2021-08-19 19:10:54 +09:00
Dean Herbert
8fce5911a9 Adjust spacing and padding of footer buttons 2021-08-19 19:08:46 +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
Dean Herbert
675e2e34ba Add padding between beatmap panel and edit button 2021-08-19 19:02:05 +09:00
Dean Herbert
4afc808ffc Remove horizontal transitions for now
They look bad with the current toolbar implementation. We can probably
add them back once the toolbar is moved to the lounge.
2021-08-19 18:29:59 +09:00
smoogipoo
023f3fb70e Use BackgroundScreen for multiplayer backgrounds 2021-08-19 18:19:31 +09:00
smoogipoo
493f47787b Disable condition for the time being 2021-08-19 18:18:42 +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
4d1897c6b4 Remove unnecessary resolve into ListingPollingComponent 2021-08-19 16:52:54 +09:00
smoogipoo
00be7f4cca Make RoomsContainer/DrawableRoom not resolve via DI 2021-08-19 16:52:54 +09:00
smoogipoo
3a1154c00e Pass room into SelectionPollingComponent 2021-08-19 16:41:21 +09:00
smoogipoo
c31af96f1d Pass room into RoomSettingsOverlay 2021-08-19 16:41:21 +09:00
smoogipoo
1fd746524d Remove realtime room category, fix end-date showing for realtime 2021-08-19 16:09:28 +09:00
smoogipoo
6469eaa427 Fix background not updated in room 2021-08-19 15:52:51 +09:00
Dean Herbert
6d00ea3375 Allow toggling focus via binding 2021-08-19 14:19:59 +09:00
Salman Ahmed
b984780d6a Merge branch 'master' into fix-lounge-loading 2021-08-19 06:26:15 +03:00
Salman Ahmed
0e2f3dff4d Fix rooms scroll container not masking properly due to padding 2021-08-19 05:09:49 +03:00
Salman Ahmed
ffbe8ddfa4 Refactor lounge sub screen layout for better loading screen appearance 2021-08-19 04:23:12 +03:00
Bartłomiej Dach
07951fe18c
Merge branch 'master' into limit-match-settings-textbox 2021-08-18 21:17:16 +02:00
Davran Dilshat
43cbd10a38 change limit to be on actual usage site 2021-08-18 18:30:50 +01:00
Davran Dilshat
61675eefe0 Add length limit to match settings textboxes 2021-08-18 17:36:57 +01:00
smoogipoo
d40023bcc1 Hide border by default 2021-08-18 21:09:34 +09:00
smoogipoo
e9221f0126 Cleanup unnecessary implementation 2021-08-18 21:00:11 +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
Salman Ahmed
8172ffc401 Fix lounge sub screen loading layer displaying in the background 2021-08-18 13:12:58 +03:00
Dean Herbert
1faf789f0e Allow expanding chat using key binding even when it is hidden 2021-08-18 18:25:21 +09:00
Dean Herbert
365c1bccc6 Fix multiplayer channel being unintentionally left after gameplay session 2021-08-18 18:24:20 +09:00
Salman Ahmed
5e91ec73e3 Handle star rating range display sizing 2021-08-18 11:36:27 +03:00
Dean Herbert
2099298444 Disallow clicking on chat textbox during gameplay 2021-08-18 17:30:50 +09:00
smoogipoo
9220d17202 Adjust paddings/spacings 2021-08-18 17:28:20 +09:00
Dean Herbert
9d2664cbb1 Merge branch 'master' into star-rating-display-v2 2021-08-18 17:22:33 +09:00
smoogipoo
6dc96fdb83 Disable edit button in playlists 2021-08-18 16:56:42 +09:00
smoogipoo
87a5922f0e Remove participants from playlists screen 2021-08-18 16:26:45 +09:00
smoogipoo
66e11fe75e Initial integration of playlists with the new structure 2021-08-18 16:09:15 +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
228ad98b39 Remove extra corner radius on DrawableRoom 2021-08-18 15:27:23 +09:00
smoogipoo
f3bc9c3e45 Merge branch 'master' into match-subscreen-redesign 2021-08-18 15:19:29 +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
0853554c24 Fix settings overlay not being initially visible 2021-08-18 15:11:52 +09:00
smoogipoo
c66abf85f7 Remove match header 2021-08-18 14:04:44 +09:00
Dan Balasescu
eaf7bd72fc
Merge branch 'master' into multiplayer-chat 2021-08-17 20:08:01 +09:00