Dean Herbert
3a50e0fb2f
Merge branch 'master' into add-last-edit-time
2023-06-06 15:07:20 +09:00
Bartłomiej Dach
c2d89a32a9
Adjust inline comment
2023-06-01 21:18:00 +02:00
Andrei Zavatski
03eb7c7830
Fix nullability
2023-06-01 21:21:01 +03:00
Andrei Zavatski
949fe32740
Use combined area of children as a mask instead
2023-06-01 15:32:17 +03:00
Dean Herbert
32207d4112
Remember the last used custom divisor when cycling divisor types
2023-06-01 17:11:49 +09:00
Dean Herbert
bcde2cbc73
Apply NRT to BeatDivisorControl
2023-06-01 16:58:14 +09:00
Dean Herbert
f52ed41f10
Use better defaults of 1/4 and 1/6 when cycling types
2023-06-01 16:28:03 +09:00
timiimit
a58426dab6
Use LastEditTime in Editor
2023-05-31 19:07:04 +02:00
Andrei Zavatski
d119447a10
Fix editor timeline hitobjects popping in
2023-05-30 16:41:42 +03:00
Dean Herbert
725734bc03
Merge pull request #23649 from peppy/keep-selection-buttons-on-screen
...
Ensure editor selection buttons remain on screen when selection is near edge
2023-05-26 20:51:45 +09:00
Bartłomiej Dach
96fe7cbe54
Merge branch 'master' into sample-set-controls
2023-05-25 21:58:16 +02:00
Bartłomiej Dach
7d8f08c0ea
Fix ComposeBlueprintContainer briefly assigning auto bank
...
Seems to have had no consequence due to the way
`AutomaticBankAssignment` works (that flag is checked in
`PlacementBlueprint.UpdateTimeAndPosition()`, which runs essentially
every frame), but let's avoid putting it there at all ever.
2023-05-25 21:49:29 +02:00
Bartłomiej Dach
3ad5f8b9c9
Polish a few extreme edge cases
2023-05-25 16:39:54 +02:00
Dean Herbert
949de35664
Ensure selection is reset after immediately deleting objects
...
Closes https://github.com/ppy/osu/issues/23518 .
2023-05-25 23:20:32 +09:00
Bartłomiej Dach
beeca5a8dd
Use alternative layouting implementation
2023-05-25 16:17:44 +02:00
Dean Herbert
1049257b56
Simplify SelectionHandler's DeselectAll implementation
...
We are already doing other operations in this class directly on `SelectedItems`, so might as well change this one to match
2023-05-25 18:46:31 +09:00
Dean Herbert
1e14b02493
Fix bindable feedback loop
2023-05-25 17:58:38 +09:00
Bartłomiej Dach
578a0e7494
Merge branch 'master' into beat-divisor-visual-improvements
2023-05-24 22:28:26 +02:00
Bartłomiej Dach
6ec4ecfdd7
Mention fallback default in GetDivisorForBeatIndex()
2023-05-24 22:17:51 +02:00
Dean Herbert
b14b1072c2
Allow deselecting any selection in the editor using the Back binding (escape key)
2023-05-24 19:24:14 +09:00
Dean Herbert
3b9e1e8a94
Ensure editor selection buttons remain on screen when selection is near edge
...
Addresses https://github.com/ppy/osu/discussions/23599 .
2023-05-24 19:16:53 +09:00
Dean Herbert
3a05dffa50
Add "auto" bank selection during placement
2023-05-24 17:11:12 +09:00
Dean Herbert
fc22c75464
Don't use switch for single case statement
2023-05-24 16:14:05 +09:00
Dean Herbert
a9ba16a2be
Update to support non-control-point sample changes
2023-05-24 14:20:38 +09:00
Dean Herbert
298989ffd2
Merge branch 'master' into sample-set-controls
2023-05-24 14:03:04 +09:00
Dean Herbert
561b759bf9
Tidy up implementation and ensure non-solid ticks start at zero alpha
2023-05-24 13:49:29 +09:00
Dean Herbert
8f1f1955df
Merge pull request #66 from Gyoshi/beat-divisor-visual-improvements
...
Add ghost ticks to exhibit current divisor on `BeatDivisorControl`
2023-05-24 13:41:48 +09:00
Gyoshi
7fe19d1992
Last instead of Max divisor to match code elsewhere
2023-05-23 18:45:49 +02:00
Gyoshi
c5ef3ae181
Code styling
2023-05-23 18:44:20 +02:00
Gyoshi
b5f8093941
Use RangePadding to align mouse with slider
2023-05-23 18:16:14 +02:00
Gyoshi
7b1e8ede54
Small format
2023-05-23 15:11:27 +02:00
Gyoshi
1b32370c6a
Remove duplicate code by making GetDivisorForBeatIndex method more general
2023-05-23 15:05:38 +02:00
Gyoshi
37a796306d
Small format & comment
2023-05-23 14:30:35 +02:00
Johannes vd Berg
ebda35c3c9
Add ghost ticks to exhibit current divisor on BeatDivisorControl
2023-05-23 12:57:25 +02:00
Bartłomiej Dach
38b4bd8aef
Fix undo not behaving as expected sometimes
2023-05-22 22:45:39 +02:00
Bartłomiej Dach
e0b7539c2a
Fix sample changes not being applied in patcher
2023-05-22 22:45:23 +02:00
Bartłomiej Dach
f253d17a7f
Fix slider velocity changes not being applied in patcher
2023-05-22 22:19:10 +02:00
Bartłomiej Dach
afdddb0195
Merge pull request #23582 from peppy/placement-blueprint-timeline-combo-fixes
...
Fix timeline blueprint display not showing correct combo number / colour during placement
2023-05-20 15:02:55 +02:00
Dean Herbert
214d7e07fa
Add TODO regarding failing stack display code
2023-05-17 17:52:17 +09:00
Dean Herbert
9563d4f730
Fix weird purple tint on placement object in timeline
2023-05-17 17:26:19 +09:00
Dean Herbert
87ff28b022
Update beat divisor control to show ticks in more visually correct locations
...
As proposed in https://github.com/ppy/osu/discussions/23527 .
2023-05-17 16:34:12 +09:00
Dean Herbert
dc51d5ecf3
Rename GetSampleInfo to better describe what method does
...
Also add full xmldoc
2023-05-17 14:07:48 +09:00
Dean Herbert
d9ae822966
Fix bank not correctly being assigned when adding sample additions in editor
2023-05-16 18:52:52 +09:00
Dean Herbert
70e248b927
Force placement of in-progress object when changing tools in the editor
2023-05-12 16:06:01 +09:00
Dean Herbert
bdf8a78b42
Add the ability to adjust the beatmap tick rate in the editor
2023-05-09 20:53:20 +09:00
Dean Herbert
2085833a84
Fix missing delegate unsubscribe
2023-05-09 17:08:03 +09:00
Dean Herbert
944da06c10
Rename slider multiplier variable back for now
2023-05-09 16:58:19 +09:00
Dean Herbert
8c44d528e9
Use min/max values from stable
2023-05-08 13:52:16 +09:00
Dean Herbert
a6cb1f90e4
Change difficulty popover inspector display (yet again)
...
I think this makes the most sense of the iterations I've tested so far, albeit maybe being a touch too verbose.
2023-05-08 13:43:23 +09:00
Dean Herbert
a91edd68d9
Show post-multiplied velocity in main hit object inspector
2023-05-08 13:42:25 +09:00
Dean Herbert
451af9d1b5
Fix beatmap values not being updated due to a varying data type
2023-05-08 13:23:13 +09:00
Dean Herbert
d9dd35c020
Show base velocity in slider adjustment popover
2023-05-08 13:13:09 +09:00
Dean Herbert
31de4de720
Remove median/mode slider velocity display
...
The intention was to give an idea of what the most common velocity of
the beatmap is, but in hindsight, because the "base" velocity is being
set elsewhere this doesn't make sense. It will/should be 1.0x.
Showing this range is still valuable, though.
2023-05-08 13:13:09 +09:00
Dean Herbert
b109ee74a6
Add "base velocity" adjustment to difficulty setup screen
2023-05-08 13:13:09 +09:00
Bartłomiej Dach
65b4b198a4
Merge branch 'master' into export
2023-05-06 20:12:53 +02:00
Bartłomiej Dach
e808a47811
Fix delegate leak
2023-05-05 20:33:27 +02:00
Bartłomiej Dach
f536238554
Use shorter copy
2023-05-05 20:30:50 +02:00
Dean Herbert
b7a287869a
Add display of beatmap slider velocity when adjusting
2023-05-05 15:57:38 +09:00
Dean Herbert
cc70d89bf9
Move editor inspector classes out of ruleset namespace
2023-05-05 15:57:38 +09:00
cdwcgt
4549a865d9
Merge branch 'master' into export
2023-05-04 00:18:01 +09:00
Dean Herbert
6b017ac05f
Merge pull request #23308 from OliBomby/sample-control-points
...
Remove SampleControlPoint and DifficultyControlPoint from HitObject
2023-05-03 14:21:51 +09:00
Dean Herbert
8a536c1cdb
Fix non-block namespace usage
2023-05-02 15:09:24 +09:00
OliBomby
1dc34ee25d
fix infinite repeat count when adjusting length of 0 length slider
2023-05-01 15:48:54 +02:00
OliBomby
608fa3cc73
Merge remote-tracking branch 'upstream/master' into sample-control-points
2023-04-30 19:47:03 +02:00
Cootz
607a04ae73
Fix the issue
2023-04-29 10:29:33 +09:00
OliBomby
c44f71a737
remove all regular usage of DifficultyControlPoint
2023-04-26 17:55:38 +02:00
OliBomby
87ca0f5335
Update SamplePointPiece.cs
2023-04-26 13:45:58 +02:00
OliBomby
e4b64bdc3e
clean up code stuff
2023-04-25 19:06:29 +02:00
OliBomby
755ad25dbe
clean code
2023-04-25 18:27:20 +02:00
OliBomby
c23a7b014e
add missing }
2023-04-25 18:17:07 +02:00
OliBomby
065464d90c
Fixed DifficultyPointPiece
2023-04-25 18:12:53 +02:00
Dean Herbert
9f4b1f0f24
Always round editor rotation to integer values
2023-04-20 14:30:01 +09:00
Bartłomiej Dach
73bd0feef5
Fix incorrectly implemented localisation
2023-04-10 15:03:33 +02:00
Bartłomiej Dach
6fec476147
Simplify snap implementation
2023-04-10 14:55:30 +02:00
cdwcgt
ce6a87b4a3
Merge remote-tracking branch 'upstream/master' into export
2023-04-09 15:02:47 +09:00
Dean Herbert
8d2e852ffd
Fix overbearing key down handling
2023-04-08 22:30:36 +09:00
Dean Herbert
a1fc4def1d
Remove redundant method override
2023-04-08 22:18:07 +09:00
Micha Lehmann
3c4a25e53f
Fix tooltip text not resetting when ending an editor rotation
2023-04-08 14:28:52 +02:00
Micha Lehmann
580d5745c0
Add "(snapped)" to the tooltip when snap-rotating in the editor
2023-04-08 14:15:49 +02:00
Dean Herbert
f72dd86b42
Fix code quality issues and avoid updating bindable twice per operation
2023-04-08 10:40:36 +09:00
Micha Lehmann
c827c2810b
Improve editor selection rotation value wrapping
...
This fixes two issues the previous algorithm had:
1. A half-turn rotation used to show up as -180°.
2. Rotating more than 180° in one drag event would overwhelm it
and cause the value to go outside its range.
This comes at the cost of a negligible performance hit,
since a division (modulo) is performed instead of just addition/subtraction.
2023-04-08 01:30:29 +02:00
Micha Lehmann
f1de560d57
Snap editor selection rotation when holding shift
2023-04-08 01:30:29 +02:00
Dean Herbert
e31a90e043
Don't cycle selection when more than one items are selected
2023-03-21 21:31:10 +09:00
Dean Herbert
1cf870d956
Add test coverage and fix fail case where a drag selection ends incorrectly with cyclic selection
2023-03-15 15:16:48 +09:00
Dean Herbert
6546f5968a
Merge branch 'master' into skin-editor-cyclic-selection
2023-03-14 20:43:56 +09:00
Dean Herbert
4f7be332f3
Revert isDraggingBlueprint to field
2023-03-08 19:24:03 +09:00
Dean Herbert
245c3c025c
Refactor endClickSelection to reduce nesting
2023-03-08 19:23:32 +09:00
Bartłomiej Dach
72695f7c90
Merge branch 'master' into omit-barline-in-timing-control-point
2023-03-07 22:46:24 +01:00
Dean Herbert
21bdbb20e6
Add optional support for cyclic selection to BlueprintContainer
2023-03-07 14:22:12 +09:00
mk56-spn
908651cc11
make ResetConfirmDialog properly utilise its parent's logic
...
Adjust name of `DeleteAction` to `DangerousAction`
2023-03-05 20:57:26 +01:00
Dean Herbert
6ff1fb6b1a
Adjust sizing to allow for timing point information now being longer than before
2023-03-02 18:57:54 +09:00
Dean Herbert
044b0604b2
Move OmitFirstBarLine to TimingControlPoint
2023-02-28 19:29:31 +09:00
mk56-spn
90227a6496
Rename DeleteConfirmationDialog.cs into DangerousActionDialog.cs
2023-02-27 21:57:59 +01:00
Bartłomiej Dach
1ba1298850
Merge branch 'master' into blueprint-improve-visuals
2023-02-19 15:55:30 +01:00
Bartłomiej Dach
d9ca7102f0
Use more generic wording for future-proofing
2023-02-19 15:06:40 +01:00
Maximilian Kruse
723a043c43
naming change from Hitobject to HitObject
2023-02-19 10:18:22 +01:00
Maximilian Kruse
ddd37bb319
Add setting to disable automatic seeking after object placement
2023-02-18 19:43:45 +01:00
cdwcgt
e84e011d5d
Merge branch 'master' into export
2023-02-17 22:15:19 +09:00
Dean Herbert
16d94b4ea2
Improve visuals of skin blueprint
2023-02-17 18:19:46 +09:00
Joseph Madamba
cb51b9e350
Use existing ModdingBeatmap activity
2023-02-12 15:01:50 -08:00
Joseph Madamba
bbeef53569
Add TestingBeatmap activity
2023-02-12 13:11:42 -08:00
Joseph Madamba
afb66d8af4
Make user activity class names more specific
2023-02-12 12:32:17 -08:00
Bartłomiej Dach
a3cc0d23b3
Fix typo in xmldoc
2023-02-11 16:26:32 +01:00
Dean Herbert
6d876fdb9a
Automatically select the closest timing point on entering the timing screen
2023-02-10 17:48:56 +09:00
Dean Herbert
03e623d1d2
Move ControlPointList to own file
2023-02-10 17:37:31 +09:00
Dean Herbert
e162fd56da
Change the way initial state saving works in EditorChangeHandler to be closer to first change
2023-02-07 16:22:51 +09:00
Dean Herbert
e4b17588f5
Add missing xmldoc to new methods in EditorChangeHandler
2023-02-06 14:11:40 +09:00
Dean Herbert
10ab4d572a
Merge branch 'master' into skin-editor-undo-support
2023-02-06 13:46:50 +09:00
Bartłomiej Dach
63f7d326c2
Merge branch 'master' into fix-editor-positional-nudge-undo
2023-02-03 21:31:05 +01:00
Dean Herbert
2cda277c09
Add a basic change handler to the skin editor
2023-02-03 18:57:50 +09:00
Dean Herbert
3345e34544
Move beatmap specific logic out of EditorChangeHandler
2023-02-03 17:53:54 +09:00
Dean Herbert
b437501b0f
Fix beatmap editor positional nudging not being undoable
2023-02-03 17:28:58 +09:00
Dean Herbert
554f14151c
Apply NRT to EditorChangeHandler
2023-02-03 17:13:24 +09:00
Dean Herbert
b19047b90b
Fix skin editor component list having uneven padding
2023-02-03 16:55:51 +09:00
Bartłomiej Dach
7483967157
Merge branch 'master' into SliderEnd-Snap
2023-01-23 21:33:16 +01:00
Bartłomiej Dach
1f40b2daf6
Clean up xmldocs
2023-01-23 21:22:18 +01:00
Wleter
f8d8a627b8
change property name
2023-01-18 22:00:39 +01:00
Wleter
40e99069fc
fix typos and newlines
2023-01-18 21:43:09 +01:00
Wleter
ab78dd0436
add collection of selection points.
2023-01-18 21:34:23 +01:00
Wleter
c9375c056e
revert back name change
2023-01-18 15:54:24 +01:00
Dean Herbert
ecb4727aec
Fix formatting issues
2023-01-18 17:33:14 +09:00
Wleter
788033e1b8
fix unnecessary newline
2023-01-17 21:13:54 +01:00
Wleter
b8e6a2d87b
filter currentEndPointPositions
2023-01-17 20:41:49 +01:00
ansel
00acea59fc
Move some strings to common
2023-01-15 19:37:40 +03:00
ansel
5d2e09137c
Remove text padding in editor menu for now
2023-01-15 14:40:53 +03:00
ansel
8777d5349b
Use existing strings
2023-01-15 14:39:34 +03:00
ansel
87650044bb
Localise create/save dialog
2023-01-15 01:50:47 +03:00
ansel
78e562903d
Localise part of editor
2023-01-15 01:50:47 +03:00
ansel
24df23f420
Localise background header
2023-01-15 01:49:19 +03:00
ansel
76eefc7573
Add support for localisation where it was missing
2023-01-15 01:46:11 +03:00
ekrctb
e610d19d55
Merge branch 'master' into 18469
2023-01-14 19:53:08 +09:00
ansel
f70dedfd17
Enable nullability for design screen
2023-01-14 02:24:48 +03:00
ansel
4b42240fba
Enable nullability for setup screen
2023-01-14 02:24:28 +03:00
ansel
78adaa9b03
Enable nullability for timing screen
2023-01-14 02:23:21 +03:00
Dylan Nantz
6028abff39
Code Quality
2023-01-13 10:16:52 -05:00
Dylan Nantz
5dd0aaccef
Merge branch 'master' of https://github.com/ppy/osu into 18469
2023-01-13 09:54:29 -05:00
Dylan Nantz
e38075c4ef
Use PlacementState to check juice stream placement
2023-01-13 09:37:23 -05:00
ansel
2365b065a4
Enable nullability for editor components
2023-01-12 18:07:54 +03:00
Wleter
98ffcd33c7
Merge branch 'ppy:master' into SliderEnd-Snap
2023-01-10 21:22:13 +01:00
Wleter
88060a3ea0
add snapping for slider's end
2023-01-10 21:21:09 +01:00
Bartłomiej Dach
e08b7c615b
Merge branch 'master' into wcd-length-fix
2023-01-08 19:44:12 +01:00
Bartłomiej Dach
9fd305a970
Merge branch 'master' into editor-bg-refresh
2023-01-08 18:57:04 +01:00
ansel
aaeb43fbb2
Return older file if new one is null
2023-01-07 18:15:57 +03:00
Salman Ahmed
a65466bdac
Merge branch 'master' into previewTime
2023-01-07 15:07:09 +03:00
Salman Ahmed
abca13eb6c
Rewrite visualisation piece to bind once and without potential event leak
2023-01-07 14:40:15 +03:00
Salman Ahmed
904c76e437
Use sane BeatmapInfo for preview time mutation
...
`EditorBeatmap.BeatmapInfo` is usually the correct instance for mutating
properties that should persist in the database.
2023-01-07 14:23:36 +03:00
ansel
b47cef838c
Nullability
2023-01-07 03:08:02 +03:00
ansel
167ac8b5dd
Fix editor object being requered
2023-01-07 03:03:52 +03:00
ansel
9364c7775d
Refresh background on file change in editor
2023-01-06 19:26:30 +03:00
ansel
e90c698e62
Fix WCD does not take into account start time of control points
2023-01-06 16:35:39 +03:00
