1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 09:47:24 +08:00
Commit Graph

27953 Commits

Author SHA1 Message Date
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
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
Salman Ahmed
25e6317e7f Use animated star display in beatmap info wedge and synchronise bar 2021-08-19 07:18:02 +03:00
Salman Ahmed
6d57a240ac Add animation support for the star rating display 2021-08-19 07:17:43 +03:00
Salman Ahmed
072560ba3e Remove leftover unused using 2021-08-19 07:17:43 +03:00
Salman Ahmed
102320f8ae Merge branch 'master' into mod-settings-difficulty-cache 2021-08-19 06:35:13 +03:00
Salman Ahmed
5fc29328cf Remove unused using
Uh.....
2021-08-19 06:30:23 +03:00
Salman Ahmed
b984780d6a Merge branch 'master' into fix-lounge-loading 2021-08-19 06:26:15 +03:00
Salman Ahmed
49bc3a8250 Refactor playlists room manager to handle dummy API requests 2021-08-19 06:25:47 +03:00
Salman Ahmed
f4ae587a33 Extract room request handling logic to its own class 2021-08-19 06:24:06 +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
2e1df7bee4
Merge branch 'master' into settings-dim-other-sections 2021-08-18 23:32:30 +02:00
Bartłomiej Dach
2e43f38d8a
Merge branch 'master' into settings-delayed-load 2021-08-18 22:53:34 +02: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
Lucas A
ea08d48d27 Remove unecessary localised string due to online view container handling visibility when user is not logged in. 2021-08-18 18:53:35 +02:00
Davran Dilshat
61675eefe0 Add length limit to match settings textboxes 2021-08-18 17:36:57 +01:00
Dean Herbert
6637c64501 Dim all but the current section 2021-08-19 01:27:14 +09:00
Dean Herbert
e87accafc8 Fix current section logic not accounting for hidden sections 2021-08-19 01:26:33 +09:00
Dean Herbert
a0374d4a67 Adjust centre point slightly to make dim feel better 2021-08-19 01:26:11 +09:00
Dean Herbert
af0c7ed108 Fix searching in settings not correctly invalidating the scroll position 2021-08-19 01:25:57 +09: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
fc3fa4f241 Merge branch 'master' into settings-delayed-load 2021-08-18 18:51:25 +09: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
d2df09432f Center the star rating display text rather than left 2021-08-18 11:49:33 +03: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
Salman Ahmed
74d6c26520 Refactor star rating display layout with flexibility in mind 2021-08-18 11:03:35 +03:00
smoogipoo
6dc96fdb83 Disable edit button in playlists 2021-08-18 16:56:42 +09:00
Dean Herbert
4725b802b0 Share OsuGameTestScene with implementations across template projects 2021-08-18 16:53:32 +09:00
Dean Herbert
2758a83d55 Fix TestSettingsMigration's usage of RecycleLocalStorage 2021-08-18 16:39:10 +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
Dean Herbert
dc44cc0eb3 Update scenarios to use new TestRunHeadlessGameHost where feasible 2021-08-18 16:01:56 +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
Salman Ahmed
1ae4a1910a Cache mod settings rather than fetching everytime 2021-08-18 09:17:42 +03: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
Dean Herbert
5441fab692 Avoid scheduling focus operation when not required 2021-08-18 12:45:14 +09:00
Dean Herbert
1fdaefef99 Revert unnecessary changes 2021-08-18 12:45:08 +09:00
Dean Herbert
5671820d92 Update framework 2021-08-18 10:35:34 +09:00
Salman Ahmed
8c5d99ab21 Override CreateInstance() in osu! bindable subclasses
Three bindables are left which don't have this overriden due to them
already not having a value-only constructor and not supporting
`GetBoundCopy()` properly:
 - `BeatmapDifficultyCache.BindableStarDifficulty`.
 - `TotalScoreBindable`
 - `TotalScoreStringBindable`

I could add support for them by passing the required data to them, as
they seem to be able to have that shared, but I'm hesitant to support
something which was already broken and never used, not sure.
2021-08-18 04:19:58 +03:00
Nathan Alo
eaca331170 apply suggestions 2021-08-18 08:13:53 +08:00
Bartłomiej Dach
e3b00c6c7a
Merge branch 'master' into reduce-skin-lookup-overhead 2021-08-17 23:08:52 +02:00
Bartłomiej Dach
58ecee543a
Trim redundant default argument value 2021-08-17 23:00:10 +02:00
Dan Balasescu
eaf7bd72fc
Merge branch 'master' into multiplayer-chat 2021-08-17 20:08:01 +09:00
Dan Balasescu
d8e9845d00
Merge pull request #14360 from peppy/improve-timeline-tick-visibility
Improve visibility of repeat ticks / drag areas on timeline
2021-08-17 20:06:49 +09:00
smoogipoo
47d4a2e97f Make SettingsOverlay protected 2021-08-17 20:05:26 +09:00
Dean Herbert
d66f7cb6b5 Fix tests by allowing retrieval with files where required 2021-08-17 19:21:22 +09:00
Dean Herbert
5c59818b03 Merge branch 'master' into reduce-skin-lookup-overhead 2021-08-17 19:05:14 +09:00
smoogipoo
590d814881 Move RoomSettingsOverlay to RoomSubScreen 2021-08-17 18:24:04 +09:00
Dean Herbert
f16468b706 Improve visibility of repeat ticks / drag areas on timeline 2021-08-17 18:17:55 +09:00
smoogipoo
6840ec6716 Actually show the room in the sub screen 2021-08-17 17:58:24 +09:00
Dean Herbert
c0b388cd74 Fix regression in ModSettingsChangeTracker 2021-08-17 17:50:30 +09:00
Dean Herbert
1b49e92e99 Merge branch 'master' into settings-delayed-load 2021-08-17 17:42:23 +09:00
Dean Herbert
4a65888cfc
Merge branch 'master' into multiplayer-chat 2021-08-17 17:34:23 +09:00
Dean Herbert
ef9bfece13
Merge branch 'master' into multi-polling-request-refactor 2021-08-17 17:31:25 +09:00
Dean Herbert
3b5fc6d10f Ensure updateLoadingLayer is run at least once 2021-08-17 17:18:23 +09:00
Dean Herbert
9eb16fa61d Move poll allowance logic based on signalr connection inside polling component 2021-08-17 17:16:21 +09:00
smoogipoo
5d72c5911a Rename MatchSettingsOverlay and related classes
Because "match" is a multiplayer-only concept.
2021-08-17 17:14:28 +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
8a1651e830 Reorganise methods in PollingComponent 2021-08-17 17:04:32 +09:00
Dean Herbert
a901fca54a
Merge branch 'master' into multi-polling-request-refactor 2021-08-17 16:23:46 +09:00
Dan Balasescu
b1efc6d763
Merge branch 'master' into local-user-play-info 2021-08-17 16:23:44 +09:00
Dean Herbert
6ee6a46894 Remove unnecessary public prefix in interface specification 2021-08-17 16:22:14 +09:00
Dean Herbert
124f149cb5 Add key binding to focus chat input 2021-08-17 16:17:31 +09:00
Dean Herbert
30eee363dc Add chat display during multiplayer gameplay 2021-08-17 16:17:31 +09:00
Dean Herbert
b82f92d7b8 Adjust background colours of textbox in chat display 2021-08-17 16:16:49 +09:00
Dean Herbert
35b9f84c00 Expose StandAloneChatDisplay.Textbox 2021-08-17 16:16:49 +09:00
Dean Herbert
0d283aa6a3 Expose LocalUserPlaying from Player 2021-08-17 16:16:49 +09:00
Dean Herbert
82eddeffef Add LocalUserPlayInfo interface to convey common information about player status 2021-08-17 16:15:47 +09:00
Salman Ahmed
3a7b9bf096 Fix MatchSettingsOverlay not resetting focus on hide properly 2021-08-17 08:56:49 +03:00
Dan Balasescu
66e33b3704
Merge pull request #14263 from frenzibyte/hide-player-settings-overlay
Hide non-interactive elements on multi-spectator players
2021-08-17 14:07:19 +09:00
smoogipoo
f4b7ee5c7f Merge branch 'master' into hide-player-settings-overlay 2021-08-17 13:44:33 +09:00
smoogipoo
081524b6c8 Privatise setters 2021-08-17 13:44:21 +09:00
smoogipoo
1e2c0031d7 Remove unused usings 2021-08-17 13:34:44 +09:00
Dean Herbert
bc86bafc08 Fix RestoreDefaultValueButton's colour weirdness 2021-08-17 12:48:30 +09:00
Dean Herbert
212842c537 Fix initial LayoutSettings animation in a more reliable way 2021-08-17 12:38:44 +09:00
Dean Herbert
adb4fd5a2b Load only sections content asynchronously, showing the header initially 2021-08-17 12:31:33 +09:00
Salman Ahmed
b419ea716b Refactor beatmap info wedge to not fully refresh on star difficulty change
Makes it look awkward when changing difficulty via mod settings for
example.

Now the changes should instead only affect the displayed components which consume it
directly.
2021-08-17 05:46:06 +03:00
Salman Ahmed
32ba525555 Track changes to mod settings in beatmap difficulty cache with 100ms debouncing 2021-08-17 05:46:05 +03:00
Salman Ahmed
0291cd5ae2 Consider mod equality in difficulty cache lookup rather than acronym 2021-08-17 04:27:43 +03:00
Salman Ahmed
060ba0692d Add hash code support for Mod 2021-08-17 04:27:04 +03:00
smoogipoo
f2340c6dac Privatise mutable list 2021-08-17 09:48:33 +09:00
smoogipoo
b672d4b936 Refactor RequestHandlingMultiplayerRoomManager to avoid confusion 2021-08-17 09:43:37 +09:00
smoogipoo
1e282432c9 Fix password in a better way 2021-08-17 09:40:25 +09:00
smoogipoo
c4a42c4db0 Fix BasicTestRoomManager overriding rooms 2021-08-17 09:36:59 +09:00
smoogipoo
352949069a Move filter to LoungeSubScreen 2021-08-17 09:36:43 +09:00
smoogipoo
97d5b80834 Fix joining with incorrect password 2021-08-17 09:18:21 +09:00
smoogipoo
6320768a67 Merge branch 'master' into multi-polling-request-refactor 2021-08-17 08:44:56 +09:00
Xexxar
61045bd087 adjusted code comments 2021-08-16 22:36:14 +00:00
Xexxar
ae076c9a4e merged latest ppy/master 2021-08-16 22:20:12 +00:00
Xexxar
176b3e7533 changed decay system to allow for customizing the currentStrain 2021-08-16 22:14:29 +00:00
Marvin Schürz
78f9f4a230 Move time clamp to Seek/transformSeekTo methods 2021-08-16 20:39:09 +02:00
Dean Herbert
4bf22db4ff Attempt to reduce skin lookup overhead where file access is not required 2021-08-17 00:23:30 +09:00
Dean Herbert
8cba1f197b
Merge branch 'master' into add-supporter-glow-changelog 2021-08-16 23:41:46 +09:00
Dean Herbert
c3a8676932 Simplify size specifications 2021-08-16 23:38:13 +09:00
Dean Herbert
cb122eaf25
Merge pull request #14342 from frenzibyte/fix-difficulty-adjust-controls
Fix difficuly adjust settings controls not raising `SettingsChanged` events
2021-08-16 23:34:30 +09:00
Dean Herbert
139e69ed3b
Merge pull request #14343 from frenzibyte/hide-tablet-not-detected-when-disabled
Hide tablet settings content when disabled
2021-08-16 23:31:16 +09:00
Dean Herbert
7b74301fa1
Merge pull request #14341 from smoogipoo/fix-preview-track-crash
Fix crashes from preview tracks
2021-08-16 22:21:52 +09:00
Dean Herbert
5f006bd6e8
Merge pull request #14247 from kj415j45/localisation-settings
Add localisation support for most of Settings
2021-08-16 22:20:35 +09:00
Dean Herbert
c978e68742
Merge branch 'master' into add-supporter-glow-changelog 2021-08-16 22:09:52 +09:00
Dean Herbert
7e1086d901 Merge branch 'master' into hide-tablet-not-detected-when-disabled 2021-08-16 22:07:45 +09:00
Dean Herbert
568d027013 Simplify weird conditionals 2021-08-16 22:07:41 +09:00
Lucas A
3325b0cc95 Fix merge conflicts. 2021-08-16 14:50:08 +02:00
Lucas A
a0a9777109 Fix merge conflicts. 2021-08-16 14:50:00 +02:00
Lucas A
1f942d15f8 Localise scoreboard 2021-08-16 13:38:57 +02:00
Dean Herbert
8c3eb91059
Merge branch 'master' into localisation-settings 2021-08-16 20:03:06 +09:00
Dean Herbert
de61cb8e6a Adjust delay slightly 2021-08-16 19:56:20 +09:00
Dean Herbert
e485728109 Add keywords to make finding audio offset adjustments easier in settings 2021-08-16 19:54:45 +09:00
Dean Herbert
230c4eb247 Fade in sidebar buttons after the load has completed 2021-08-16 19:47:41 +09:00
Dean Herbert
c6bd8520a7 Add basic asynchronous loading pattern to SettingsPanel 2021-08-16 19:47:41 +09:00
Dean Herbert
b541550ea9 Avoid initial synchronous dropdown population overhead in AudioDevicesSettings 2021-08-16 19:47:41 +09:00
Dean Herbert
8d051d9fa0 Avoid multiple synchronous overheads in SettingsItem 2021-08-16 19:47:41 +09:00
Dean Herbert
237d3e656b Remove initial transform overhead of Nub 2021-08-16 19:47:41 +09:00
Dean Herbert
92ad66c86c Remove transform overhead from OsuDropdown on initial display 2021-08-16 19:47:41 +09:00
Dean Herbert
c0130da235 Avoid running initial layout transform in LayoutSettings 2021-08-16 19:47:41 +09:00
Lucas A
7bebbf9f74 Mark format strings as verbatim. 2021-08-16 12:46:41 +02:00
Salman Ahmed
e39a295c5c Hide tablet settings content when input handler is disabled 2021-08-16 13:45:50 +03:00
Dean Herbert
3ad7688eaf
Merge pull request #14339 from peppy/revert-breaking-config-rename
Revert "Rename element in OsuSettings enum"
2021-08-16 19:18:22 +09:00
Dean Herbert
cecb312e77 Ensure TakeFocus does not crash when not yet loaded 2021-08-16 18:55:50 +09:00
Dean Herbert
c191b38125 Reduce transform overhead of RestoreDefaultValueButton 2021-08-16 18:55:50 +09:00
Salman Ahmed
855fff1486 Fix DifficultyAdjustSettingsControl.SliderControl not following up with the current pattern
This was causing any `ValueChanged` event bind (such as the one in
`SettingsItem` to invoke `SettingsChanged`) to be overwritten when
`Current` is set afterwards.
2021-08-16 12:47:58 +03:00
smoogipoo
db1a0ebb55 Fix preview track crashes 2021-08-16 18:46:44 +09:00
Dean Herbert
1c7cbc8621 Add missing readonly keyword to new bindable 2021-08-16 17:14:13 +09:00
Dean Herbert
8555a465ac
Merge pull request #14318 from bdach/editor-colours-save
Add support for saving edited combo colours and displaying them in composer
2021-08-16 17:07:53 +09:00
Dean Herbert
71fab416d8 Add a note against OsuSetting 2021-08-16 16:59:59 +09:00
Dean Herbert
fc89f2bac4 Revert "Rename element in OsuSettings enum"
This reverts commit c2bbe17562.
2021-08-16 16:56:48 +09:00
Dean Herbert
8d45f86bd3 Rename variable to better reflect its purpose 2021-08-16 16:48:40 +09:00
Dean Herbert
ae8a1adae8 Allow seeking via Player.Seek even if disabled 2021-08-16 16:47:57 +09:00
kj415j45
887d622c28
Merge branch 'master' into localisation-settings 2021-08-16 15:41:50 +08:00
Dean Herbert
d0faa91bb1
Merge pull request #14338 from frenzibyte/fix-participant-panel-assuming-not-null
Fix few cases where `MultiplayerRoomUser.User` is assumed to not be null
2021-08-16 16:31:24 +09:00
Dean Herbert
838bcc51b2 Avoid new bindable requirement 2021-08-16 16:27:19 +09:00
Dean Herbert
81480ac4fc Use PlayerConfiguration to convey no-seek state 2021-08-16 16:16:02 +09:00
Salman Ahmed
7fe6f6dd14 Fix kick button action asserting and using User.User.ID rather than User.UserID 2021-08-16 09:47:23 +03:00
Salman Ahmed
79cd062784 Let TeamDisplay take the full MultiplayerRoomUser rather than the underlying User 2021-08-16 09:47:23 +03:00
Salman Ahmed
f82ed64aa7 Fix participant panel null user test no longer functioning properly
I guess the changes that involved `MultiplayerTestScene` having a test
user lookup cache caused this test case to false-pass silently.

Added an explicit assert which ensures the added user indeed has a null
`User` value.
2021-08-16 09:07:00 +03:00
Dan Balasescu
4d31d07c51
Merge branch 'master' into open-tablet-driver-faq 2021-08-16 13:46:43 +09:00
smoogipoo
08d347f10b Merge branch 'master' into multi-polling-request-refactor 2021-08-16 13:12:08 +09:00
smoogipoo
b6a2020c59 General refactorings from PR review 2021-08-16 13:09:04 +09:00
smoogipoo
81f9442471 Inline update/addRoom in usage sites 2021-08-16 13:04:06 +09:00
Salman Ahmed
554b09ac1b Fix SkinnableTargetsContainer blocked from processing scheduled tasks 2021-08-16 06:57:45 +03:00
smoogipoo
76a8d4329f Make TestRoomManager update existing room 2021-08-16 12:43:09 +09:00
Dan Balasescu
989d337532
Merge branch 'master' into auto-restart 2021-08-16 12:34:04 +09:00
Dan Balasescu
bc8e9d9ea8
Merge pull request #14329 from peppy/fix-new-lounge-performance
Cache buffered background to fix multiplayer lounge performance
2021-08-16 12:04:45 +09:00
Dan Balasescu
444453c9e2
Merge branch 'master' into fix-mark-read-local-message 2021-08-16 11:28:57 +09:00
Dean Herbert
f0fe79b568 Remove buffered container workarounds for now 2021-08-16 11:04:21 +09:00
Dean Herbert
d35886ef19 Reduce frame buffer render scale for blurred background 2021-08-16 11:03:49 +09:00
Nathan Alo
c56b34d2da apply code inspection fixes 2021-08-16 07:06:23 +08:00
Dean Herbert
e8e387b549 Cache buffered background to fix multiplayer lounge performance
Consider this a request for comment. It's the cleanest solution I can
come up with without dropping either the blur, or use of
`ModelBackedDrawable`.

Intended to resolve https://github.com/ppy/osu/issues/14276.
2021-08-16 08:04:54 +09:00
Bartłomiej Dach
e744629a41
Fix broken obsoletion message 2021-08-16 01:01:56 +02:00
Nathan Alo
cc3468b4ab apply suggestions
- make `UserActivity.InGame` and derive that to `InSoloGame` and `InMultiplayerGame`
- rename `SoloGame` to `InSoloGame`
- rename `MultiplayerGame` to `InMultiplayerGame`
2021-08-16 06:32:33 +08:00
Daniel Kariv
38828b6b82 Updating beatmap details icons
changes the sizing and add yellow circle so the UI will fit more with osu-web style.
2021-08-16 00:40:31 +03:00
Daniel Kariv
f6773522d1 Correct icons in beatmap details
In relation to #13968. Replacing incorrect icons in beatmap details panel to correct ones from BeatmapStatisticsIcon class.
2021-08-16 00:12:27 +03:00
Bartłomiej Dach
6108451449
Retrieve separated skin instance from working beatmap for editing 2021-08-15 21:18:09 +02:00
Bartłomiej Dach
81280dfd25
Use editable skin structure in combo colour picker 2021-08-15 21:18:08 +02:00
Bartłomiej Dach
0d64da8c63
Add skin providing container responding to beatmap skin edits 2021-08-15 21:18:08 +02:00
Bartłomiej Dach
df43e758ee
Add editable beatmap skin 2021-08-15 21:18:07 +02:00
emu1337
29a22bd11f added rhythm multiplier for strain sections 2021-08-15 20:48:00 +02:00
Bartłomiej Dach
7c88a1c6de
Add a way to change custom combo colours via IHasComboColours
`IHasComboColours` was already mutable (via a strange
`AddComboColours()` method) and exposing a straight list is easier to
work with. `IHasCustomColours` is also similarly externally mutable (in
a way which is not easily removable).
2021-08-15 20:06:06 +02:00
Opelkuh
7d7c5c06f0 Fix code formatting 2021-08-15 16:02:25 +02:00
Opelkuh
2f9f1ba862 Add test for ChannelManager.MarkChannelAsRead 2021-08-15 15:44:23 +02:00
Bartłomiej Dach
3648e0ca26
Merge branch 'master' into auto-restart 2021-08-15 15:04:50 +02:00
Marvin Schürz
d287db7961 Clamping seekTime to beatmap length 2021-08-15 14:48:56 +02:00
Nathan Alo
2cc096101e trim whitespace 2021-08-15 18:56:24 +08:00
Dan Balasescu
f49c9673cc
Merge pull request #14286 from kj415j45/readability-settings-rename
Rename element in OsuSettings enum
2021-08-15 18:13:10 +09:00
Jacob Van Meter
6472d85aae Added heart_size constant and adjusted the glow radius value
Added heart_size constant and adjusted the glow radius value to be more in line with the website
2021-08-14 21:48:57 -04:00
Opelkuh
7d6f7ac75e Fix mark channel as read error 2021-08-15 02:57:11 +02:00
Jacob Van Meter
71ccd38bb3 Corrected pippi background and promo positioning 2021-08-14 20:36:43 -04:00
Jacob Van Meter
772860232c Removed empty offset and corrected colour 2021-08-14 20:32:38 -04:00
Jacob Van Meter
95943fdb25 Add glow to supporter promo on changelog
Added glow to the supporter promo at the end of the changelog, as it is on the website.
2021-08-14 20:00:26 -04:00
Salman Ahmed
c8fb796660 Fix settings notice text class tinting everything with yellow 2021-08-14 20:14:28 +03:00
Salman Ahmed
2ddf28346a PlayerSettingsGroups -> PlayerSettings 2021-08-14 19:58:20 +03:00
LiangXiang Shen
246a8882ce
Update translation key 2021-08-15 00:23:14 +08:00
Bartłomiej Dach
498462dfd0
Fix room null-check racing against async schedule 2021-08-14 17:44:41 +02:00
Nathan Alo
4ed06a1021 apply suggestions 2021-08-14 22:39:12 +08:00
kj415j45
c2bbe17562
Rename element in OsuSettings enum
`ShowProgressGraph` -> `ShowDifficultyGraph`
2021-08-14 22:35:15 +08:00
kj415j45
f87f86e671
Apply suggestions from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-08-14 22:24:57 +08:00
Nathan Alo
a553942a7f update InitialActivity on multiplayer Player and SongSelect 2021-08-14 13:20:36 +08:00
Dean Herbert
b8c63eb1cb Merge branch 'master' into multiplayer-kick-support-events 2021-08-14 14:08:34 +09:00
Dean Herbert
e6b3aba6e1 Fix incorrectly directed call in TestMultiplayerClient 2021-08-14 14:08:29 +09:00
Dean Herbert
a10ba17b64
Merge pull request #14250 from peppy/leaderboard-limit-player-count
Add ability for gameplay leaderboard scroll when too many users are displayed
2021-08-14 14:08:18 +09:00
kj415j45
e26ccf786e
code style format 2021-08-14 11:04:38 +08:00
kj415j45
5cfb89f18a
Apply suggestions from code review
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2021-08-14 10:56:52 +08:00
Bartłomiej Dach
e2cc96097f
Unify match score display formatting
Commas are already applied on the multiplayer leaderboard, as well as
the results screen.
2021-08-13 23:57:51 +02:00
Bartłomiej Dach
00317c0e30
Round when totalling up team scores instead of truncating
Matches score handling in `ScoreManager`.
2021-08-13 23:44:07 +02:00
Bartłomiej Dach
8f3fedade3
Merge branch 'master' into multiplayer-team-vs-results 2021-08-13 21:30:44 +02:00
Gagah Pangeran Rosfatiputra
9233f396aa
centered thumbtack icon and text 2021-08-14 00:22:01 +07:00
Gagah Pangeran Rosfatiputra
a710bbf6ae
remove background colour for no comment placeholder 2021-08-14 00:03:05 +07:00
Gagah Pangeran Rosfatiputra
6d726bf046
Change spacing
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-08-13 22:54:41 +07:00
smoogipoo
0e66a05963 Hide left border of beatmap wedge 2021-08-13 22:29:22 +09:00
smoogipoo
1c0ffd4621 Merge branch 'master' into multi-polling-request-refactor 2021-08-13 22:24:01 +09:00
smoogipoo
155e9e16a5 Refactorings 2021-08-13 22:09:47 +09:00
smoogipoo
d57508853e Merge branch 'master' into multi-polling-request-refactor 2021-08-13 22:04:31 +09:00
smoogipoo
1fcb1cdb10 Add todo 2021-08-13 22:01:47 +09:00
smoogipoo
44b3e3bfac Merge branch 'master' into fix-playlists-cross-ruleset-entry 2021-08-13 21:58:15 +09:00
Gagah Pangeran Rosfatiputra
cf0e9a1eec
add pinned content section 2021-08-13 19:40:37 +07:00
Gagah Pangeran Rosfatiputra
480d5ffa5d
add pinned comment to users setter in comment bundle 2021-08-13 19:40:37 +07:00
smoogipoo
c71a581106 Fix exception when leaving match 2021-08-13 18:24:19 +09:00
smoogipoo
1f992e67f3 Fix listing polling rate when entering room 2021-08-13 18:17:25 +09:00
kj415j45
d527eb3d8b
Apply suggestions from code review
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-08-13 17:15:18 +08:00
smoogipoo
1bae7173d3 Fix initial multiplayer poll 2021-08-13 18:14:02 +09:00
smoogipoo
6a46105b5e Fix incorrect dependency 2021-08-13 18:12:32 +09:00
smoogipoo
83935540ca Add selection polling component to PlaylistsRoomSubScreen 2021-08-13 18:11:52 +09:00
Dan Balasescu
62970108df
Merge pull request #14269 from peppy/remove-unnecessary-delimiters
Fix searches at song select with '!' or ',' not matching as expected
2021-08-13 18:00:11 +09:00
Dean Herbert
72268d3e8a
Merge pull request #14150 from frenzibyte/improve-screen-offsetting
Improve overlay screen offsetting logic to be position-based
2021-08-13 17:59:41 +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
Salman Ahmed
f43ab323ff Add shared class for notice text in settings 2021-08-13 11:12:44 +03:00
Dean Herbert
5a60b39643 Remove unnecessary delimiters from song select filter splitting 2021-08-13 16:42:58 +09:00
Dean Herbert
93b97e5110 Adjust ratio to match previous behaviour 2021-08-13 16:35:22 +09:00
Dean Herbert
da18c399e2 Remove unnecessary IsPresent override 2021-08-13 16:33:00 +09:00
Dean Herbert
c1d67976e6 Rename const, add xmldoc and make protected 2021-08-13 16:29:36 +09:00
Dean Herbert
bb36d1614f
Merge branch 'master' into improve-screen-offsetting 2021-08-13 16:23:02 +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
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
Salman Ahmed
cd842ccef8
Improve message
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-08-13 10:15:50 +03:00
Dean Herbert
f9f3339885 Fix vertical offset not being handled correctly during score panel detach process 2021-08-13 16:14:23 +09:00
Dan Balasescu
f47f2b43b0
Merge branch 'master' into fix-loading-screen-depth 2021-08-13 16:09:00 +09:00
Dean Herbert
732dcd30c7 Merge branch 'master' into multiplayer-team-vs-results 2021-08-13 16:03:10 +09:00
Dean Herbert
dd7ca4b77b Increase "create room" button height 2021-08-13 15:35:45 +09:00
Salman Ahmed
543f6039e2 Display on Windows and Linux only 2021-08-13 09:26:53 +03:00
Dean Herbert
3b6a8a2bae Rename background sprite and reduce load delay 2021-08-13 15:25:00 +09:00
Dean Herbert
5cec50bdd1 Add comment mentioning why event bindings are not unbound 2021-08-13 15:24:43 +09:00
Salman Ahmed
c5ee8753b4 Notify users to read OpenTabletDriver's FAQ when tablet not detected 2021-08-13 09:20:52 +03:00
Gagah Pangeran Rosfatiputra
39b13efdd5
add pinned comments property in comment bundle 2021-08-13 13:13:28 +07:00
Dean Herbert
bf024fbd21
Merge branch 'master' into fix-playlists-cross-ruleset-entry 2021-08-13 15:06:37 +09:00
Gagah Pangeran Rosfatiputra
1859e651b6
add pinned mark in drawable comment 2021-08-13 12:57:30 +07:00
Gagah Pangeran Rosfatiputra
0901333ef3
add pinned property in comment 2021-08-13 12:57:29 +07:00
Dean Herbert
76b1c76dbf Merge branch 'master' into legacy-cursor-trail-adjustments 2021-08-13 14:55:34 +09:00
Dean Herbert
dfb68904d7
Merge pull request #14266 from smoogipoo/fix-multi-navigation-test-failure
Fix multiplayer navigation test failure
2021-08-13 14:52:51 +09:00
Dean Herbert
7c64735b79
Merge pull request #14265 from peppy/update-framework
Update framework
2021-08-13 14:51:49 +09:00
Dean Herbert
90755c0307 Replace condition with matching precalculated bool 2021-08-13 14:50:59 +09:00
Dean Herbert
93574acf72 Fix exception messaging 2021-08-13 14:46:57 +09:00
Dean Herbert
641d57e5e1 Change scroll container subclass name to hopefully read better 2021-08-13 14:46:28 +09:00
Dean Herbert
a1b72e7f97 Remove redundant array type specification 2021-08-13 14:41:07 +09:00
Dean Herbert
b9721f5261 Centralise screen exit logic and guard against non-current screen 2021-08-13 14:39:03 +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
smoogipoo
755b6460b6 Fix multiplayer navigation test failure 2021-08-13 14:05:44 +09:00
Dean Herbert
8fd6a9eb4b Update framework 2021-08-13 14:01:38 +09:00
Salman Ahmed
34c2b317e2 Hide song progress bar on multi-spectator player 2021-08-13 07:30:09 +03:00
Salman Ahmed
e7cf6b2d23 Expire hold-to-quit button on multi-spectator player 2021-08-13 07:29:55 +03:00
Salman Ahmed
8dc7a925e7 Expire instead of hiding and disabling visibility state
Since it's a temporary change until the spectator interface gets
improved, no need to add further logic.
2021-08-13 07:28:59 +03:00
smoogipoo
2850f6ce95 Privatise counter again 2021-08-13 13:24:05 +09:00
Dean Herbert
e93660c0f4 Update resources 2021-08-13 13:19:34 +09:00
LiangXiang Shen
cbeecff347
Apply suggestions from code review
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2021-08-13 12:17:38 +08:00
smoogipoo
ee034874bb Merge branch 'master' into remove-comments-page 2021-08-13 13:17:13 +09:00
smoogipoo
e913c8f92f Change strings to verbatim 2021-08-13 13:07:02 +09:00
Salman Ahmed
c10320f239 Hide and disable player settings overlay on multi-spectator player 2021-08-13 06:35:16 +03:00
Salman Ahmed
2b86416cb2 Hide player settings overlay on multi-spectator player loader 2021-08-13 06:35:16 +03:00
Bartłomiej Dach
70005cb39d
Merge branch 'master' into multiplayer-team-vs-results 2021-08-12 20:39:48 +02:00
Bartłomiej Dach
53b4cdfb02
Handle ties in team vs. results screen 2021-08-12 20:38:24 +02:00
Bartłomiej Dach
f06f13215b
Split off multiplayer team results screen to separate class
The previous version tried to keep both normal multiplayer and team
multiplayer results as one screen, but didn't check that team-specific
components aren't null in `LoadComplete()`.

To decrease number of conditional, split off the team results screen to
a separate implementation, and choose one or the other at push time in
`MultiplayerPlayer`, depending on team count.
2021-08-12 20:01:31 +02:00
Bartłomiej Dach
828268ad4d
Add winner text background to increase contrast 2021-08-12 19:34:25 +02:00
Bartłomiej Dach
4d26bb6714
Scale score panel to remove overlap with team score display 2021-08-12 19:27:32 +02:00
Lucas A
4b4c1448ea Localise success rate metrics. 2021-08-12 19:19:03 +02:00
Lucas A
5f67d991b4 Localise beatmap info. 2021-08-12 19:17:32 +02:00
Dean Herbert
00ca066c39
Merge pull request #14202 from gagahpangeran/changelog-supporter
Add supporter promo section in changelog overlay
2021-08-13 00:33:57 +09:00
Gagah Pangeran Rosfatiputra
66ba24e865
create local link flow container 2021-08-12 20:36:47 +07:00
Gagah Pangeran Rosfatiputra
40db228e91
change to osu text flow container 2021-08-12 19:34:44 +07:00
Dean Herbert
8249ce7988
Merge branch 'master' into multiplayer-header-redesign 2021-08-12 21:00:46 +09:00
Salman Ahmed
bb1d74255e Remove unrequired parenthesis 2021-08-12 14:16:20 +03:00
Salman Ahmed
3d7866e82d Calculate horizontal offset on present overlays only 2021-08-12 14:15:01 +03:00
smoogipoo
83703e4283 Add colour provider to online play dependencies 2021-08-12 20:08:14 +09:00
smoogipoo
03351cf434 Add blur to background 2021-08-12 20:01:53 +09:00
smoogipoo
050f2d6b0d Add background to room subscreen 2021-08-12 19:51:03 +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
smoogipoo
ab7bd1df9d Use full-screen background 2021-08-12 19:27:06 +09:00
Gagah Pangeran Rosfatiputra
18684ad21f
remove colour creation in add link 2021-08-12 17:08:54 +07:00
Gagah Pangeran Rosfatiputra
98859b3759
cache pink colour provider
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-08-12 17:06:11 +07:00
Gagah Pangeran Rosfatiputra
8b29f52d9f
update supporter note text
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-08-12 16:54:58 +07:00
Salman Ahmed
b58b5ec2b4 Apply horizontal offset changing once per frame
The previous way was causing every-frame invalidation when an overlay is
visible.
2021-08-12 12:44:38 +03:00
smoogipoo
b75c20fee4 Adjust positioning and paddings 2021-08-12 18:02:00 +09:00
smoogipoo
3b7aa262d5 Make header overlap content 2021-08-12 16:52:35 +09:00
smoogipoo
d07bb10d02 Remove breadcrumbs from header 2021-08-12 16:52:30 +09:00
Dean Herbert
ab1cc6ad48 Fix padding around recent participants icon being uneven 2021-08-12 16:50:09 +09:00
Dean Herbert
5f3ceaf0ad
Merge branch 'master' into lounge-redesign 2021-08-12 16:31:14 +09:00
Dean Herbert
e84224f64c Rename AddPlayer method now that there's no conflict 2021-08-12 16:20:37 +09:00
Dean Herbert
68dbbc17e8 Add support for automatic scrolling in gameplay leaderboard 2021-08-12 16:20:37 +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
kj415j45
3f434c8474
Resolve code quality issue 2021-08-12 13:42:16 +08:00
kj415j45
ac52b89148
Add Maintenance and Debug SettingsStrings 2021-08-12 12:34:10 +08:00
kj415j45
9d391ad138
Add OnlineSettingsStrings 2021-08-12 12:34:09 +08:00
kj415j45
61502e977a
Add SkinSettingsStrings 2021-08-12 12:34:08 +08:00
kj415j45
31ffaf15d4
Add GameplaySettingsStrings 2021-08-12 12:34:07 +08:00
kj415j45
7adf2bb64c
Add UserInterfaceStrings 2021-08-12 12:34:06 +08:00
kj415j45
03013d0d30
Add InputSettingsStrings
Existed strings files keep no change
2021-08-12 12:34:06 +08:00
kj415j45
2cc89f50cc
Add missing key 2021-08-12 12:34:05 +08:00
kj415j45
b2986e99d3
Add AudioSettingsStrings 2021-08-12 12:34:04 +08:00
kj415j45
078953980e
Add GraphicsSettingsStrings 2021-08-12 12:34:03 +08:00
kj415j45
9a5d4ffd43
Add GeneralSettingsStrings 2021-08-12 12:34:02 +08:00
kj415j45
97041de09f
Preparation for localisation. 2021-08-12 12:34:02 +08:00
Dan Balasescu
88f70e7f29
Merge branch 'master' into multiplayer-kick-support-events 2021-08-12 12:12:06 +09:00
Dan Balasescu
60e988aac3
Merge branch 'master' into multiplayer-kick-support 2021-08-12 11:46:56 +09:00
PercyDan
6ecc728c01
Remove override 2021-08-12 10:27:36 +08:00
PercyDan
d80a2dcca7
Missed one 2021-08-12 10:14:01 +08:00
PercyDan
18ecd8758b
Make Perfect auto restart toggleable 2021-08-12 10:12:35 +08:00
smoogipoo
543482111b Remove outdated todo 2021-08-12 10:40:14 +09:00
smoogipoo
c160e50f4f Merge branch 'master' into multiplayer-team-vs-leaderboard 2021-08-12 10:27:31 +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
PercyDan
4706dcf525
Merge branch 'master' of https://hub.fastgit.org/ppy/osu into auto-restart 2021-08-11 20:18:05 +08:00
Dean Herbert
31608a1bc6 Leave the match screen when kicked 2021-08-11 19:57:10 +09:00
Dean Herbert
9b21ebd6d0 Add client side handling on incoming kick 2021-08-11 19:56:06 +09:00
Dean Herbert
d9a4f018e6 Add event flow for receiving kick commands 2021-08-11 19:56:06 +09:00
smoogipoo
4002a1606e Round star ratings before comparing 2021-08-11 18:20:39 +09:00