1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 04:42:55 +08:00
Commit Graph

27967 Commits

Author SHA1 Message Date
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
Dan Balasescu
dfd61e413a
Merge branch 'master' into difficulty-cache-difficulty-adjust 2021-08-24 12:08:52 +09:00
Dean Herbert
3c9718339c
Merge pull request #14444 from frenzibyte/decouple-ruleset-bindables
Decouple rankings overlay's ruleset selector from the game-wide ruleset bindable
2021-08-24 11:58:13 +09:00
Henry Lin
b8fe03b77f Use Mod.Equals for comparison 2021-08-24 09:50:09 +08:00
Henry Lin
6e3d05c7ce Display an icon to signify incompatibility instead of a red tint 2021-08-24 09:42:53 +08:00
Salman Ahmed
13a24ed36f
Merge branch 'master' into update-section-selection-childcount 2021-08-23 20:43:46 +03:00
Bartłomiej Dach
ccf337bdc2
Merge branch 'master' into editor-setup-file-selector-popovers 2021-08-23 18:28:44 +02:00
Davran Dilshat
6bea744e34 invalidate scroll position 2021-08-23 17:13:25 +01:00
Davran Dilshat
20222f09c4 oops redundant default value 2021-08-23 16:55:31 +01:00
Davran Dilshat
9a507ed273 update selected section on children count change 2021-08-23 16:27:29 +01:00
Salman Ahmed
bd42d7aada Hide popover on file selection 2021-08-23 18:01:01 +03:00
Dean Herbert
a2484692b3 Change brackets to square 2021-08-23 20:37:19 +09:00
Dean Herbert
7b3f7cc7c1 Change skin import to also include directory names in the skin name where appropriate 2021-08-23 20:24:00 +09:00
Dean Herbert
fed0e15cea Fix typo in ArchiveModelManager 2021-08-23 20:23:46 +09:00
Salman Ahmed
f8a7e0bdb6 Update rankings overlay ruleset bindable with parent on initial display 2021-08-23 13:50:39 +03:00
Salman Ahmed
d3958eb3fb Revert initial ruleset value logic 2021-08-23 13:28:21 +03:00
Salman Ahmed
f4b69ceb8a Remove unused using embedded in reverted changes 2021-08-23 12:40:20 +03:00
Salman Ahmed
257934a144 Revert "Revert ruleset when not applied filters (includes scope change)"
This reverts commit 9fa39cd34e.
2021-08-23 12:38:30 +03:00
Salman Ahmed
eeeaefbd7d Revert "Store default ruleset value for ability to revert"
This reverts commit cb7c2f713b.
2021-08-23 12:38:24 +03:00
Dean Herbert
34b51100ff
Merge pull request #14448 from bdach/basic-design-settings
Add basic design settings to editor setup screen
2021-08-23 18:19:58 +09:00
Dean Herbert
c2c9a93e2c Show editor file choosers in a popover rather than inline
Supersedes and closes #14370.
Closes #14367.
2021-08-23 18:12:36 +09:00
Dean Herbert
2f6b95da39 Add descriptions for the remaining settings 2021-08-23 17:41:03 +09:00
Dean Herbert
d17f7b5c8b Side WidescreenStoryboard to on by default for new beatmaps 2021-08-23 17:40:41 +09:00
Dean Herbert
1de84e1c98
Change description to include mention of video
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2021-08-23 17:34:19 +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
Salman Ahmed
9fa39cd34e Revert ruleset when not applied filters (includes scope change) 2021-08-23 11:11:06 +03:00
Salman Ahmed
cb7c2f713b Store default ruleset value for ability to revert 2021-08-23 11:09:26 +03:00
Salman Ahmed
1d89d757af Fix beatmap ruleset selector selecting initial ruleset 2021-08-23 09:57:05 +03:00
Dean Herbert
99bb3032a5 Move gradient to be part of the background for now 2021-08-23 15:27:32 +09:00
Salman Ahmed
2ba88923b6 Select user preferred ruleset on overlay ruleset selectors initially 2021-08-23 08:58:54 +03: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
Dan Balasescu
ead1b47e0e
Merge branch 'master' into localise-beatmap-set-overlay 2021-08-23 13:22:52 +09:00
Dan Balasescu
2ad5914fec
Merge branch 'master' into decouple-ruleset-bindables 2021-08-23 12:40:57 +09:00
Bartłomiej Dach
2e80e2be51
Reword epilepsy warning description text 2021-08-22 21:47:37 +02:00
Bartłomiej Dach
9538a32b5e
Explicitly update beatmap info wedge on mod change
This used to already be the case prior to b419ea7, but in a very
roundabout way. Changes to the value of the star difficulty bindable -
including indirect changes via the set of active mods changing - would
trigger the wedge display to regenerate and load asynchronously.

b419ea7 accidentally broke this by moving down the bindable retrieval to
a lower level, at which point `WedgeInfoText` would only receive the set
of mods selected at the time at which a given beatmap was selected, and
not receive any further updates, breaking the BPM display updating in
real time (as `WedgeInfoText` could not be aware that rate-changing mods
were even in effect).

To resolve, explicitly reload the wedge's contents on mod changes.
2021-08-22 19:16:46 +02:00
Bartłomiej Dach
e4a8f72167
Add failing test case 2021-08-22 19:16:43 +02:00
Bartłomiej Dach
d602dc9d90
Enable epilepsy warning setting persistence in encoder 2021-08-22 17:43:20 +02:00
Bartłomiej Dach
9816af688e
Add basic design settings to setup screen 2021-08-22 17:43:20 +02:00
Salman Ahmed
45b8bd175c Decouple rankings overlay's ruleset bindable from game-wide bindable 2021-08-22 16:25:35 +03:00
Salman Ahmed
d164529be8 Fix ruleset selector not updating to the first ruleset item until after LoadComplete()
This fixes the whole issue behind `Ruleset.Value` being null, by
updating `Current` on BDL rather than waiting for the base logic which
executes at `LoadComplete`.

This seems like something that should happen at the base `TabControl` class itself, by switching `Current` right after the first added tab item, rather than doing it on `LoadComplete`, but I'm not sure about changing framework logic outright, so fixing this locally until it occurs on other places.
2021-08-22 16:25:34 +03:00
Dean Herbert
81e3c9d40f Update resources 2021-08-22 19:13:21 +09:00
Salman Ahmed
956112eb10 Reword comment and remove brackets 2021-08-22 12:40:41 +03:00
Salman Ahmed
9b1720bd6c Merge branch 'master' into localise-beatmap-set-overlay 2021-08-22 10:53:31 +03:00
Michael Malloy
9cd0a182f6
Add null check for Android ruleset loading 2021-08-22 00:38:48 -05:00
Henry Lin
3795030ebb
Merge branch 'master' into mod-incompatibility-ui 2021-08-22 11:14:24 +08:00
Henry Lin
0bbddd297c Remove unused code 2021-08-22 11:05:53 +08:00
Henry Lin
e213562b2a Add a red tint on mods incompatible with the current selection 2021-08-22 11:01:17 +08:00
Henry Lin
ef6faf04be Use FirstOrDefault in TooltipContent 2021-08-22 10:22:18 +08:00
Henry Lin
3d402d9e78 List incompatible mods in tooltip of mod button 2021-08-22 10:13:34 +08:00
Nathan Alo
2877b43824 split multiplayer and playlist activity 2021-08-22 09:54:07 +08:00
Bartłomiej Dach
7ab12959a0
Merge branch 'master' into editor-regex 2021-08-21 19:57:26 +02:00
Dean Herbert
77f3668751
Merge branch 'master' into fix-screen-offsetting-on-scaling 2021-08-22 02:28:06 +09:00
Bartłomiej Dach
995338029c
Fix difficulty cache lookups sharing underlying mod instances
`DifficultyCacheLookup`s were storing raw `Mod` instances into their
`OrderedMods` field. This could cause the cache lookups to wrongly
succeed in cases of mods with settings. The particular case that
triggered this fix was Difficulty Adjust.

Because the difficulty cache is backed by a dictionary, there are two
stages to the lookup; first `GetHashCode()` is used to find the
appropriate hash bucket to look in, and then items from that hash bucket
are compared against the key being searched for via the implementation
of `Equals()`.

As it turns out, the first hashing step ended up being the saving grace
in most cases, as the hash computation included the values of the mod
settings. But the Difficulty Adjust failure case was triggered by the
quirk that `GetHashCode(0) == GetHashCode(null) == 0`.

In such a case, the `Equals()` fallback was used. But as it turns out,
because the `Mod` instance stored to lookups was not cloned and
therefore potentially externally mutable, it could be polluted after
being stored to the dictionary, and therefore breaking the equality
check. Even though all of the setting values were compared, the hash
bucket didn't match the actual contents of the lookup anymore (because
they were mutated externally, e.g. by the user changing the mod setting
values in the mod settings overlay).

To resolve, clone out the mod structure before creating all difficulty
lookups.
2021-08-21 15:50:33 +02:00
Salman Ahmed
9a6ff29951
Reword comment
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-08-21 15:39:57 +03:00
Salman Ahmed
1729d43cec Add explanatory comment 2021-08-21 15:18:03 +03:00
Salman Ahmed
df5354eba6
Merge branch 'master' into fix-setting-section-clickability 2021-08-21 14:25:28 +03:00
Salman Ahmed
216ff07497
Merge branch 'master' into fix-setting-section-clickability 2021-08-21 14:11:55 +03:00
Salman Ahmed
76e1d88028
Merge branch 'master' into gameplay-chat-mouse-cursor 2021-08-21 14:01:30 +03:00
Dean Herbert
ae47c5cdb3 Fix bottom area of a settings section not being clickable 2021-08-21 15:08:42 +09: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
Dean Herbert
36352d1de4 Improve highlighted chat username shadow effect 2021-08-21 14:34:35 +09:00
Salman Ahmed
20f193c1c2 Fix screen offsetting not handling scaled game instances
By using `Content` instead, now the logic will get the X of the settings
overlay at the `Content` space, which can be scaled in the
`ScalingMode.Everything` mode.

And in the case of `ScalingMode.ExcludeOverlays`, a subcontainer
somewhere inside `Content` that's holding the screen stack would be scaled,
but `Content` won't be affected which is what we want in that case.
2021-08-21 04:16:12 +03:00
Endrik Tombak
058d2d2a49 Use nekodex's regex from osu-web 2021-08-20 23:01:06 +03:00
Endrik Tombak
8745fe9e34 Change editor timestamp regex to not match non-editor ones 2021-08-20 22:32:04 +03:00
Dean Herbert
d3dba296d6 Update resources 2021-08-20 23:47:35 +09:00
Dan Balasescu
0c936aec4b
Merge branch 'master' into temporary-directory-test-storage 2021-08-20 22:09:42 +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
Dan Balasescu
0aea39f5f1
Merge branch 'master' into temporary-directory-test-storage 2021-08-20 20:41:54 +09:00
Dan Balasescu
0a6b678059
Merge branch 'master' into settings-dim-other-sections 2021-08-20 20:22:22 +09:00
Dean Herbert
77149044a5 Allow intro screen to retrieve beatmap even if rulesets is not loaded 2021-08-20 19:43:48 +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
Dean Herbert
591ba8cb09 Ensure the final scroll target is used when checking for whether too far down 2021-08-20 17:56:35 +09:00
smoogipoo
258ba4674c Fix background overflows 2021-08-20 17:50:49 +09:00
Dean Herbert
03e6ca5ba9 Adjust scroll behaviour to feel better 2021-08-20 17:40:56 +09:00
Dean Herbert
2d19f37dc6 Add missing new method in UserTrackingScrollContainer for scrolling into view 2021-08-20 17:40:41 +09:00
Dean Herbert
139ff2d6e2 Only fade header in when hovering a section
Feels less like the controls are interactive when hovering this way.
2021-08-20 17:40:05 +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
Dean Herbert
c7266c74a0 Always prefer clicked section when present 2021-08-20 17:00:20 +09:00
Dean Herbert
cff7b1e98f Ensure the correct fade level is applied over all state changes 2021-08-20 17:00:08 +09:00
Lucas A
9b4c806855 Apply review suggestions. 2021-08-20 09:47:23 +02:00
Lucas A
0a1c9a6c05 Move DownloadButtonStrings -> CommonStrings 2021-08-20 09:26:38 +02:00
smoogipoo
610a162271 Merge branch 'master' into remove-current-room 2021-08-20 16:23:36 +09:00
Lucas A
19cc4a14a3 Localise top score mods statistics 2021-08-20 09:22:15 +02:00
Dan Balasescu
54bc532f0d
Merge branch 'master' into fix-messagepack-union 2021-08-20 16:01:04 +09:00
Dean Herbert
659ec0c1b8
Merge pull request #14403 from Joehuu/fix-nub-glow
Fix nub glow color not having 0 alpha when being set
2021-08-20 15:07:30 +09:00
Dan Balasescu
dcff30ed6e
Merge branch 'master' into fix-login-as-guest 2021-08-20 14:06:28 +09:00
Dean Herbert
98357d51da
Merge pull request #14323 from minetoblend/editor-seek
Prevent seeking before mp3 start time while editor is playing
2021-08-20 13:28:20 +09:00
Joseph Madamba
284c871e39
Fix glow color potentially being set incorrectly when glowing
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-08-19 20:33:19 -07: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
580136a5e9
Merge branch 'master' into fix-lounge-loading 2021-08-20 10:51:30 +09:00
Bartłomiej Dach
143b8df1b2
Fix backwards warning text presence check 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
a65cd36a5f Move some constants to consts 2021-08-19 19:19:46 +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
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