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

51087 Commits

Author SHA1 Message Date
Dean Herbert
4efaa41670
Merge branch 'master' into new-chat-overlay 2022-05-05 18:57:00 +09:00
Bartłomiej Dach
2822ae0981
Merge pull request #18099 from peppy/snapping-tidy
Add xmldoc and rename methods in `IPositionSnapProvider` for legibility
2022-05-05 10:39:32 +02:00
Bartłomiej Dach
5e4d07760d
Merge branch 'master' into snapping-tidy 2022-05-05 10:17:48 +02:00
Dean Herbert
c3d2648f85
Reword weird xmldoc
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-05-05 17:07:05 +09:00
Dean Herbert
1fce0da331 Reword slightly, to allow better conformity with IDistanceSnapProvider 2022-05-05 16:04:34 +09:00
Bartłomiej Dach
0c2d280443
Merge pull request #18098 from peppy/strict-tracking-description
Remove weird strict tracking icon and reword description to explain what the mod does
2022-05-05 09:02:59 +02:00
Dean Herbert
f6fc926f1a Add xmldoc and rename methods in IPositionSnapProvider for legibility 2022-05-05 15:58:21 +09:00
Bartłomiej Dach
79ecf5dd5d
Merge branch 'master' into strict-tracking-description 2022-05-05 08:41:27 +02:00
Bartłomiej Dach
93deb3cf20
Merge pull request #18097 from Supersonicboss1/fix-alternate-mod-display
Fix Autoplay and Cinema not showing incompatibility with Alternate on hover, and made Alternate incompatible with Relax
2022-05-05 08:37:48 +02:00
Dean Herbert
cbc58c67bf Remove weird strict tracking icon and reword description to explain what the mod does 2022-05-05 15:16:01 +09:00
Supersonicboss1
81b4622620 fixed autoplay not showing compat, + relax compat 2022-05-04 22:25:34 +01:00
Jai Sharma
1a85e1267b Ensure focus is directed to ChatTextBox from ChatOverlay and add tests 2022-05-04 14:43:40 +01:00
Dean Herbert
ddab3c6d80 Tidy up state variables 2022-05-04 21:00:11 +09: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
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
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