h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-16 20:32:55 +08:00
Code Issues Releases Wiki Activity
64,775 Commits 3 Branches 657 Tags 356 MiB
a20c430d6f
Commit Graph

264 Commits

Author SHA1 Message Date
smoogipoo
73ee82ee2b Rename RecentParticipantsList -> DrawableRoomParticipantsList 2021-09-29 19:15:58 +09:00
Jamie Taylor
f868feae44
Remove unnecessary Schedule 2021-09-17 21:12:39 +09:00
Jamie Taylor
9485323a13
Add audio feedback for incorrect MP room password 2021-09-17 20:52:13 +09:00
Dean Herbert
027912d4f6 Refocus the multiplayer password entry textbox on failed join 2021-09-17 18:25:25 +09:00
Dean Herbert
cd4ba71a6b Revert "Merge pull request #14772 from Joehuu/lounge-disallow-track-adj" 
This reverts commit 06ff4838fb, reversing
changes made to 5453ea0ce9.
 2021-09-17 13:22:39 +09:00
Joseph Madamba
55feb47e61 Disallow track adjustments on playlists / multi lounge 2021-09-16 20:17:21 -07:00
smoogipoo
f9d5abff8a Update with keybinding changes 2021-09-16 18:26:12 +09:00
Bartłomiej Dach
7b9e501fa0
Merge branch 'master' into 14421-multi-password-error-handling 2021-09-14 22:58:20 +02:00
Dean Herbert
5058f28504 Remove breaking padding 2021-09-14 14:52:50 +09:00
Dean Herbert
8865e3cab8 Add back shake and tweak transform of text 2021-09-14 14:44:32 +09:00
Dean Herbert
7bd749d0eb Remove weird shaking 2021-09-14 14:19:55 +09:00
Dean Herbert
e3c56f9ebd Show error message in popover 2021-09-14 14:14:06 +09:00
Dean Herbert
eaac2bad3d Fix incorrect child margin specifications 2021-09-14 13:49:02 +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
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
Bartłomiej Dach
7457480b50
Add local popover container to lounge subscreen 2021-08-28 20:05:58 +02:00
smoogipoo
4f3a5fbad5 Fix test failure 2021-08-23 14:29:15 +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
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
610a162271 Merge branch 'master' into remove-current-room 2021-08-20 16:23:36 +09:00
Dean Herbert
e25592f325
Merge branch 'master' into fix-lounge-loading 2021-08-19 20:01:47 +09:00
smoogipoo
44e157447c Initial rework of backgrounds 2021-08-19 19:10:54 +09:00
smoogipoo
023f3fb70e Use BackgroundScreen for multiplayer backgrounds 2021-08-19 18:19:31 +09:00
smoogipoo
00be7f4cca Make RoomsContainer/DrawableRoom not resolve via DI 2021-08-19 16:52:54 +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
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
smoogipoo
d40023bcc1 Hide border by default 2021-08-18 21:09:34 +09:00
smoogipoo
eadf02933a Split lounge-specific implementation from DrawableRoom 2021-08-18 20:56:44 +09:00
Salman Ahmed
8172ffc401 Fix lounge sub screen loading layer displaying in the background 2021-08-18 13:12:58 +03: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
704af94d39 Add edit button to room panel 2021-08-18 15:13:10 +09:00
Dean Herbert
3b5fc6d10f Ensure updateLoadingLayer is run at least once 2021-08-17 17:18:23 +09:00
smoogipoo
352949069a Move filter to LoungeSubScreen 2021-08-17 09:36:43 +09:00
smoogipoo
6320768a67 Merge branch 'master' into multi-polling-request-refactor 2021-08-17 08:44:56 +09:00
smoogipoo
b6a2020c59 General refactorings from PR review 2021-08-16 13:09:04 +09:00
Dean Herbert
f0fe79b568 Remove buffered container workarounds for now 2021-08-16 11:04:21 +09:00
smoogipoo
1c0ffd4621 Merge branch 'master' into multi-polling-request-refactor 2021-08-13 22:24:01 +09:00
smoogipoo
d57508853e Merge branch 'master' into multi-polling-request-refactor 2021-08-13 22:04:31 +09:00
smoogipoo
44b3e3bfac Merge branch 'master' into fix-playlists-cross-ruleset-entry 2021-08-13 21:58:15 +09:00
smoogipoo
1f992e67f3 Fix listing polling rate when entering room 2021-08-13 18:17:25 +09:00
smoogipoo
83935540ca Add selection polling component to PlaylistsRoomSubScreen 2021-08-13 18:11:52 +09:00
smoogipoo
7cbf4c48ed Fix multiplayer polling when not connected 2021-08-13 17:59:18 +09:00
smoogipoo
8910781bcd Move listing polling component to LoungeSubScreen 2021-08-13 17:39:09 +09:00
Dean Herbert
db52549152 Move below everything rather than proxying (works better with new design) 2021-08-13 16:20:53 +09:00
Dean Herbert
6a95fa0278 Merge branch 'master' into fix-loading-screen-depth 2021-08-13 16:20:38 +09:00
Dean Herbert
dd7ca4b77b Increase "create room" button height 2021-08-13 15:35:45 +09:00
Dean Herbert
a1b72e7f97 Remove redundant array type specification 2021-08-13 14:41:07 +09:00
Dean Herbert
0f45155b8e Fix remaining cases of invalid bindable operations during lease 2021-08-13 14:29:28 +09:00
Dean Herbert
92d4c9224a Merge branch 'master' into fix-playlists-cross-ruleset-entry 2021-08-13 14:28:14 +09:00
Dean Herbert
89eded457c Fix weird margins on loading display in lounge 2021-08-13 14:27:28 +09:00
Dean Herbert
8249ce7988
Merge branch 'master' into multiplayer-header-redesign 2021-08-12 21:00:46 +09:00
smoogipoo
047b37788b Merge online play filter control with the lounge subscreen 2021-08-12 19:48:15 +09:00
Dean Herbert
e89aea1fc2 Add some padding between scroll bar and content 2021-08-12 19:47:26 +09:00
Dean Herbert
10195e0c53 Add total user count 2021-08-12 19:47:26 +09:00
Dean Herbert
7b66616dc4 Simplify logic and test/fix edge case 2021-08-12 19:47:26 +09:00
Dean Herbert
8a67304b9f Fix recent participants hidden user logic not handling edge case correctly 
Hiding just one user never makes sense, so this will now always show up
to the required circle count until two users are required to be hidden.
This will make the listing more consistent with the width requirement
spec.
 2021-08-12 19:47:26 +09:00
Dean Herbert
127fd4d292 Match font weight of design for hidden user count 2021-08-12 19:47:26 +09:00
Dean Herbert
2c07b68f6f Fix incorrect colour for hidden user display 2021-08-12 19:47:26 +09:00
Dean Herbert
512382987e Add colour provider for multiplayer usage 2021-08-12 19:47:26 +09:00
Dean Herbert
ab1cc6ad48 Fix padding around recent participants icon being uneven 2021-08-12 16:50:09 +09:00
Dean Herbert
4d6101f4e5 Lease selected room while in match screen to avoid lounge potentially changing it 2021-08-12 14:56:58 +09:00
smoogipoo
bbb28d1b29 Don't use null-propagation for status 2021-08-12 09:14:46 +09:00
smoogipoo
58d76e9036 Use FinishTransforms() 2021-08-12 09:13:10 +09:00
Dean Herbert
f4739d0118 Remove MaskingSmoothness to avoid making sheered container blurry 2021-08-09 16:28:43 +09:00
Dean Herbert
0b76460043 Merge branch 'master' into lounge-redesign 2021-08-09 16:28:28 +09:00
Dean Herbert
a12f6b78a4 Split status retrieval into its own method 2021-08-09 16:21:12 +09:00
Jamie Taylor
5031b19b42
Add sounds to multiplayer games list 2021-08-06 23:39:42 +09:00
smoogipoo
19ed24a06f Remove unnecessary duplicate background 2021-08-06 18:59:19 +09:00
smoogipoo
9019e0947a Remove unused using 2021-08-06 18:54:02 +09:00
smoogipoo
798b16fc24 Remove unused params 2021-08-06 18:52:46 +09:00
smoogipoo
bdfdd00afe Adjust spacings and sizings of left-side details 2021-08-06 18:52:01 +09:00
smoogipoo
74bffeac5e Minor design adustments (paddings/sizing) 2021-08-06 17:03:44 +09:00
smoogipoo
0ea982c036 Update recent participants list to use participant_count 2021-08-05 22:49:41 +09:00
smoogipoo
fd6d488657 Add thousands separator to rank range pill 2021-08-05 21:40:09 +09:00
smoogipoo
c74e620ce9 Add constant for background colour 2021-08-05 21:39:51 +09:00
smoogipoo
87fd1eaf06 Explain negative padding 2021-08-05 21:19:23 +09:00
smoogipoo
438f0ce702 Increase default number of avatars 2021-08-05 21:18:30 +09:00
smoogipoo
2f2e3d7366 Use higher res background image 2021-08-05 21:01:21 +09:00
smoogipoo
bd394d9377 Fix pluralisation 2021-08-05 20:56:23 +09:00
smoogipoo
5521f38cfb Adjust spacing 2021-08-05 20:56:09 +09:00
smoogipoo
3b6771ca65 Remove todo 2021-08-04 22:09:03 +09:00
smoogipoo
fbf89493ad Merge branch 'master' into lounge-redesign 2021-08-04 19:53:55 +09:00
Dean Herbert
9b9dacf3fe Update usages of Drawable.Click() 2021-08-04 17:30:33 +09:00
smoogipoo
c06fffb56a Increase background image resolution 2021-08-04 13:49:13 +09:00
smoogipoo
1b6b7ce343 Merge branch 'master' into lounge-redesign 2021-08-03 20:02:31 +09:00
Dan Balasescu
488dd3ea52
Merge pull request #13980 from peppy/fix-online-song-select-background 
Fix song select background not showing in multiplayer/playlists
 2021-07-26 15:16:39 +09:00
Dean Herbert
3770193ede Fix keyboard navigation at multiplayer lounge not iterating in correct order 2021-07-26 13:49:09 +09:00
Salman Ahmed
749d7a7b24 Fix DrawableRoom swallowing mouse down events before reaching its container 2021-07-26 04:41:47 +03:00
Dean Herbert
a5736085a9 Ensure externally run operations on LoungeSubScreen are run after load is completed 2021-07-23 02:23:37 +09:00
Bartłomiej Dach
db9cf443c7
Allow confirming room password by pressing Enter 2021-07-21 00:04:51 +02:00
smoogipoo
57a99886d5 Fix password icon not disappearing when no password 2021-07-19 22:31:01 +09:00
smoogipoo
892d858d5f Fix compile error 2021-07-19 22:23:31 +09:00
Dean Herbert
c6bc95767d Simplify popover hide logic and add test coverage 2021-07-17 22:31:47 +09:00
Dean Herbert
c966cb0530 Fix dependency lookup failing due to location of PopoverContainer 2021-07-17 15:04:18 +09:00
Dean Herbert
9d693c75cf Add Schedule to restore password text box focus behaviour 2021-07-14 23:56:52 +09:00
Dean Herbert
cc09a8b5ba Update to use OsuPopover implementation 2021-07-14 23:55:46 +09:00
smoogipoo
dfe7cc40a9 Move create room button into the lounge 2021-07-14 18:55:01 +09:00
smoogipoo
3e6b9bd48d Add filter background 2021-07-14 18:24:30 +09:00
smoogipoo
c64230315f Adjust layouts 2021-07-14 18:10:59 +09:00
smoogipoo
0bfaf11d51 Remove/fix paddings in lounge 2021-07-14 17:46:52 +09:00
smoogipoo
f6b81b76e8 Add shadow 2021-07-14 17:46:32 +09:00
smoogipoo
da3b40a4dd Add default background to panel, reduce nesting 2021-07-14 16:56:46 +09:00
smoogipoo
e0c61c24b1 Remove spotlights glow 2021-07-14 16:51:31 +09:00
smoogipoo
0e89bafd17 Add special category pill + secondary background 2021-07-14 16:48:53 +09:00
Dean Herbert
481e4dedb0 Move PopoverContainer to OsuGameBase 2021-07-13 16:51:31 +09:00
smoogipoo
b5d4b9444f wip 2021-07-13 16:51:29 +09:00
Dean Herbert
6409a518db Focus password text box on popover display 2021-07-13 16:35:37 +09:00
smoogipoo
0cb80e105b Renamespace classes 2021-07-13 16:02:18 +09:00
smoogipoo
ab282b9e59 Remove RoomInspector from the lounge 2021-07-13 16:00:42 +09:00
smoogipoo
689cee832c Fix 1px gaps in DrawableRoom background 2021-07-13 15:50:46 +09:00
smoogipoo
8c4a257742 Add recent participants 2021-07-13 15:10:44 +09:00
Dean Herbert
4dea2d9778 Dismiss popovers on returning to lounge 2021-07-12 18:54:17 +09:00
Dean Herbert
bbc3a013c8 Use BasicPopover for now 2021-07-12 18:29:50 +09:00
Dean Herbert
b4ca6b6188 Update popover logic to take advantage of new explicit popup functionality 2021-07-12 18:25:04 +09:00
Dean Herbert
a3e0168a46 Update tests 2021-07-12 18:25:04 +09:00
Dean Herbert
e25b3518dc Make password popover display inside RoomsContainer rooms 2021-07-12 18:25:04 +09:00
Dean Herbert
9f9d7f9125 Add remaining pieces of password flow (for osu-web join request) 2021-07-12 18:22:52 +09:00
Dean Herbert
3c49b46c5f Add lock overlay for rooms which are password protected 2021-07-12 18:22:52 +09:00
smoogipoo
c1fba3da6b Add solid background 2021-07-12 16:30:34 +09:00
smoogipoo
aba09b20a5 Add host under room title 2021-07-12 16:28:22 +09:00
smoogipoo
a8cbffa57e Add playlist count pill 2021-07-12 15:11:53 +09:00
smoogipoo
185e36bf97 Split pill display into abstract class 2021-07-12 15:11:10 +09:00
smoogipoo
b4b0b862ef Adjust some layout 2021-07-12 14:07:21 +09:00
smoogipoo
8929aa0ca7 Initial redesign of DrawableRoom 2021-07-07 14:47:24 +09:00
smoogipoo
c50e3fd317 Clean up selection box construction 2021-07-07 14:47:24 +09:00
smoogipoo
a3b1e1d5fc Check for null ruleset in FilterCriteria 2021-06-29 15:18:40 +09:00
Dean Herbert
6ef9b346e1 Fix newly found inspections from 2021.1EAP1 2021-06-01 14:33:21 +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
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
Dean Herbert
31a5cdd8ac Fix current selection not updating visually after creating a new playlist 2021-02-16 14:02:21 +09:00