1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-27 06:22:55 +08:00
Commit Graph

44539 Commits

Author SHA1 Message Date
Dan Balasescu
dd6337c5a5
Merge branch 'master' into update-inspections 2021-08-20 12:29:08 +09:00
Dan Balasescu
b343f17a52
Merge pull request #14359 from peppy/multiplayer-chat
Add chat display during multiplayer gameplay
2021-08-20 12:16:06 +09:00
Dean Herbert
da8eba9996 Return early to avoid updating state and failure count in fail cases 2021-08-20 12:11:41 +09:00
Joseph Madamba
1e02d61b85 Fix nub glow color not having 0 alpha when being set 2021-08-19 20:06:49 -07:00
Dan Balasescu
c95bf735fe
Merge branch 'master' into multiplayer-chat 2021-08-20 11:54:42 +09:00
Dean Herbert
2825e15fd4 Update framework 2021-08-20 11:54:37 +09:00
Dean Herbert
7021133029 Merge branch 'master' into temporary-directory-test-storage 2021-08-20 11:54:33 +09:00
Dan Balasescu
5ed6290f20
Merge pull request #14401 from frenzibyte/remove-unnecessary-queue
Refactor and fix intermittent beatmap difficulty cache tests
2021-08-20 11:50:08 +09:00
Salman Ahmed
1e6119da0b Update code inspection settings to hide "merge into pattern" again 2021-08-20 05:36:39 +03:00
Dan Balasescu
cde1b473fc
Merge branch 'master' into remove-unnecessary-queue 2021-08-20 11:31:32 +09:00
Salman Ahmed
73b40a6244 Switch to until step to account for asynchronous operations 2021-08-20 05:29:30 +03:00
Dan Balasescu
0c978bf9e9
Merge pull request #14378 from frenzibyte/fix-lounge-loading
Fix lounge sub screen loading layer displaying in the background
2021-08-20 11:10:46 +09:00
Dan Balasescu
580136a5e9
Merge branch 'master' into fix-lounge-loading 2021-08-20 10:51:30 +09:00
Salman Ahmed
d98742522b Remove unused using directive 2021-08-20 04:40:03 +03:00
Salman Ahmed
4d9c415e73 Remove unnecessary queue in beatmap difficulty cache tests 2021-08-20 04:37:35 +03:00
Dan Balasescu
48e5199c58
Merge pull request #14400 from bdach/setting-warning-text-initial-state
Fix settings item warning text not showing initially
2021-08-20 10:28:05 +09:00
Bartłomiej Dach
143b8df1b2
Fix backwards warning text presence check 2021-08-19 22:40:35 +02:00
Bartłomiej Dach
5f1948d040
Add failing test case 2021-08-19 22:40:35 +02:00
Lucas A
bf7f0a5d30 Remove double whitespace 2021-08-19 19:02:04 +02:00
Dean Herbert
e25592f325
Merge branch 'master' into fix-lounge-loading 2021-08-19 20:01:47 +09:00
Dean Herbert
2b0f2a6db9
Merge pull request #14355 from frenzibyte/mod-settings-difficulty-cache
Update star difficulty bindables on mod settings change
2021-08-19 20:00:48 +09:00
Dean Herbert
a6b7ca1a4c Ensure all request failures are correctly handled during login 2021-08-19 19:55:14 +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
Dean Herbert
74faf6d101
Merge pull request #14387 from frenzibyte/fix-lounge-test-scene
Fix playlists lounge sub screen test potentially failing on load
2021-08-19 19:35:56 +09:00
Dean Herbert
a65cd36a5f Move some constants to consts 2021-08-19 19:19:46 +09:00
Dean Herbert
33d311e557
Merge branch 'master' into fix-lounge-test-scene 2021-08-19 19:14:36 +09:00
Dean Herbert
fcf7394d3c
Merge pull request #14385 from rednir/limit-match-settings-textbox
Limit length of multiplayer match settings textboxes
2021-08-19 19:13:32 +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
Dean Herbert
bc025efce5 Add commenting regarding workaround to avoid potential omission in the future 2021-08-19 17:42:44 +09:00
Dean Herbert
2b5a42e063 Add missing union specification for MatchUserRequest 2021-08-19 17:42:26 +09:00
Dean Herbert
f95c6f0de5 Switch multiplayer back to messagepack 2021-08-19 17:42:13 +09:00
Dean Herbert
fa01e4fad2 Add workaround for SignalR union serialisation 2021-08-19 17:41:50 +09:00
Dean Herbert
da8a1692d9 Add test coverage of multiplayer room/state messagepack serialisation 2021-08-19 17:40:59 +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
Salman Ahmed
6bfae25cda Apply 5px vertical spacing on fill flow
Regressed, was margin { bottom = 5f } from the star rating display
creation method, which I've partly inlined.
2021-08-19 08:30:29 +03:00
Dean Herbert
6d00ea3375 Allow toggling focus via binding 2021-08-19 14:19:59 +09:00