Dean Herbert
1ab02b93b3
Merge branch 'master' into grids-4
2024-10-07 15:42:23 +09:00
Dean Herbert
5c826be652
Merge pull request #29860 from bdach/fix-nudging
...
Only allow seek to next/previous object via keybinding if there is no selection
2024-10-07 15:36:19 +09:00
OliBomby
48da758c39
contract sample point pieces based on smallest gap on the timeline
...
It finds the smallest distance between two sample point pieces on the alive timeline blueprints
2024-10-05 20:52:45 +02:00
Bartłomiej Dach
7816c41b94
Only transfer difficulty slider values on commit
...
Closes https://github.com/ppy/osu/issues/30112 .
2024-10-04 14:08:46 +02:00
Dean Herbert
4fc0aae486
Merge pull request #30108 from bdach/default-combo-colours-in-editor
...
Initialise colours section with default combo colours if none present
2024-10-04 18:57:25 +09:00
Bartłomiej Dach
61103cc712
Remove redundant initialiser
2024-10-04 11:18:09 +02:00
Bartłomiej Dach
7cd724f342
Move setup screen background preview to appropriate form control
...
See
https://discord.com/channels/188630481301012481/188630652340404224/1291361342971707463 .
2024-10-04 11:09:14 +02:00
Bartłomiej Dach
6e5a38c6c8
Initialise colours section with default combo colours if none present
...
Closes https://github.com/ppy/osu/issues/30100 .
2024-10-04 10:01:24 +02:00
Bartłomiej Dach
1bab2236fe
Ensure columns collapse into one correctly if no space
2024-10-03 15:01:23 +02:00
Bartłomiej Dach
99eb26b7d5
Redo the layout of sections based on discord feedback
...
See
https://discord.com/channels/188630481301012481/188630652340404224/1291358770064130140
and everything after.
2024-10-03 13:53:21 +02:00
Bartłomiej Dach
b15608343b
Replace setup screen controls with new "form" controls
2024-10-03 11:49:03 +02:00
OliBomby
f8397cccc7
Merge remote-tracking branch 'upstream/master' into grids-4
2024-10-01 15:43:54 +02:00
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
75745bd95f
Merge branch 'master' into move-already-placed-objects-when-adjusting-offset-bpm
2024-10-01 15:53:13 +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
b179e086c6
Merge remote-tracking branch 'upstream/master' into grids-4
2024-09-26 14:59:52 +02:00
Bartłomiej Dach
f16f419928
Merge pull request #29983 from bdach/directory-selector-redesign
...
Redesign directory & file selector
2024-09-26 14:14:22 +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
Bartłomiej Dach
7f8b64bb6d
Redesign directory & file selector (and update usages accordingly)
2024-09-24 14:54:48 +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
Bartłomiej Dach
7f71ef4547
Only allow seek to next/previous object via keybinding if there is no selection
2024-09-13 15:14:09 +02:00
Bartłomiej Dach
7ec2e0e866
Refactor layout code to be a bit less haphazard
...
Visually the same, functionally much saner.
2024-09-08 16:30:09 +02:00
Bartłomiej Dach
f5c5614eef
Resolve existing colour provider instead of re-caching own one
2024-09-08 16:29:53 +02:00
schiavoanto
2e6f17f253
Fixed wrong OverlayColourScheme
2024-09-08 16:04:10 +02:00
schiavoanto
cf23c6668c
Added background color to hide beatmap background
2024-09-08 15:59:23 +02:00
schiavoanto
2bc6547d49
Code quality fix: added type
2024-09-07 16:23:23 +02:00
schiavoanto
32de8e9b2d
Fixed ControlPointTable items being blocked by buttons
2024-09-07 16:15:00 +02:00
Bruno Heredia
3b81ad4cbf
Fix scroll speed slider defaulting to 0.01
2024-09-07 01:44:40 -03:00
Bartłomiej Dach
130802e480
Add hotkey hints to editor menus
2024-09-04 12:16:54 +02:00
Bartłomiej Dach
0c4f5bcdaa
Decouple editor main menu items from DrawableOsuMenuItem
...
It didn't ever really make sense for it to be sharing the implementation
details of that (e.g. colouring of primary/dangerous actions), and with
the hotkey display things got outright hacky, so I'm decoupling it
entirely.
2024-09-04 12:16:52 +02:00
Bartłomiej Dach
3acc5fe5a0
Integrate hotkey display into drawable menu items
2024-09-04 11:58:10 +02:00
Bartłomiej Dach
57f1259a33
Fix weirdness around spurious adjustments firing due to overloaded bindable
2024-09-02 10:49:31 +02:00
Bartłomiej Dach
3eaffbb70a
Make application of offset/BPM object adjustments more sane
2024-09-02 10:40:58 +02:00
Bartłomiej Dach
e61fd080c1
Retouch & document helper methods
2024-09-02 10:27:43 +02:00
Bartłomiej Dach
ca2dc702e6
Move helper class out to separate file
2024-09-02 09:52:00 +02:00
Bartłomiej Dach
d5ef32e46b
Merge branch 'master' into move-already-placed-objects-when-adjusting-offset-bpm
2024-09-02 09:21:42 +02:00
Andrei Zavatski
837fa1b8dc
Use FastCircle for kiai visualisation
2024-08-31 17:32:24 +03:00
Andrei Zavatski
501ea68a21
Merge branch 'master' into fast-circle
2024-08-31 17:31:30 +03:00
Dean Herbert
6b8b49e4f1
Simplify scroll speed point display code now that it only serves one purpose
2024-08-31 13:14:56 +09:00
Andrei Zavatski
225418dbb3
Rework kiai handling in summary timeline
2024-08-31 01:59:40 +03:00
Andrei Zavatski
f5a2b5ea03
Use FastCircle in demanding places in the editor
2024-08-30 17:45:26 +03: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
4e8fb0dcab
Merge branch 'master' into scroll-speed-std
2024-08-30 00:41:05 +09: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
OliBomby
71044a0766
fix difference in sample time calculation
2024-08-27 19:02:40 +02:00
OliBomby
2de5ecceb8
Merge remote-tracking branch 'upstream/master' into scroll-speed-std
2024-08-22 20:17:14 +02:00
OliBomby
ad8e7f1897
Fix scroll speed visualisation missing on start kiai effect points
...
They were being drawn far offscreen because the width of the kiai multiplied with the X coordinate of the scroll speed vis.
2024-08-22 20:17:09 +02:00
OliBomby
998b5fdc12
Add property EditorShowScrollSpeed to Ruleset
2024-08-22 19:53:34 +02:00
OliBomby
adbdb39e9f
move public member to top of file
2024-08-22 19:18:38 +02:00
OliBomby
0db068e423
allow repeating on seek actions
2024-08-22 19:15:53 +02:00
Bartłomiej Dach
df94c22a29
Merge pull request #29545 from peppy/timeline-redesign-in-circles
...
Further timeline usability tweaks
2024-08-22 08:39:34 +02:00
Bartłomiej Dach
d33f4837fa
Merge pull request #29532 from bdach/redesign-timing-table-tracking
...
Redesign timing table tracking
2024-08-22 08:21:39 +02:00
Dean Herbert
9df12e3d87
Move seek button to left to differentiate mutating operations
2024-08-22 14:15:36 +09:00
Dean Herbert
a943000579
Merge pull request #29435 from OliBomby/improve-snaps
...
Fix timeline snapping ignoring nearby timing points
2024-08-22 01:36:30 +09: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
Bartłomiej Dach
c4f08b42ab
Use colours to distinguish buttons better
2024-08-21 09:05:33 +02: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
Dean Herbert
a633fcdb49
Merge branch 'master' into redesign-timing-table-tracking
2024-08-20 19:16:03 +09:00
Bartłomiej Dach
f0ddb6daa4
Merge pull request #29445 from OliBomby/transparent-break
...
Make break periods in bottom timeline transparent
2024-08-20 11:46:02 +02:00
