smoogipoo
|
67090fc598
|
Re-namespace enum
|
2021-10-20 20:52:16 +09:00 |
|
smoogipoo
|
599867a3b1
|
Add implementation to settings overlay
|
2021-10-20 20:29:06 +09:00 |
|
smoogipoo
|
0e446105fb
|
Rename to "picking mode" as simpler english
|
2021-10-20 17:52:51 +09:00 |
|
smoogipoo
|
bc57190fb4
|
Make dropdown not move the selection control
|
2021-10-20 17:52:05 +09:00 |
|
smoogipoo
|
116ce09e49
|
Merge branch 'master' into multi-queueing-modes
|
2021-10-20 17:27:25 +09:00 |
|
smoogipoo
|
ea9c070e59
|
Add setting for queue mode
|
2021-10-20 14:51:59 +09:00 |
|
Dean Herbert
|
480dc57102
|
Schedule joinFailed callback for added safety
|
2021-10-19 15:54:12 +09:00 |
|
Dean Herbert
|
da524261c0
|
Fix focus potentially being transferred too far up when password is being verified
|
2021-10-19 15:53:29 +09:00 |
|
Dean Herbert
|
a589964dc7
|
Centralise join logic
|
2021-10-19 15:53:29 +09:00 |
|
Dean Herbert
|
8944b1dd78
|
Add basic test coverage of DrawableLoungeRoom
|
2021-10-19 15:36:27 +09:00 |
|
Dean Herbert
|
473459d191
|
Add layout duration to PasswordEntryPopover to make error text look a bit smoother
|
2021-10-19 15:36:27 +09:00 |
|
Dean Herbert
|
d35fe5493a
|
Change default value of DrawableLoungeRoom.matchingFilter so they display by default
|
2021-10-19 15:36:27 +09:00 |
|
5ln
|
3529f34c98
|
Multi: Hide mods when spectating or Beatmap isn't Locally Available.
Signed-off-by: 5ln <xnafumie@gmail.com>
|
2021-10-18 02:01:50 +08:00 |
|
smoogipoo
|
2fd101ad50
|
Reorder elements to follow designs
|
2021-10-15 20:25:32 +09:00 |
|
smoogipoo
|
a70d7e4feb
|
Remove unnecessary extra GridContainer
|
2021-10-15 20:18:25 +09:00 |
|
Dean Herbert
|
9d54285b2e
|
Merge branch 'master' into fix-multiplayer-sounds-during-gameplay
|
2021-10-14 21:34:04 +09:00 |
|
Dean Herbert
|
06249c4ab2
|
Fix incorrect usages of Scheduler.AddOnce
|
2021-10-14 17:52:19 +09:00 |
|
Dean Herbert
|
0d86dab80a
|
Fix multiplayer components updating when not alive
Should close https://github.com/ppy/osu/issues/15092.
- [ ] Depends on https://github.com/ppy/osu-framework/pull/4826.
|
2021-10-14 17:37:10 +09:00 |
|
Bartłomiej Dach
|
d2115824fa
|
Merge branch 'master' into dropdown-refresh
|
2021-10-13 23:53:14 +02:00 |
|
Bartłomiej Dach
|
f3647eb94e
|
Recolour room settings screens to match dropdown theming
|
2021-10-13 22:50:19 +02:00 |
|
smoogipoo
|
fdf7142711
|
Remove Room.Position
|
2021-10-13 21:24:54 +09:00 |
|
Dan Balasescu
|
4bbff2ebf7
|
Merge branch 'master' into new-interfaces
|
2021-10-06 11:38:17 +09:00 |
|
Dean Herbert
|
d3b9660148
|
Move common interface implementations to extension methods
|
2021-10-05 14:41:14 +09:00 |
|
Dean Herbert
|
b41fa41c85
|
Rename APIRequest.Result to Response
|
2021-10-05 14:28:56 +09:00 |
|
Dean Herbert
|
853cf6feaa
|
Rename last remaining BeatmapInfo Beatmap usage
|
2021-10-04 17:35:53 +09:00 |
|
Dan Balasescu
|
aa1bfc16d2
|
Merge pull request #14929 from peppy/gameplay-state
Replace `GameplayBeatmap` with `GameplayState`
|
2021-10-04 15:56:44 +09:00 |
|
Bartłomiej Dach
|
017756cbca
|
Use Torus alternates on online play screens as per design
|
2021-10-04 00:26:41 +02:00 |
|
Dean Herbert
|
05ca3aec4f
|
Rename GameplayState to SpectatorGameplayState
|
2021-10-02 02:10:11 +09:00 |
|
smoogipoo
|
816018edb7
|
Move hosted by text into nullcheck
|
2021-09-30 12:04:30 +09:00 |
|
smoogipoo
|
202a602d2f
|
Change default status to "ready to play"
|
2021-09-30 12:03:44 +09:00 |
|
smoogipoo
|
ea30445efc
|
Remove verbatim string
|
2021-09-30 12:03:34 +09:00 |
|
smoogipoo
|
619a907c47
|
Fix zero height grid
|
2021-09-30 12:01:26 +09:00 |
|
smoogipoo
|
56b3c8aa9a
|
Remove forgotten text
|
2021-09-30 11:52:14 +09:00 |
|
smoogipoo
|
c83dd7d2b6
|
Merge OnlinePlayComposite and RoomSubScreenComposite
|
2021-09-29 20:55:20 +09:00 |
|
smoogipoo
|
c9c2d20544
|
Limit max size
|
2021-09-29 20:44:38 +09:00 |
|
smoogipoo
|
67d847fbd3
|
Add room status text to DrawableRoom
|
2021-09-29 20:24:49 +09:00 |
|
smoogipoo
|
5f921c7836
|
Change SelectedItem to show the last item by default
|
2021-09-29 20:24:32 +09:00 |
|
smoogipoo
|
d89577b2e7
|
Add host to DrawableRoomParticipantsList
|
2021-09-29 19:34:40 +09:00 |
|
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
|
f524e913e1
|
Move AllowTrackAdjustments specification to RoomSubScreen
|
2021-09-17 13:24:01 +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 |
|
Dean Herbert
|
fa693bb8a8
|
Move MusicController adjustment set to inside OsuScreen itself (and result nullable)
|
2021-09-16 16:08:09 +09:00 |
|
AbstractQbit
|
318f0941ca
|
Move all the "inherit previous AllowTrackAdjustments" logic into OsuScreen
|
2021-09-15 21:25:39 +03:00 |
|
Dean Herbert
|
931e873a7e
|
Merge branch 'master' into inheritable-allow-track-adjust
|
2021-09-15 22:26:13 +09:00 |
|
AbstractQbit
|
f0439ef50b
|
Remove unnecessary AllowTrackAdjustments overrides, add true to SongSelect
|
2021-09-15 13:12:57 +03:00 |
|
Dean Herbert
|
8acfefed1b
|
Merge pull request #14741 from smoogipoo/fix-lounge-beatmaps-counter
Fix incorrect beatmap count and SR range in multi lounge
|
2021-09-15 18:51:52 +09:00 |
|
smoogipoo
|
f54d554d30
|
Extract removal to method
|
2021-09-15 17:03:28 +09:00 |
|
Bartłomiej Dach
|
7b9e501fa0
|
Merge branch 'master' into 14421-multi-password-error-handling
|
2021-09-14 22:58:20 +02:00 |
|
AbstractQbit
|
b9193aae6d
|
Make IOsuScreen.AllowTrackAdjustments nullable
Allows for inheriting value from the previous screen if undefined
|
2021-09-14 17:37:57 +03:00 |
|
smoogipoo
|
a775915338
|
Fix incorrect beatmap count and SR range in multi lounge
|
2021-09-14 18:20:28 +09: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 |
|
Dan Balasescu
|
f6c4bbe2c9
|
Merge pull request #14730 from peppy/add-missing-track-adjustment-defaults
Add missing screen level mod application settings for some screens
|
2021-09-13 15:22:22 +09:00 |
|
Dean Herbert
|
f9c82a9098
|
Merge pull request #14676 from nekodex/lobby-team-swap
Add sound for multiplayer team swaps
|
2021-09-13 15:01:58 +09:00 |
|
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 |
|