OliBomby
154a3eebc6
Reset the sample bank states to auto when selection is cleared
...
this matches behaviour in stable
2024-10-01 13:22:20 +02:00
OliBomby
1960a0d44d
Add tooltip to explain why addition banks dont work when no additions exist
2024-10-01 13:07:25 +02:00
Dean Herbert
54e68005ef
Merge pull request #29691 from bdach/hotkeys-in-context-menus
...
Add hotkey hints to editor menus
2024-10-01 19:29:05 +09:00
OliBomby
0a78eb9628
Implement auto additions editor-only
2024-10-01 16:40:48 +09:00
Dean Herbert
1b4215576d
Merge branch 'master' into additions
2024-10-01 16:38:56 +09:00
Dean Herbert
590f27e0a0
Merge branch 'master' into hotkeys-in-context-menus
2024-10-01 15:50:19 +09:00
Bartłomiej Dach
11fc1f9a1c
Fix distance snap grid using wrong colour when reference object is unsnapped
2024-09-30 13:36:51 +02:00
Bartłomiej Dach
75fc57c34b
Fix distance spacing grid displaying incorrectly for unsnapped objects with duration
2024-09-30 13:36:16 +02:00
Dean Herbert
a258059d43
Merge pull request #29918 from bdach/control-drag
...
Add to existing selection when dragging with control pressed
2024-09-30 14:00:36 +09:00
Dean Herbert
c46d787f1e
Merge pull request #29949 from minetoblend/feature/scale-around-center
...
Support scaling around center when scaling with select box
2024-09-28 21:37:39 +09:00
Bartłomiej Dach
d607331755
Fix control-drag selection expansion deselecting object if control is released over one of the blueprints
2024-09-27 12:15:08 +02:00
Bartłomiej Dach
b45fedc356
Merge branch 'master' into control-drag
2024-09-27 11:39:50 +02:00
Bartłomiej Dach
33593280d8
Merge pull request #29938 from OliBomby/selection-center
...
Use minimum enclosing circle as selection centre for scale and rotate
2024-09-27 10:46:32 +02:00
Dean Herbert
9dcce67b81
Make points slightly smaller when contracted and fix width getting obliterated
2024-09-27 17:24:24 +09:00
Dean Herbert
ce41dc4629
Use bindable flow for zoom handling
2024-09-27 17:13:26 +09:00
Bartłomiej Dach
766d2d2ad2
Merge pull request #29950 from minetoblend/feature/freeze-select-box-buttons
...
Freeze select box buttons position on press
2024-09-27 10:13:06 +02:00
Bartłomiej Dach
fa90b43233
Merge branch 'master' into selection-center
2024-09-27 09:30:36 +02:00
OliBomby
e3b4483872
Refactor PlacementBlueprint to not be hitobject specific
2024-09-24 20:31:00 +02:00
Marvin Schürz
99a80b399c
Animate SelectionBox buttons on unfreeze
2024-09-24 16:42:37 +02:00
Marvin Schürz
b54b4063be
Rename parameter
2024-09-24 12:40:28 +02:00
OliBomby
0f0f490598
Don't snap to global grid while placing grid
2024-09-23 17:24:09 +02:00
OliBomby
1a81e12192
Refactor PlacementBlueprint to not be hitobject specific
2024-09-23 16:33:36 +02:00
OliBomby
a9ebfbe431
Assert default origin not null in rotation handle
2024-09-23 11:37:42 +02:00
OliBomby
92b5650ff8
fix outdated comment
2024-09-23 10:56:03 +02:00
Marvin Schürz
1095f35025
Only store position instead of entire draw quad
2024-09-21 15:25:37 +02:00
Marvin Schürz
0077ba72ec
Freeze select box buttons in place as long as they are hovered
2024-09-21 14:59:47 +02:00
Marvin Schürz
2dbbbe270d
Scale around center when pressing alt while dragging selection box scale handle
2024-09-21 13:37:41 +02:00
OliBomby
ee00624751
use minimum enclosing circle selection centre in rotation
2024-09-20 01:07:47 +02:00
OliBomby
34087a0f1a
Reduce sample point pieces to pink dot if zoomed out
2024-09-19 16:20:26 +02:00
Dean Herbert
188a430418
Merge branch 'master' into grids-3
2024-09-19 18:21:05 +09:00
Bartłomiej Dach
f6195c5515
Add to existing selection when dragging with control pressed
...
Closes https://github.com/ppy/osu/issues/29023 .
2024-09-18 15:18:13 +02:00
OliBomby
e4cfa7c86f
Add view menu toggle for sample points
2024-09-17 11:27:23 +02:00
Dean Herbert
58fe502af4
Merge branch 'master' into beatmap-info-purge
2024-09-15 04:53:35 +09:00
Bartłomiej Dach
130802e480
Add hotkey hints to editor menus
2024-09-04 12:16:54 +02:00
OliBomby
ba0c4df2a9
Merge remote-tracking branch 'upstream/master' into doubleclick
2024-08-29 19:34:18 +02:00
OliBomby
8fe7ab131c
dont seek on right-click, only on keyboard request
2024-08-29 19:34:14 +02:00
Dan Balasescu
fec8fa46fa
Merge pull request #29533 from bdach/fix-sample-bank-stuff-again
...
Fix incorrect bank set / sample addition logic
2024-08-29 21:36:26 +09:00
OliBomby
b5b4f915a9
Automatic seek to sample point on right-click
2024-08-27 19:40:33 +02:00
OliBomby
daad476593
Add float comparison leniency just in case
2024-08-27 19:04:16 +02:00
Dean Herbert
fb5fb78fd3
Move zero marker below control points to avoid common overlap scenario
2024-08-22 01:09:22 +09:00
Dean Herbert
843b10ef34
Add back incorrectly removed control point display toggle
2024-08-22 01:05:47 +09:00
OliBomby
423feadd64
Revert "add arrow indicator"
...
This reverts commit 1ce9e97fd4
.
2024-08-21 14:12:58 +02:00
Dean Herbert
fef56cc29e
Remove expanding behaviour of timeline completely
2024-08-21 16:57:52 +09:00
Dean Herbert
7e6490133d
Adjust visuals of tick display (and fine tune some other timeline elements)
2024-08-21 16:46:14 +09:00
Dean Herbert
1a48a6f654
Reduce size of hit objects on timeline
2024-08-21 16:46:13 +09:00
Dean Herbert
3065f808a7
Simplify timing point display on timeline
2024-08-21 16:46:13 +09:00
Dean Herbert
a0002943a1
Adjust centre marker visuals a bit
2024-08-21 16:46:12 +09:00
OliBomby
1ce9e97fd4
add arrow indicator
2024-08-20 23:38:38 +02:00
OliBomby
ae6d855f8d
Merge remote-tracking branch 'upstream/master' into doubleclick
2024-08-20 23:19:27 +02:00
Bartłomiej Dach
bb964e32fa
Fix crash on attempting to edit particular beatmaps
...
Closes https://github.com/ppy/osu/issues/29492 .
I'm not immediately sure why this happened, but some old locally
modified beatmaps in my local realm database have a `BeatDivisor` of 0
stored, which is then passed to
`BindableBeatDivisor.SetArbitraryDivisor()`, which then blows up.
To stop this from happening, just refuse to use values outside of a sane
range.
2024-08-20 13:51:58 +02:00
Bartłomiej Dach
c9f1ef5361
Fix incorrect bank set / sample addition logic
...
Closes https://github.com/ppy/osu/issues/29361 .
Typical case of a few early-returns gone wrong leading to `NodeSamples`
not being checked correctly.
2024-08-20 12:37:01 +02:00
Bartłomiej Dach
42675be6cf
Merge branch 'master' into additions
2024-08-19 11:13:43 +02:00
Andrei Zavatski
3cd5820b5b
Make PositionSnapGrid a BufferedContainer
2024-08-17 10:34:39 +03:00
OliBomby
2abcdd0064
Redesign sample bank toggles
2024-08-13 22:05:01 +02:00
Bartłomiej Dach
06c2952fe8
Merge branch 'master' into grids-3
2024-08-12 13:55:35 +02:00
Dean Herbert
8fdd94090b
Show object inspector values during placement
2024-08-09 18:02:37 +09:00
Dean Herbert
b5a19707d0
Merge branch 'master' into additions
2024-08-08 03:31:11 +09:00
Bartłomiej Dach
437812eebe
Merge pull request #29279 from normalid-awa/bugfix/editor/delete-operation-wont-close-the-menu
...
Close context menus when deselecting items in editor
2024-08-07 13:25:13 +02:00
Dan Balasescu
b91461e661
Refactor + CI fixes
2024-08-06 15:17:52 +09:00
jkh675
cb877b7675
Close the menu when selecting other object
2024-08-06 13:09:48 +08:00
jkh675
75c0c6a5f9
Make the OsuContextMenu
nullable in SelectionHandler
2024-08-05 16:32:49 +08:00
Dean Herbert
0557b9ab79
Allow placement deletion with middle mouse
...
This is in addition to Shift + Right-click.
I thik middle mouse feels more natural and is a good permanent solution
to this issue.
Note that this also *allows triggering the context menu from placement
mode*. Until now it's done nothing. This may be annoying to users with
muscle memory but I want to make the change and harvest feedback. I
think showing the context menu is more correct behaviour (although
arguably it should return to placement mode on dismiss?).
2024-08-05 14:25:09 +09:00
jkh675
b32d97b4c0
Remove decreapted property
2024-08-04 21:27:25 +08:00
jkh675
2145368d17
Merge EditorContextMenuContainer
into OsuContextMenuContainer
2024-08-04 21:00:43 +08:00
jkh675
7c83d6a883
Cleanup code
2024-08-04 19:56:41 +08:00
jkh675
3cc5466774
Refactor the code to follow IoC principle and more flexible
2024-08-04 19:39:06 +08:00
jkh675
27d6c4cecb
Implement on beatmap editor
2024-08-04 19:16:14 +08:00
jkh675
5c5fcd7e7e
Allow key event pass through selection handler
2024-08-04 19:11:21 +08:00
jkh675
83aeb27c73
Replace original menu container to the custom one
2024-08-04 19:08:31 +08:00
Dean Herbert
548fd9cbf9
Show breaks behind objects in timeline
...
Closes https://github.com/ppy/osu/issues/29227 .
2024-08-01 19:47:44 +09:00
Dean Herbert
2d52bab77b
Always show timing points in timeline when at the timing screen
...
Supersedes https://github.com/ppy/osu/pull/29196 .
2024-07-31 19:43:08 +09:00
Dean Herbert
e329427d6e
Apply nullability to Timeline
2024-07-31 19:28:32 +09:00
Salman Ahmed
621f4dfece
Enforce new line between X/Y coordinate in editor position inspector
2024-07-30 02:45:21 +03:00
Dean Herbert
4983e5f33e
Merge pull request #29039 from bdach/multiple-selection-sample-popover
...
Make sample popover change properties of all samples in multiple selection
2024-07-24 22:49:20 +09:00
Bartłomiej Dach
1ed7e4b075
Make sample popover change properties of all samples in multiple selection
...
Closes https://github.com/ppy/osu/issues/28916 .
The previous behaviour *may* have been intended, but it was honestly
quite baffling. This seems like a saner variant.
2024-07-24 12:15:12 +02:00
Dean Herbert
aed7ba9508
Change order of application to avoid bias to side with more room to drag
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2024-07-23 20:56:21 +09:00
Dean Herbert
cc4ed0ff3f
Use non-screen-space coordinates and add time-based drag ramping for better control
2024-07-23 18:59:22 +09:00
Bartłomiej Dach
38fc6f70f6
Add tolerance when drag-scrolling editor timeline
...
Closes https://github.com/ppy/osu/issues/28983 .
While the direct cause of this is most likely mouse confine in
full-screen, it shouldn't/can't really be disabled just for this,
and I also get this on linux in *windowed* mode.
In checking other apps, adding some tolerance to this sort of
drag-scroll behaviour seems like a sane UX improvement anyways.
2024-07-23 11:10:18 +02:00
Dean Herbert
d707e29ff7
Merge branch 'master' into beatmap-info-purge
2024-07-23 12:09:32 +09:00
Dean Herbert
c4de2bbb60
Ignore "too many ticks" in timeline (triggers in normal cases)
2024-07-19 19:57:47 +09:00
Bartłomiej Dach
4dd225fdc8
Fix compose blueprint container not unsubscribing from event
...
Closes https://github.com/ppy/osu/issues/28938 .
This is related to reloading the composer on timing point changes in
scrolling rulesets. The lack of unsubscription from this would cause
blueprints to be created for disposed composers via the
`hitObjectAdded()` flow.
The following line looks as if a sync load should be forced on a newly
created placement blueprint:
da4d37c4ad/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs (L364)
however, it is not the case if the parent
(`placementBlueprintContainer`) is disposed, which it would be in this
case. Therefore, the blueprint stays `NotLoaded` rather than `Ready`,
therefore it never receives its DI dependencies, therefore it dies on
an `EditorBeatmap` nullref.
2024-07-19 08:32:36 +02:00
Salman Ahmed
a570949459
Fix selection box initialy visible despite no items selected
2024-07-19 03:00:44 +03:00
OliBomby
ba501a8eb8
fix addition bank toggle can be switched off with selection
2024-07-16 11:30:52 +02:00
OliBomby
9f02a1f1bf
fix addition on node sample not working
2024-07-14 22:50:15 +02:00
OliBomby
df7a42a00e
fix placement samples
2024-07-14 22:33:23 +02:00
OliBomby
5e86a01e5e
allow hotkeys in sample point piece
2024-07-14 20:59:46 +02:00
OliBomby
952540024e
addition bank toggles in compose
2024-07-14 20:43:16 +02:00
Bartłomiej Dach
5e00995948
Merge branch 'master' into tooltips
2024-07-12 11:01:03 +02:00
Bartłomiej Dach
518dc17518
Merge pull request #28788 from bdach/timeline-redesign
...
Redesign editor timelines to address most frequent user complaints
2024-07-12 10:58:59 +02:00
Dean Herbert
4be5d056c5
Reduce opacity of centre marker slightly
2024-07-12 17:23:48 +09:00
Dean Herbert
d2cb07b157
Add a bit more padding between node overlays and hitobjects in timeline
2024-07-12 17:22:36 +09:00
Dean Herbert
2454722601
Add tooltips to summary timeline display
2024-07-12 16:39:41 +09:00
Dean Herbert
275e7aa451
Adjust timeline centre marker visuals and bring in front of ticks
2024-07-12 16:37:03 +09:00
Dean Herbert
ca2fc72959
Adjust timeline centre marker visuals and bring in front of ticks
2024-07-12 16:29:40 +09:00
Dean Herbert
f65ab6736d
Adjust breaks in timeline to be centered with waveform / hitobjects
2024-07-12 15:45:58 +09:00
Dean Herbert
2ad2ae0c16
Add slight offset for timeline BPM display to avoid overlaps
2024-07-12 14:34:01 +09:00
Dean Herbert
9a7a0cdb34
Adjust timeline ticks to add a bit more body back
2024-07-12 14:29:18 +09:00
Bartłomiej Dach
ccc4d288b2
Merge pull request #28821 from peppy/fix-editor-dim
...
Fix editor UI transparency being incorrectly opaque when hovering slider control points
2024-07-11 12:05:10 +02:00
Dean Herbert
95464ebf36
Merge branch 'master' into timeline-redesign
2024-07-11 18:38:17 +09:00
Dean Herbert
fe421edd8f
Fix editor UI transparency being incorrectly opaque when hovering slider control points
...
As mentioned at
https://github.com/ppy/osu/pull/28787#issuecomment-2221150025 .
2024-07-11 16:41:21 +09:00