1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 01:02:55 +08:00
Commit Graph

7903 Commits

Author SHA1 Message Date
Dean Herbert
a98d0cf0d8 Simplify channel filter method 2022-05-26 18:48:11 +09:00
Dean Herbert
b2607196b8 Merge branch 'master' into new-chat-integrate 2022-05-26 18:38:26 +09:00
Dan Balasescu
08935cff86 Detect exclusive fullscreen on Windows 2022-05-26 18:37:04 +09:00
Noah M
b550cbc5a3 Fix failing code quality checks 2022-05-25 17:01:30 -05:00
Bartłomiej Dach
a1b8fa0992
Disable "select all mods" button if all are selected 2022-05-25 23:06:12 +02:00
Bartłomiej Dach
071e158a29
Expose available mod state outwardly as a bindable 2022-05-25 23:06:12 +02:00
Bartłomiej Dach
f0303d76e8
Split off "select all mods" button to separate class 2022-05-25 22:18:30 +02:00
Bartłomiej Dach
a3f2962558
Disable "deselect all mods" button if none are selected 2022-05-25 22:15:02 +02:00
Bartłomiej Dach
a4bd399b0c
Split off "deselect all mods" button to separate class 2022-05-25 22:14:45 +02:00
Jai Sharma
f94afa5f8c Code quality 2022-05-25 18:28:18 +01:00
Jai Sharma
997fc716e8 Split out the channel list labels from the channel list item flow 2022-05-25 15:15:46 +01:00
Jai Sharma
c0da05dda0 Use an array of channels to exclude from the overlay 2022-05-25 15:15:26 +01:00
Jai Sharma
cd90d29315 Ensure channel traversal shortcut scrolls channel list item into view 2022-05-25 12:37:28 +01:00
Jai Sharma
4a36f3aa4c Ensure channel traversal shortcut is using visual order 2022-05-25 12:29:04 +01:00
Dean Herbert
49ab031e75 Allow traversing in both directions using ctrl-tab shortcuts 2022-05-25 18:42:49 +09:00
Dean Herbert
a92089c443 Change filter method to consider all non-system channels as joinable 2022-05-25 18:42:33 +09:00
Dan Balasescu
79c8752bb4
Merge pull request #18408 from peppy/first-run-ui-scale-first
Move UI scale setup to the beginning of the first run setup
2022-05-25 12:56:03 +09:00
Dean Herbert
de5d2df100 Move UI scale setup to the beginning of the first run setup 2022-05-25 12:19:26 +09:00
Dan Balasescu
f468d1eb16
Merge branch 'master' into editor-tidy-up 2022-05-25 11:58:34 +09:00
Jai Sharma
f6810d3f59 Add keyboard shortcuts to ChatOverlayV2 with tests 2022-05-24 23:05:25 +01:00
Bartłomiej Dach
61c093c109
Merge branch 'master' into rounded-button-colour-default 2022-05-24 22:47:47 +02:00
Jai Sharma
fce527b0df Schedule channel manager bindable events to ensure they happen after the first poll 2022-05-24 21:25:27 +01:00
Bartłomiej Dach
2dd0b3f8d9
Merge branch 'master' into fix-mod-panel-click-area 2022-05-24 21:52:37 +02:00
Dean Herbert
0bcf8c846c Change editor colour scheme to aquamarine 2022-05-24 18:43:22 +09:00
Dean Herbert
f00dd27fcd Move OverlayColourProvider provisioning of RoundedButton to SettingsButton for now 2022-05-24 18:11:54 +09:00
Joseph Madamba
1f935cacf4 Add spotlighted beatmaps filter to beatmap listing 2022-05-23 18:47:04 -07:00
Joseph Madamba
ed0b841df0 Fix incorrect left/right clicking area of mod panels 2022-05-23 18:29:26 -07:00
apollo-dw
eae2378466 Add WIP to search filters 2022-05-24 01:49:07 +01:00
Jai Sharma
58d39734d0 Integrate ChatOverlayV2 into main game 2022-05-23 21:02:47 +01:00
Susko3
88217e0c98 Adjust ScrollDelta usages to account for normalised IsPrecise values 2022-05-23 20:22:27 +02:00
Dean Herbert
7d93778355
Merge pull request #18290 from jai-x/new-chat-remove-selector-item
Use dummy channel to show selector and remove `ChannelListSelector`
2022-05-23 15:49:00 +09:00
Dean Herbert
d84119ac06
Merge pull request #18343 from frenzibyte/waveform-test-beatmap-failure
Fix `WaveformTestBeatmap`s potentially providing disposed track
2022-05-22 21:21:28 +09:00
Jai Sharma
fb06b7658b Merge branch 'master' into new-chat-remove-selector-item 2022-05-21 17:30:06 +01:00
Dean Herbert
4633eed78c Merge branch 'master' into localisable-filter-items 2022-05-20 23:55:16 +09:00
Salman Ahmed
abf9039109 Use == instead of ?? 2022-05-20 16:08:31 +03:00
Salman Ahmed
c78d90ccbd Refactor track transferring logic for ability to override and disallow 2022-05-20 14:43:07 +03:00
Jai Sharma
c37d1e4fae Ensure current channel is set to the ChannelListingChannel when it becomes null 2022-05-19 11:45:39 +01:00
Dean Herbert
136ecb45e2 Rename dummy channel and move to a nested class inside the ChannelListing itself 2022-05-19 19:26:14 +09:00
Dean Herbert
63c9776365 Fix oversight in bindable logic in new overlay class 2022-05-19 19:24:18 +09:00
Dean Herbert
363e7a6f53 Simplify toolbar hiding logic in FirstRunSetupOverlay
Rather than fiddling around with the activation modes, this seems like a
much cleaner way to make things work.

Closes https://github.com/ppy/osu/issues/18277.
2022-05-19 16:42:48 +09:00
Dean Herbert
d187ca2d8c
Merge pull request #18246 from jai-x/new-chat-cache-loaded-channels
Add drawable channel caching to new chat overlay
2022-05-19 15:15:47 +09:00
Dean Herbert
a443200d0d Make dependency nullable to allow for safer disposal unbinding 2022-05-19 13:49:52 +09:00
Noah M
0ef9406787 Fix deleteBeatmapVideosButton not being reenabled
My bad
2022-05-18 16:35:14 -05:00
Noah M
617382a56f Split off MassVideoDeleteConfirmationDialog into its own file 2022-05-18 15:20:57 -05:00
Salman Ahmed
5d3878a737 Add test coverage for slow-loading channels 2022-05-18 22:58:39 +03:00
Jai Sharma
371738b047 Check against the loaded drawable channel 2022-05-18 20:00:42 +01:00
Dean Herbert
0cee90e156 Add common strings for missing localisable content 2022-05-18 21:32:57 +09:00
Dean Herbert
d54e1503c7 Rename interaction toggle method 2022-05-18 21:32:57 +09:00
Dean Herbert
fa09270e62 Remove left-over todo 2022-05-18 21:32:57 +09:00
Noah M
69351d2cdf Implement button to delete all beatmap videos 2022-05-18 01:20:57 -05:00
Jai Sharma
4015042e36 Ensure close button component is not stored as a Drawable 2022-05-18 01:35:39 +01:00
Bartłomiej Dach
c2555a91c7
Merge branch 'master' into first-run-screen-import-from-stable 2022-05-17 22:52:01 +02:00
Bartłomiej Dach
10b881dbf7
Merge branch 'master' into first-run-screen-button-ux 2022-05-17 22:27:49 +02:00
Jai Sharma
932442e242 Use null for empty grid cells in ChannelListItem 2022-05-17 18:52:19 +01:00
Dean Herbert
062ffe64ac Remove delay on pop in 2022-05-17 18:21:19 +09:00
Dean Herbert
bf00b062ad Add full localisation of import beatmaps screen 2022-05-17 17:58:24 +09:00
Dean Herbert
f4e0ad8c4c Fix drag drop of osu! folder not working as expected 2022-05-17 17:51:28 +09:00
Dean Herbert
c0de1f96ff Tidy up interaction toggling and add progress message 2022-05-17 17:33:54 +09:00
Dean Herbert
03d3900a02 Fix incorrect default state of checkboxes 2022-05-17 17:33:54 +09:00
Dean Herbert
adc7b61240 Switch directory selector to use a semi-shared popover implementation 2022-05-17 17:33:54 +09:00
Dean Herbert
e2ea98693f Tidy up buttons and text 2022-05-17 17:33:54 +09:00
Dean Herbert
4af1a788d1 Add locate stable button / screen 2022-05-17 15:55:53 +09:00
Dean Herbert
1593f05ff3 Tidy up checkbox implementation 2022-05-17 15:55:53 +09:00
Dean Herbert
13e70eab51 Allow cancellation of count operations and bypassing interactive location logic 2022-05-17 15:55:53 +09:00
Dean Herbert
1666d13d26 Add item counts to import screen 2022-05-17 15:55:53 +09:00
Dean Herbert
4412fec41a Add import from stable screen 2022-05-17 15:55:52 +09:00
Dean Herbert
ef5b2233d7 Improve the first run progress button to show loading and completion status 2022-05-17 15:23:13 +09:00
Dan Balasescu
a633501687 Change FilterTerms to use LocalisableString 2022-05-16 14:09:37 +09:00
Jai Sharma
ae5b6c3e10 Use dummy channel to show selector and remove ChannelListSelector
Add dummy channel `DummySelectorChannel` which should be set as the
current channel in the channel manager when the selector in the chat
overlay should be shown.

Refactors the `ChannelListItem` to not show mention pill and close
button when the channel is the dummy selector channel.

Ensure that the `ChannelList` selects the dummy channel on clicking the
selector item.

Removes `ChannelListSelector` as it is no longer needed.

Removes the `setCurrent` parameter from `ChannelManager.JoinChannel`
method as it is no longer needed.
2022-05-15 20:24:49 +01:00
Bartłomiej Dach
170df01b46
Adjust difficulty multiplier scale transition on mod overlay
The previous transition was supposed to be a center-anchored elastic
scale-in, but this didn't work as intended - because the multiplier
ended up inside of an auto-sized right-aligned container, the animation
itself would end up being anchored right.

Attempts to remove the scale transition resulted in a rather
jarring-looking result, so swap out the elastic scale-in for a sweep-in
effect from the top, to match the header and avoid introducing too many
directions of movement.

Delay values tweaked "to taste" - can be adjusted further if there is an
alternative set of values that feels better.
2022-05-15 20:44:50 +02:00
Dean Herbert
328561f5c8
Merge pull request #18263 from frenzibyte/spotlight-beatmap-badge
Add support for "spotlight" label in beatmap overlay/listing
2022-05-15 12:32:20 +09:00
Salman Ahmed
4bb06873d5 Move badge hierarchy declaration to constructor for safer access 2022-05-14 21:54:56 +03:00
Dean Herbert
8a01050168 Refactor mod select button initialisation to allow shared usage of deselect button 2022-05-15 03:16:43 +09:00
Salman Ahmed
1878578196 Move todo comment to subclasses 2022-05-14 21:05:34 +03:00
Salman Ahmed
441957e18e Convert get-only virtual properties to avoid DI order dependency 2022-05-14 21:05:34 +03:00
Salman Ahmed
88ba84ac9c Replace Pill with Badge everywhere 2022-05-14 20:52:38 +03:00
Dean Herbert
a759cf2dab Add key binding to deselect all mods
Defaults to `Backspace`.
2022-05-15 02:51:58 +09:00
Salman Ahmed
2878a6dcbe Integrate spotlight beatmap badge in info overlay 2022-05-14 19:47:10 +03:00
Salman Ahmed
56d6cb5764 Add "spotlight" beatmap badge 2022-05-14 19:46:50 +03:00
Salman Ahmed
c8bea6273b Abstractify beatmap badge logic to own class 2022-05-14 19:46:37 +03:00
Jai Sharma
bd68ffa805 Fix textbox focus test in ChatOverlayV2 2022-05-14 12:16:00 +01:00
Jai Sharma
2163a78b7f Ensure drawable channels removed from the cache are disposed 2022-05-14 00:15:09 +01:00
Jai Sharma
f88e416d1a Ensure the wrong drawable channel isn't shown after load 2022-05-13 23:39:09 +01:00
Jai Sharma
9f5351e5a1 Add drawable channel caching to new chat overlay 2022-05-12 23:58:41 +01:00
Dean Herbert
8760e5d884 Merge branch 'master' into new-chat-drawable-channel 2022-05-12 22:36:19 +09:00
Dan Balasescu
5f2d9bf04c
Merge pull request #18211 from frenzibyte/audio-adjustment-breakage-alt
Fix mods potentially adjusting track while not selected
2022-05-12 15:44:19 +09:00
Salman Ahmed
82c4a5fe9f
Merge branch 'master' into new-chat-visibility-behaviour 2022-05-12 09:04:24 +03:00
Dean Herbert
3d64dc53a6 Merge branch 'master' into audio-adjustment-breakage-alt 2022-05-12 14:18:28 +09:00
Dean Herbert
6ba0760b17
Merge branch 'master' into new-chat-visibility-behaviour 2022-05-12 13:59:35 +09:00
Dean Herbert
1d38e5bd33 Add notes about weird local handling in ChannelListSelector 2022-05-12 13:58:10 +09:00
Dean Herbert
2dfed6eda1 Remove selectorActive bindable completely 2022-05-12 13:53:57 +09:00
Jai Sharma
db371ab068 Use CurrentChannel == null to show the channel selector 2022-05-11 22:52:15 +01:00
Bartłomiej Dach
981ead68bf
Ensure local mods are constructed in time for Pop{In,Out}() 2022-05-11 22:31:27 +02:00
Bartłomiej Dach
93539160ad
Remove no-longer-necessary guard 2022-05-11 22:31:26 +02:00
Bartłomiej Dach
2266a5c9a0
Remove no-longer-necessary ModColumn.Filter 2022-05-11 22:31:26 +02:00
Bartłomiej Dach
1c0166367d
Fix remaining column operations being coupled to drawables 2022-05-11 22:31:26 +02:00
Bartłomiej Dach
b5a9f1310a
Fix select/deselect all toggle not working correctly after changes 2022-05-11 22:31:26 +02:00
Bartłomiej Dach
52bbce12f1
Fix not being able to set AvailableMods before loaded 2022-05-11 22:31:26 +02:00
Bartłomiej Dach
fc24a56478
Add protection from recursive updates from external selection 2022-05-11 22:31:25 +02:00
Bartłomiej Dach
83ba06e7af
Extract helper property for accessing all mods 2022-05-11 22:31:25 +02:00
Bartłomiej Dach
11ae1da65a
Hoist reference replacement logic to overlay level 2022-05-11 22:26:47 +02:00
Bartłomiej Dach
05a21fbbe0
Hoist ModState to overlay level 2022-05-11 22:26:21 +02:00
Bartłomiej Dach
e86444c4bf
Hoist ModState to column level 2022-05-11 22:03:49 +02:00
Bartłomiej Dach
74599c9c62
Use ModState in mod panels 2022-05-11 22:03:48 +02:00
Bartłomiej Dach
478cfc0b87
Split model class for mod state 2022-05-11 22:03:48 +02:00
Bartłomiej Dach
ddb2d4eef5
Rename FreeModSelect{Screen -> Overlay} reference in inline comment 2022-05-11 18:06:09 +02:00
Bartłomiej Dach
a104277e7f
Rename ModSelect{Screen -> Overlay}Strings 2022-05-11 18:01:33 +02:00
Bartłomiej Dach
76c63f1d0a
Rename ModSelect{Screen -> Overlay} in place of removed old design 2022-05-10 22:56:50 +02:00
Bartłomiej Dach
33634cba1e
Remove old mod buttons 2022-05-10 21:58:22 +02:00
Bartłomiej Dach
8b0ece1c09
Remove old mod section 2022-05-10 21:55:54 +02:00
Bartłomiej Dach
dfd97701d7
Remove old mod settings container & related controls 2022-05-10 21:53:42 +02:00
Bartłomiej Dach
128468e13d
Remove old base mod select overlay 2022-05-10 21:52:30 +02:00
Bartłomiej Dach
24c59e2f2f
Remove old user mod select overlay 2022-05-10 21:52:17 +02:00
Salman Ahmed
9446be2511 Remove unnecessary UnbindAdjustments call
It is not necessary given that `CurrentTrack` already removes all adjustments first.
2022-05-10 20:49:44 +03:00
Salman Ahmed
36a7644164 Reinstantiate mod adjustments layer for safety against previous mods 2022-05-10 20:46:33 +03:00
Salman Ahmed
725ff93f34 Define local adjustments component for mods in MusicController
Isolates `CurrentTrack` from being directly adjusted by the mod, which could lead to issues depending on how the mod adds adjustments (i.e. `ModTimeRamp`, which adds adjustments based on changes to a setting bindable).
2022-05-10 18:24:29 +03:00
Dan Balasescu
42fe708225
Fix inspection 2022-05-10 19:56:21 +09:00
Dean Herbert
a578f7a406 Force nested screens to load synchronously 2022-05-10 18:21:35 +09:00
Dean Herbert
a93c63b2b5 Add loading spinner when loading first run screens 2022-05-10 18:21:35 +09:00
Dean Herbert
25c6226ca9 Adjust transition length for a more seamless screen change 2022-05-10 18:21:35 +09:00
Dean Herbert
493798ae5e Fix nested ui scale example screens no longer fitting 2022-05-10 18:21:35 +09:00
Dean Herbert
63b9e01d38 Fix behaviour screen using old style buttons 2022-05-10 18:21:35 +09:00
Dean Herbert
61313b69ec Standardise font sizes in first run overlay screens 2022-05-10 18:21:35 +09:00
Dean Herbert
e5204e565d Move horizontal padding to content level to better align scrollbar 2022-05-10 18:21:35 +09:00
Dean Herbert
bcce9c5e67 Limit the width of first run overlay content 2022-05-10 18:21:35 +09:00
Dean Herbert
9aadc274bf Show first run dialog on first run of the game 2022-05-10 18:21:35 +09:00
Dan Balasescu
8ccf2ee075 Add inline comment 2022-05-10 15:07:08 +09:00
Dan Balasescu
2b7eeadac0 Workaround bad performance when selecting all freemods 2022-05-10 14:48:41 +09:00
Dan Balasescu
886a4815fa
Merge pull request #18180 from frenzibyte/fix-toolbox-double-tap
Fix `SettingsToolboxGroup` not clearing transforms before updating autosize
2022-05-10 13:48:02 +09:00
Jai Sharma
2481201a73 Fix selector dismissal behaviour during user actions 2022-05-09 22:58:46 +01:00
Salman Ahmed
96ea4ee7b3 Add explanatory comment 2022-05-09 23:49:05 +03:00
Bartłomiej Dach
626fcd5d35
Merge branch 'master' into column-flow-cq 2022-05-09 19:22:29 +02:00
Jai Sharma
d4cc2bd7dd Ensure channel selector is dismissed when the current channel is changed 2022-05-09 12:11:25 +01:00
Salman Ahmed
702c6ae658 Fix SettingsToolboxGroup not clearing transforms before updating autosize 2022-05-09 13:49:31 +03:00
Dean Herbert
1c63c27fdf Merge branch 'master' into new-chat-drawable-channel 2022-05-09 18:23:00 +09:00
Dan Balasescu
e9cc3ab54a
Merge pull request #18164 from Joehuu/fix-exit-dialog-bad-state
Fix popup dialog potentially not clicking last button when dismissed
2022-05-09 17:22:03 +09:00
Jai Sharma
623e2c94ae Adjust padding 2022-05-09 00:32:22 +01:00
Jai Sharma
aeb2984989 Move ChatOverlayDrawableChannel to it's own file 2022-05-09 00:31:22 +01:00
Jai Sharma
5f80e344c3 Update day separator date text to right align against username 2022-05-09 00:15:08 +01:00
Joseph Madamba
21e1f4546a Fix popup dialog potentially not clicking last button when dismissed 2022-05-08 14:40:30 -07:00
Joseph Madamba
172d14bcc6 Improve code quality of mod column flow container 2022-05-08 11:40:14 -07:00
Bartłomiej Dach
d964b4f23c
Fix uneven spacing when some mod columns are hidden 2022-05-08 15:40:21 +02:00
Bartłomiej Dach
6bdcf893b7
Move alpha management closer to screen level
Felt bad messing with alpha at the column level.
2022-05-08 15:40:10 +02:00
Bartłomiej Dach
92ccec20d7
Hide mod columns if all mods within are filtered out 2022-05-08 14:53:59 +02:00
Dean Herbert
b8cb2c1b82 Increase scroll amount slightly 2022-05-08 19:57:03 +09:00
Dean Herbert
778497b9e2 Scroll mod select slightly into view on first display 2022-05-08 18:58:54 +09:00
Bartłomiej Dach
b92d95a17a
Fix mod panels playing samples when hidden at a higher level 2022-05-08 10:39:49 +02:00
Bartłomiej Dach
81ca534f87
Implement ISamplePlaybackDisabler in mod select 2022-05-08 10:39:49 +02:00
Dean Herbert
230c4e27b8 Simplify and centralise hiding logic for mod overlay
Behaviourally, this also always toggles via button triggering to add the
button flash animation.
2022-05-08 13:03:28 +09:00
Jai Sharma
8da7bbd322 Code quality 2022-05-07 23:30:46 +01:00