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

32680 Commits

Author SHA1 Message Date
Bartłomiej Dach
bf80dd864c
Merge branch 'master' into fix-editor-toolbox-click-through 2022-05-04 11:57:32 +02:00
Dean Herbert
4e0f899159 Rename value changed variable 2022-05-04 18:13:30 +09:00
Salman Ahmed
f5d4f02200 Use ToUpper for key binding text 2022-05-04 11:59:29 +03:00
Salman Ahmed
0b8fd2e39f Improve distance spacing toast inline with key binding changes 2022-05-04 11:43:19 +03:00
Dean Herbert
b325f0ee0b Combine editor toolbox container implementation and fix input blocking
Until now, toolbox scroll areas would block input from arriving behind
them, even when no visible element was clicked.

In addition, clicking on a button inside a toolbox would still send a
`MouseDown` event to things behind it. Specifically, the editor's
`HitObjectComposer` would receive these events and also place objects
when the user does not expect them to be placed.

This fixes another regression that occurred due to `ScrollContainer`s no
longer blocking input theirselves.
2022-05-04 17:41:30 +09:00
Salman Ahmed
3d2072498e Merge branch 'master' into distance-spacing-osd 2022-05-04 11:41:12 +03:00
Dean Herbert
a66743266f Remove unused ScrollingToolboxGroup class 2022-05-04 17:20:58 +09:00
Salman Ahmed
6f52a0b5eb Merge branch 'master' into distance-spacing-osd 2022-05-04 11:10:18 +03:00
Dean Herbert
40f1ceca0a
Merge branch 'master' into distance-spacing-keybinding 2022-05-04 16:34:01 +09:00
Dean Herbert
732739715a Remove "grid" from strings 2022-05-04 16:31:20 +09:00
Salman Ahmed
504ca5be31 Fix scrolling no longer adjusting distance spacing by amount 2022-05-04 09:52:33 +03:00
Salman Ahmed
813d6fed48 Split activation keybind to separate increase/decrease keybinds 2022-05-04 09:00:54 +03:00
Dean Herbert
df530cb5ab Add highlighting to the position snap grid edges in addition to centre lines 2022-05-04 13:49:04 +09:00
Dean Herbert
0bb90c7b07 Fix gridline centering and ensure lines are always rendered using a fixed screen-space width 2022-05-04 13:41:55 +09:00
Salman Ahmed
d52a1a5d23 Add key binding for beatmap selection in song select 2022-05-04 03:52:10 +03:00
Jai Sharma
60999e83e0 Ensure ChatTextBox takes/leaves focus on chat overlay pop in/out 2022-05-03 22:33:36 +01:00
Jai Sharma
c17edb2848 Add padding to text in ChatTextBar to separate it from the textbox 2022-05-03 22:32:51 +01:00
Jai Sharma
50aee8b665 Ensure ChannelListSelector text also turns white when selected 2022-05-03 22:32:01 +01:00
Bartłomiej Dach
f5fa41356e
Rewrite mod instance management again to pass tests 2022-05-03 22:31:34 +02:00
Bartłomiej Dach
970361676b
Fix setting items not creating if mods initially not empty 2022-05-03 21:45:40 +02:00
Bartłomiej Dach
e3641213e1
Always hide unimplemented mods on mod select screen 2022-05-03 21:45:40 +02:00
Bartłomiej Dach
f91ee4b042
Reset panel mod instance settings to defaults on deselect 2022-05-03 21:45:40 +02:00
Bartłomiej Dach
7c04bf5c53
Refactor mod reference management to meet test expectations 2022-05-03 21:45:40 +02:00
Bartłomiej Dach
fe59f4ae58
Fix multiselection operation not flushing on close 2022-05-03 21:45:39 +02:00
Bartłomiej Dach
746a4a7403
Fix mod column using wrong equality type 2022-05-03 21:45:39 +02:00
Bartłomiej Dach
e17756fe25
Merge branch 'master' into sheared-search-textbox 2022-05-03 16:45:54 +02:00
Salman Ahmed
0dd2e1652c Mark OnScreenDisplay dependency as nullable 2022-05-03 11:15:28 +03:00
Salman Ahmed
b8287f3687 Display toast notification on editor distance spacing change 2022-05-03 10:30:32 +03:00
Salman Ahmed
521ec1a225 Add keybind for distance grid spacing activation 2022-05-03 10:15:24 +03:00
Dan Balasescu
637f817696 Ignore zero-sections on a per-case basis 2022-05-03 16:06:20 +09:00
Dean Herbert
2896612c5c Make exiting multiplayer a dangerous operation, requiring hold 2022-05-03 16:06:04 +09:00
Dan Balasescu
a555c47212 Reduce sorting complexity in worst-case of diffcalc 2022-05-03 15:02:57 +09:00
Dean Herbert
983eed32fc Reduce complexity of icon container nesting 2022-05-03 14:48:00 +09:00
Dean Herbert
b5ea26f2fa Fix incorrect shear masking on nested textbox 2022-05-03 14:45:17 +09:00
Dean Herbert
bc88c4ee8e Reduce container nesting by one level 2022-05-03 14:34:18 +09:00
Dean Herbert
8e0235392f Inline single-use constants 2022-05-03 14:31:20 +09:00
Dean Herbert
4a56297c1c Add localisation and improve visuals of placeholder text 2022-05-03 14:29:04 +09:00
Dean Herbert
4fb66a812f
Merge branch 'master' into sheared-search-textbox 2022-05-03 14:12:59 +09:00
Dean Herbert
04fb0f5e63
Merge pull request #18063 from GSculerlor/split-searchbox
Split `SearchTextBox` implementation for reusability
2022-05-03 14:12:44 +09:00
Ganendra Afrasya
a35502a834 Move implementation to ctor instead of bdl method 2022-05-03 11:33:03 +07:00
Ganendra Afrasya
e03d086305 Inherit SearchTextBox instead 2022-05-03 11:24:48 +07:00
Ganendra Afrasya
a436ff877f Apply review 2022-05-03 11:13:07 +07:00
Ganendra Afrasya
e6fbb19951 Implement new search textbox design 2022-05-03 11:13:07 +07:00
Dean Herbert
faeefc5e18
Merge pull request #16576 from frenzibyte/osu-distance-spacing
Add "distance spacing" support in editor for osu! ruleset
2022-05-03 12:15:18 +09:00
Ganendra Afrasya
81be69e72e Update search textbox implementation to use BasicSearchTextBox instead 2022-05-03 06:18:42 +07:00
Ganendra Afrasya
d7919f462c Split SearchTextBox into SearchTextBox and BasicSearchTextBox 2022-05-03 06:18:27 +07:00
Jai Sharma
a931b1ecc3 Show selected channel text as white in ChannelListItem 2022-05-02 22:32:25 +01:00
Jai Sharma
7f8e00c1e3 Change "Add more channels" to sentence case in "ChannelList" 2022-05-02 21:22:47 +01:00
Jai Sharma
1473762e25 Don't wrap "chatting in.." text in ChatTextBar 2022-05-02 20:57:39 +01:00
Jai Sharma
e6f1ac6bec Ensure "chatting in..." text is aligned with chat message 2022-05-02 20:45:38 +01:00
Dean Herbert
4442ed89b5
Merge pull request #17586 from Joehuu/move-difficulty-graph-toggle
Move difficulty graph toggle to individual skin settings
2022-05-03 00:59:02 +09:00
Bartłomiej Dach
2b4a49e17f
Merge branch 'master' into move-difficulty-graph-toggle 2022-05-02 16:38:25 +02:00
Dean Herbert
c4c62ff4e7 Fix countdown sounds playing every minute, rather than only on the last minute 2022-05-02 22:46:14 +09:00
Bartłomiej Dach
47aea45895
Merge branch 'master' into fix-footer-random-jarringness 2022-05-02 14:56:05 +02:00
Salman Ahmed
18852b2509 Fix footer random button autosizing to text length 2022-05-02 15:36:22 +03:00
Bartłomiej Dach
be4ef0880e
Merge branch 'master' into fix-beatmap-set-dismissal 2022-05-02 14:28:51 +02:00
Dean Herbert
f9a1d9df56 Reduce scale effect slightly (was feeling too bouncy) 2022-05-02 20:32:33 +09:00
Dean Herbert
55949e8407 Make disabled sheared buttons darker 2022-05-02 20:32:33 +09:00
Dean Herbert
c3e0ba5c8d Fix clicking anywhere in the beatmap overlay dismissing it 2022-05-02 20:27:00 +09:00
Salman Ahmed
337ee8f4c7
Merge branch 'master' into fix-first-run-ui-scale-applying-rate-adjust 2022-05-02 12:14:24 +03:00
Dean Herbert
53d65e8215
Merge pull request #18021 from frenzibyte/overlay-ruleset-selector-redesign
Update overlay ruleset selector inline with osu-web design
2022-05-02 17:53:01 +09:00
Dean Herbert
4b30d0e59b Fix first-run overlay's song select applying track adjustments
Closes https://github.com/ppy/osu/issues/18041.
2022-05-02 17:42:57 +09:00
Jai Sharma
4bd1d09148 Remove blank line 2022-05-01 12:20:11 +01:00
Dean Herbert
5c13200c75 Update production endpoint to new version 2022-05-01 13:01:38 +09:00
Jai Sharma
de393f735f Implement basic layout and behaviour of new chat overlay
Provides initial implementation of new chat overlay in component
`ChatOverlayV2`. Contains only the basic functionality required for
a functioning chat overlay according to the new design with the intent
of added the rest of the functionality in subsequent PRs.

Backports existing tests for the current chat overlay except for ones
testing keyboard shortcuts (since they haven't been added) and tab
closing behaviour (since no tabs).
2022-04-30 23:59:47 +01:00
Dean Herbert
b6fb0197ab Update framework 2022-04-30 23:52:36 +09:00
Salman Ahmed
ba5da8a52a Fix tooltips not shown on selected tab 2022-04-30 15:37:44 +03:00
Salman Ahmed
c7ab9a8928 Add ruleset tab item tooltips 2022-04-30 15:37:44 +03:00
Salman Ahmed
3996972867 Remove unnecessary f suffix 2022-04-30 12:23:08 +03:00
Dean Herbert
27ee990359 Update first-run overlay footer buttons to use new sheared design 2022-04-29 23:45:17 +09:00
Dean Herbert
5c04ab18ec
Merge pull request #18011 from frenzibyte/rewind-shift-click
Allow rewinding random in song select with "Shift + Left Click"
2022-04-29 23:10:29 +09:00
Salman Ahmed
9ea3e244e7 Adjust ruleset tab item content spacing to match web
Not too noticeable, but better match web in any case.
2022-04-29 12:48:09 +03:00
Salman Ahmed
4016fe1e19 Adjust profile ruleset selector to new design
Looks weird with `AlwaysPresent`.
2022-04-29 12:19:55 +03:00
Salman Ahmed
3829d27845 Update overlay ruleset selector design 2022-04-29 12:19:22 +03:00
Salman Ahmed
856ca96b66 Allow right-clicking to rewind on random button 2022-04-29 10:12:24 +03:00
Salman Ahmed
a9d67d3e92 Change random button text when holding shift key 2022-04-29 10:10:21 +03:00
Dean Herbert
1f1845d69b
Merge branch 'master' into multiplayer-force-start-2 2022-04-29 14:45:40 +09:00
Salman Ahmed
173a6188eb Add back float cast to distance spacing computation 2022-04-29 08:41:37 +03:00
Salman Ahmed
fef94d49f4 Revert "Convert data type of DistanceSpacing to float"
This reverts commit 7aaa88cac2.
2022-04-29 08:02:07 +03:00
Salman Ahmed
ef56dc07b5 Hide "modding" tab in user profile until it's implemented 2022-04-29 07:47:10 +03:00
Salman Ahmed
7e3d1511c6 Hide "Rank Achieved" sorting mode until it's supported 2022-04-29 07:47:10 +03:00
Dean Herbert
ee99b94940 Fix return condition from EnsureMutableSkin not accounting for "failed" imports 2022-04-29 13:46:18 +09:00
Dean Herbert
c4495dafb6 Merge branch 'master' into move-difficulty-graph-toggle 2022-04-29 13:44:47 +09:00
Dan Balasescu
fc21de8138
Merge pull request #18008 from peppy/add-tutorial
Add first run "beatmaps" screen
2022-04-29 13:10:45 +09:00
Dan Balasescu
22e9620211 Don't block clicks when dragging osu! logo 2022-04-29 12:09:11 +09:00
Dean Herbert
6ccbdc85a3
Improve setting description text
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-04-29 11:56:46 +09:00
Dean Herbert
652e022fd6
Merge pull request #17973 from bdach/mod-overlay/dim-columns-offscreen
Dim offscreen columns on new mod select overlay
2022-04-29 11:55:27 +09:00
Dean Herbert
92d4463e55 Add "always bundled" beatmaps 2022-04-29 11:45:18 +09:00
Dean Herbert
845e7dba95 Reduce padding slightly to restore usability of UI scale screen 2022-04-29 11:27:14 +09:00
Dean Herbert
a75051cd00 Merge branch 'master' into add-tutorial 2022-04-29 11:25:17 +09:00
Dan Balasescu
7097ce6501
Merge pull request #17926 from peppy/first-run-behaviour-screen
Add first-run "behaviour" screen to allow users a choice of more familiar UX
2022-04-29 11:21:14 +09:00
Dan Balasescu
6652a71f48
Merge pull request #18009 from peppy/osu-logo-drag
Allow dragging the osu! logo
2022-04-29 09:53:43 +09:00
Bartłomiej Dach
96f6c918a8
Merge branch 'master' into first-run-behaviour-screen 2022-04-29 00:55:30 +02:00
Bartłomiej Dach
a748ad6426
Merge branch 'master' into first-run-header 2022-04-28 22:19:35 +02:00
Salman Ahmed
fa5c05120c Allow rewinding random in song select with Shift + Left Click 2022-04-28 20:06:27 +03:00
Dean Herbert
32ad216669 Allow dragging the osu! logo
Logic borrowed from `NowPlayingOverlay`.
2022-04-28 22:58:34 +09:00
Dean Herbert
a50dd2ae93 Fix rider failures in nullable 2022-04-28 20:15:40 +09:00
Dan Balasescu
1d8ac6917d Send Loaded state from PlayerLoader on update thread 2022-04-28 20:10:47 +09:00
Dean Herbert
f300b62877 Add ScrollIntoView method which accepts an offset to allow usage in mod select 2022-04-28 20:03:54 +09:00
Dan Balasescu
fe0fcc7e9e Rename countdown object 2022-04-28 20:00:38 +09:00