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

51082 Commits

Author SHA1 Message Date
Salman Ahmed
e9ecf26b6a Merge branch 'master' into multiplayer-disable-adaptive-speed 2022-05-04 17:12:03 +03:00
Dean Herbert
e920bbd497
Merge pull request #18081 from bdach/mod-overlay/test-coverage-parity
Port test coverage from old mod select overlay to new design
2022-05-04 20:24:50 +09:00
Dean Herbert
e4ac714c6d
Merge pull request #18088 from peppy/fix-editor-toolbox-click-through
Fix clicks and drags around editor toolboxes resulting in unexpected interactions
2022-05-04 19:42:32 +09:00
Dean Herbert
5f11ff564b
Merge branch 'master' into mod-overlay/test-coverage-parity 2022-05-04 19:40:56 +09:00
Dean Herbert
3eead5a6a3 Rename FlushAnimation to FlushPendingSelections to better match purpose 2022-05-04 19:40:08 +09:00
Bartłomiej Dach
bf80dd864c
Merge branch 'master' into fix-editor-toolbox-click-through 2022-05-04 11:57:32 +02:00
Bartłomiej Dach
6380216263
Nudge click location to avoid placement failures 2022-05-04 11:56:44 +02:00
Bartłomiej Dach
a759e641eb
Enforce composer aspect ratio to avoid depending on ambient window size 2022-05-04 11:56:29 +02:00
Dean Herbert
0018408bdb
Merge pull request #18071 from frenzibyte/distance-spacing-osd
Display toast notification on editor distance spacing changes
2022-05-04 18:42:00 +09: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
Dean Herbert
f899c3e68f Add test coverage of circle placement around editor toolboxes 2022-05-04 17:56:53 +09: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
f64a6305af
Merge pull request #18070 from frenzibyte/distance-spacing-keybinding
Add keybind for handling distance spacing scrolls in editor
2022-05-04 17:03:06 +09: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
Bartłomiej Dach
1122ee967c
Merge pull request #18085 from peppy/fix-editor-grid-rendering
Improve editor grid rendering
2022-05-04 08:23:39 +02: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
Dean Herbert
bb086800b1 Remove ugly playfield border 2022-05-04 13:41:30 +09:00
Bartłomiej Dach
f5fa41356e
Rewrite mod instance management again to pass tests 2022-05-03 22:31:34 +02:00
Bartłomiej Dach
216dfb7e91
Expand incompatibility test to cover logic more thoroughly 2022-05-03 21:45:40 +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
89d8ed8e20
Port existing test coverage 2022-05-03 21:45:39 +02:00
Bartłomiej Dach
533574e3d0
Merge pull request #17915 from GSculerlor/sheared-search-textbox
Implement new sheared search textbox design
2022-05-03 19:57:26 +02:00
Bartłomiej Dach
e17756fe25
Merge branch 'master' into sheared-search-textbox 2022-05-03 16:45:54 +02:00
Dean Herbert
054a82d152
Merge pull request #18067 from smoogipoo/reduce-diffcalc-sort-complexity
Reduce sorting worst-case time complexity in difficulty calculation
2022-05-03 21:49:44 +09: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
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