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

37621 Commits

Author SHA1 Message Date
Dean Herbert
e630c1be50
Merge pull request #12090 from bdach/overlapping-object-selection
Fix selection blueprint misbehaving with overlapping objects
2021-03-20 10:46:29 +09:00
Bartłomiej Dach
dd48b68f8a Ensure selected blueprints are given selection priority 2021-03-19 22:44:33 +01:00
Bartłomiej Dach
8e0536e1e2 Add failing test scene 2021-03-19 22:44:33 +01:00
Bartłomiej Dach
e67c759eef Mark control point visualiser as possibly-null 2021-03-19 22:44:31 +01:00
Bartłomiej Dach
9634560d4b Fix control point visualiser crashing after deselections
`SliderSelectionBlueprint.OnDeselected()` would expire the
`ControlPointVisualiser` on deselection, leading to its removal from the
blueprint and eventual disposal, but still kept a separate reference to
said visualiser in another field.

This could lead to that stale reference to a disposed child getting read
in `ReceivePositionalInputAt()`, crashing quite a ways down over at the
framework side on futilely trying to compute the bounding box of a
drawable with no parent.
2021-03-19 21:40:22 +01:00
Dan Balasescu
d54e9ab481
Merge pull request #12077 from peppy/tablet-configuration
Add tablet configuration section
2021-03-19 21:49:32 +09:00
Dan Balasescu
5a6ff53837
Merge pull request #12073 from peppy/fix-crash-toggle-overlay-before-loaded
Avoid potential crash if an overlay is toggled before it has been loaded
2021-03-19 21:38:47 +09:00
Dan Balasescu
e72205eea2
Merge pull request #12080 from peppy/add-25-playback-editor
Change editor speed adjust to adjust frequency (and restore 25% option)
2021-03-19 21:04:12 +09:00
Dan Balasescu
c4d7c70841
Merge pull request #12078 from peppy/make-ticks-more-visible
Adjust timeline ticks to be more visible
2021-03-19 20:54:21 +09:00
Dean Herbert
68aaf90702 Fix disposal rather than performing some weird hack 2021-03-19 20:30:52 +09:00
Dean Herbert
f59327cc3e Merge branch 'master' into fix-unsafe-skinnable-sample-play 2021-03-19 20:29:44 +09:00
Dean Herbert
b2d8db3a92 Rename incorrect variable 2021-03-19 20:25:21 +09:00
Dean Herbert
63cbac3bd0 Ensure aspect ratio slider gets an initial value 2021-03-19 20:15:29 +09:00
Dean Herbert
6f32c302eb Add checkbox to optionally disable tablet handling 2021-03-19 20:13:51 +09:00
Dan Balasescu
4da9089b00
Merge branch 'master' into tablet-configuration 2021-03-19 20:09:25 +09:00
Dean Herbert
095b7f8668 Rewrite code to account for non-loaded edge case 2021-03-19 20:09:12 +09:00
Dean Herbert
4795170c60 Add back the default json converter locally to ensure it's actually used 2021-03-19 20:07:13 +09:00
Dean Herbert
86b229b1c9 Increase maximum usable aspect ratio to account for ultrawide monitors 2021-03-19 20:05:18 +09:00
Dean Herbert
8955071703 Change editor speed adjust to adjust frequency 2021-03-19 20:01:45 +09:00
Dan Balasescu
413754ede3
Merge pull request #12071 from peppy/visually-distinguish-slider-node-types
Give each type of slider path type a unique colour to help visually distinguish them
2021-03-19 19:53:10 +09:00
Dean Herbert
9be7981e0d Adjust timeline ticks to be more visible 2021-03-19 19:45:00 +09:00
Dean Herbert
c0c8b3e46c Fix regression meaning SkinnableSound initialisation may never happen 2021-03-19 19:22:50 +09:00
Dean Herbert
bd1e2da1c2 Always hide other overlays, even if the new one is not loaded 2021-03-19 19:09:39 +09:00
Dan Balasescu
0736679016
Merge pull request #12072 from peppy/include-default-skin-in-random-rotation
Include the bundled skins when selecting a random skin
2021-03-19 19:08:42 +09:00
Dean Herbert
baf4e4e8f6
Merge branch 'master' into tablet-configuration 2021-03-19 19:06:58 +09:00
Dean Herbert
fefb007805 Remove no longer relevant comment 2021-03-19 19:01:32 +09:00
Dean Herbert
1e82033c84 Move bindings to LoadComplete to avoid cross-thread issues 2021-03-19 19:01:32 +09:00
Dean Herbert
b1c4ac9f42 Remove local implementation of Vector2Converter
This has been moved to framework in
https://github.com/ppy/osu-framework/pull/4285.
2021-03-19 19:01:32 +09:00
Dean Herbert
c624aa9397 Only update tablet values on commit 2021-03-19 19:01:32 +09:00
Dean Herbert
6285dcd1a1 Add arbitrary value to fix FP contains check failures 2021-03-19 19:01:32 +09:00
Dean Herbert
e8c20bdcb1 Add centre crosshair 2021-03-19 19:01:32 +09:00
Dean Herbert
fb7d095e4a Show aspect ratio for current usable area 2021-03-19 19:01:32 +09:00
Dean Herbert
196f95ae54 Update to use new bindables and centered area offset 2021-03-19 19:01:32 +09:00
Dean Herbert
9d0c8902a6 Fix margins and spacing between sub flowed items 2021-03-19 19:01:32 +09:00
Dean Herbert
d422a65900 Fix initial tablet size not being initialised 2021-03-19 19:01:32 +09:00
Dean Herbert
9a6a0f3df5 Add test coverage and better UI handling of no tablet connected scenario 2021-03-19 19:01:32 +09:00
Dean Herbert
a8e319a320 Remove min/max from test scene to fix weirdness when switching test sizings 2021-03-19 19:01:31 +09:00
Dean Herbert
bba25a0182 Tidy up draw hierarchy and bindable logic 2021-03-19 19:01:31 +09:00
Dean Herbert
932745e5c4 Fix remaining feedback loops 2021-03-19 19:01:31 +09:00
Dean Herbert
e3bed4c97d Simplify aspect ratio application, add window conforming and direct adjustment 2021-03-19 19:01:31 +09:00
Dean Herbert
43359553c1 Add aspect ratio display and limiting 2021-03-19 19:01:31 +09:00
Dean Herbert
9b70f0ee1f Tidy up visual appearance of settings and add a reset button 2021-03-19 19:01:31 +09:00
Dean Herbert
2dc2cb04c3 Fix bounds check becoming false when using full area 2021-03-19 19:01:31 +09:00
Dean Herbert
382109c7a2 Make test scene feel more like settings (width-wise) 2021-03-19 19:01:31 +09:00
Dean Herbert
464702182d Consume device name 2021-03-19 19:01:31 +09:00
Dean Herbert
94f184d113 Add feedback when area extends beyond tablet size 2021-03-19 19:01:31 +09:00
Dean Herbert
0a6525baee Fix slider bars reloading each time the tablet size is changed 2021-03-19 19:01:31 +09:00
Dean Herbert
926e40925e Add exclude rule to fix dynamic compilations issues with settings sections 2021-03-19 19:01:31 +09:00
Dean Herbert
3b7edf1333 Make tablet display always fit to size of settings area 2021-03-19 19:01:31 +09:00
Dean Herbert
d026c8da85 Initial pass of configuration interface 2021-03-19 19:01:31 +09:00