Bartłomiej Dach
a3ea36d2b2
Fix formatting
2024-06-28 09:45:45 +02:00
Bartłomiej Dach
7ac5bd4d37
Ensure past drawable objects also get their results populated in editor test play
2024-06-28 09:37:10 +02:00
Bartłomiej Dach
b36e0f0875
Merge branch 'master' into fix/editor-test-exit
2024-06-28 09:17:40 +02:00
Bartłomiej Dach
1b741dada3
Show distance in pixels to previous/next object in osu! hitobject inspector
2024-06-27 14:46:57 +02:00
Bartłomiej Dach
e35744118c
Merge pull request #28638 from OliBomby/beat-divisor
...
Fix editor not loading arbitrary beat divisors
2024-06-27 13:31:44 +02:00
OliBomby
29412bb29b
Fix editor setting arbitrary beat divisor
2024-06-27 12:22:00 +02:00
Dean Herbert
76a1f19233
Merge pull request #28613 from bdach/control-point-table-is-bad
...
Improve performance of editor tables
2024-06-27 18:22:56 +09:00
Bartłomiej Dach
9384cbcdd8
Fix scroll-into-view on control point table not working as it is supposed to
2024-06-27 09:46:35 +02:00
Bartłomiej Dach
a5aedded16
Remove commented code
2024-06-27 09:44:55 +02:00
Bartłomiej Dach
b1baa49459
Add note about implicit reliance on sort by start time
2024-06-27 07:56:57 +02:00
Bartłomiej Dach
ef952bcd65
Use GetLastObjectTime() for safety
...
Due to other circumstances this has no real effect, but may as well.
2024-06-27 07:48:06 +02:00
Dean Herbert
7ef7e5f163
Fix break generation not accounting for concurrent hitobjects correctly
2024-06-27 12:10:26 +09:00
Bartłomiej Dach
9dfd6cf9ef
Remove EditorTable
...
Begone, foul beast.
2024-06-26 10:40:02 +02:00
Bartłomiej Dach
b12db8fbe2
Rewrite IssueTable to use virtualised list
2024-06-26 10:40:02 +02:00
Bartłomiej Dach
5c2d446767
Rewrite ControlPointTable to use virtualised list
2024-06-26 10:40:02 +02:00
Bartłomiej Dach
2fda45cad4
Fix crashes when opening scale/rotation popovers during selection box operations
2024-06-25 15:20:59 +02:00
Bartłomiej Dach
fae6dcfffa
Remove manual breaks at the start/end of beatmap
...
This is the secondary cause of https://github.com/ppy/osu/issues/28577 ,
because you could do the following:
- Have a break autogenerate itself
- Adjust either end of it to make it mark itself as manually-adjusted
- Remove all objects before or after said break
to end up in a state wherein there are no objects before or after a
break.
The direct fix is still correct because it is still technically possible
to end up in a state wherein a break is before or after all objects
(obvious one is manual `.osu` editing), but this behaviour is also
undesirable for the autogeneration logic.
2024-06-25 12:49:17 +02:00
Bartłomiej Dach
03cdfd0660
Fix timeline break piece crashing on drag if there are no objects before start or after end
...
This fixes the direct cause of https://github.com/ppy/osu/issues/28577 .
2024-06-25 12:25:37 +02:00
Olivier Schipper
74399542d2
Use math instead of hardcoded constant values
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2024-06-20 17:27:15 +02:00
Dean Herbert
57774ae767
Merge branch 'master' into slider-anchor-type-switching
2024-06-20 19:01:22 +09:00
Dean Herbert
14104e57d4
Merge branch 'master' into timeline-drag-selection-crash
2024-06-20 15:16:10 +09:00
Dean Herbert
0eb533f2fd
Merge pull request #28444 from bdach/scrolling-ruleset-editor-reloads
...
Reload scrolling hitobject composer on control point changes
2024-06-20 15:15:26 +09:00
Dean Herbert
a718af8af5
Adjust break colours to match closer to stable
2024-06-19 22:02:10 +08:00
Bartłomiej Dach
617c1341d7
Make (Manual)BreakPeriod a class again
...
CodeFileSanity doesn't like records and it being a record wasn't doing
much anymore anyway.
2024-06-19 14:53:09 +02:00
Dean Herbert
00443403b6
Merge branch 'master' into break-autogeneration
2024-06-19 21:49:17 +09:00
Dean Herbert
32a7885f10
Merge pull request #28523 from bdach/break-display-and-adjustment
...
Display breaks on editor timeline & allow manually adjusting their duration
2024-06-19 21:48:54 +09:00
Dean Herbert
00a866b699
Change colour to match bottom timeline (and adjust tween sligthly)
2024-06-19 20:30:43 +08:00
Bartłomiej Dach
2d9c3fbed2
Remove no-longer-necessary null propagation
2024-06-19 11:21:57 +02:00
Bartłomiej Dach
7311a7ffd7
Purge manual breaks if they intersect with an actual hitobject
2024-06-19 10:51:37 +02:00
Bartłomiej Dach
7ed587b783
Fix summary timeline not reloading properly on break addition/removal
2024-06-19 10:26:01 +02:00
Bartłomiej Dach
58701b17f8
Add patcher support for breaks
2024-06-19 10:22:14 +02:00
Bartłomiej Dach
4022a8b06c
Implement automatic break period generation
2024-06-19 10:22:06 +02:00
Bartłomiej Dach
1f692f5fc7
Make BreakPeriod a struct
2024-06-19 09:01:33 +02:00
Bartłomiej Dach
6a6ccbc09f
Make list of breaks bindable
2024-06-19 07:44:03 +02:00
Bartłomiej Dach
8836b98070
Fix new inspection after framework bump
2024-06-18 18:32:58 +02:00
Bartłomiej Dach
5551bae7ce
Merge branch 'master' into navigate-to-timestamp
2024-06-18 18:32:33 +02:00
Bartłomiej Dach
f88f05717a
Fix bottom timeline break visualisations not updating
2024-06-18 15:54:34 +02:00
Bartłomiej Dach
814f1e552f
Implement ability to manually adjust breaks
2024-06-18 15:51:29 +02:00
Bartłomiej Dach
a9e662a2b6
Add break display to editor timeline
2024-06-18 14:55:59 +02:00
Bartłomiej Dach
e1827ac28d
Address review feedback
2024-06-18 13:07:18 +02:00
Bartłomiej Dach
1b4a3b0e2e
Change editor speed adjustment back to adjusting tempo
...
- Partially reverts https://github.com/ppy/osu/pull/12080
- Addresses https://github.com/ppy/osu/discussions/27830 ,
https://github.com/ppy/osu/discussions/23789 ,
https://github.com/ppy/osu/discussions/15368 , et al.
The important distinction here is that to prevent misuse when timing,
the control will revert to 1.0x speed and disable when moving to timing
screen, with a tooltip explaining why.
2024-06-18 09:46:00 +02:00
Bartłomiej Dach
310265c43f
Add slider placement binding description in tooltip
2024-06-18 08:16:25 +02:00
Bartłomiej Dach
659505f711
Adjust calls to GetContainingInputManager()
2024-06-18 07:41:19 +02:00
Bartłomiej Dach
8a4ae5d23d
Null-propagate all calls to GetContainingFocusManager()
2024-06-18 07:30:46 +02:00
Dean Herbert
316125d47a
Merge pull request #23443 from OliBomby/edit-nodesample
...
Make NodeSamples editable
2024-06-18 11:12:02 +09:00
Bartłomiej Dach
5652a558f9
Allow to jump to a specific timestamp via bottom bar in editor
...
Apparently this is a stable feature and is helpful for modding.
2024-06-17 17:07:55 +02:00
Bartłomiej Dach
7cfe8d8df2
Reduce editor opacity of several editor components when hovering over composer
...
Addresses https://github.com/ppy/osu/discussions/24384 .
2024-06-17 12:14:28 +02:00
Bartłomiej Dach
07f1994a13
Align beat snap control width with right toolbox
2024-06-17 11:47:37 +02:00
Bartłomiej Dach
f7910f774d
Remove redundant type spec
2024-06-17 10:54:52 +02:00
Bartłomiej Dach
03049d45bb
Remove stuff that looks bad after moving timeline toggle controls
2024-06-17 10:23:00 +02:00
Bartłomiej Dach
b42752c9f0
Move timeline toggle controls to "view" menu
2024-06-17 10:16:40 +02:00
Bartłomiej Dach
bdeea37a44
Commit active placement when starting drag selection via timeline
...
This was reported in https://github.com/ppy/osu/pull/28474 , albeit the
code changes proposed there did not fix the issue at all.
See 8b6385f7d0
2024-06-14 09:32:40 +02:00
Bartłomiej Dach
51c598627a
Move out section header component from editor
...
This sort of thing has been showing up on flyte designs more and more
so I want to start using it more over that rather ugly "overlined" text
that's there on multiplayer screens right now.
2024-06-12 11:43:40 +02:00
Dean Herbert
90481223dd
Merge pull request #28445 from bdach/mania-key-count-change-force-reload
...
Attempt full editor reload on key count change
2024-06-12 14:42:59 +09:00
Dan Balasescu
39b219bacc
Merge pull request #28441 from bdach/fix-editor-stacking-not-applying-immediately
...
Fix stack leniency not applying immediately after change
2024-06-12 12:24:28 +09:00
OliBomby
869cd40195
Fixed samples without additions contributing to common addition bank while not having an editable addition bank
2024-06-11 21:31:18 +02:00
OliBomby
12dd60736a
remove code already covered by updatePrimaryBankState
2024-06-11 21:20:42 +02:00
Bartłomiej Dach
922837dd3a
Reload scrolling composer on control point changes
2024-06-11 12:01:35 +02:00
Bartłomiej Dach
da53a11d3c
Attempt full editor reload on key count change
2024-06-11 11:31:49 +02:00
Bartłomiej Dach
3afe98612c
Add RestoreState() to IEditorChangeHandler
2024-06-11 11:31:30 +02:00
Bartłomiej Dach
25b2dfa601
Fix stack leniency not applying immediately after change
2024-06-10 14:34:22 +02:00
Bartłomiej Dach
7d5dc750e5
Use slightly lighter shade of pink for alternative colour
2024-06-10 12:04:52 +02:00
Bartłomiej Dach
0efa028e0a
Restructure popover updates to be more centralised
2024-06-10 11:55:51 +02:00
Bartłomiej Dach
1d6b7e9c9b
Refactor further to address code quality complaints
2024-06-10 10:30:30 +02:00
Bartłomiej Dach
e13e9abda9
Disallow running save-related operations concurrently
...
Closes https://github.com/ppy/osu/issues/25426 .
Different approach to prior ones, this just disables the relevant
actions when something related to save/export is going on. Still ends up
being convoluted because many things you wouldn't expect to touch save
do touch save, so it's not just a concern between export and save
specifically.
2024-06-07 08:13:51 +02:00
OliBomby
e873698221
Add some in-depth xmldoc to GetSamples
2024-06-06 14:57:25 +02:00
OliBomby
fcc8671cbd
undo useless change
2024-06-06 14:50:24 +02:00
OliBomby
71ce400359
Fix wasteful recreating of container
2024-06-06 14:48:17 +02:00
Bartłomiej Dach
7a8a37dae6
Use established constants
2024-06-06 13:42:31 +02:00
Bartłomiej Dach
86b13074a0
Merge branch 'master' into edit-nodesample
2024-06-06 13:42:25 +02:00
OliBomby
4f8c167cf9
clean up to match logic in CircularDistanceSnapGrid
2024-06-05 18:56:18 +02:00
OliBomby
d8994786f6
Merge remote-tracking branch 'upstream/master' into grids-2
2024-06-05 17:18:48 +02:00
Dean Herbert
212be6b9a7
Merge branch 'master' into grids-1
2024-06-05 15:20:04 +09:00
Bartłomiej Dach
ecfcf7a2c0
Add xmldoc mention about performance overhead of PerformOnSelection()
2024-06-04 10:36:30 +02:00
Bartłomiej Dach
f13ca28d5e
Fix performance overhead from ternary state bindable callbacks when selection is changing
...
Closes https://github.com/ppy/osu/issues/28369 .
The reporter of the issue was incorrect; it's not the beat snap grid
that is causing the problem, it's something far stupider than that.
When the current selection changes,
`EditorSelectionHandler.UpdateTernaryStates()` is supposed to update the
state of ternary bindables to reflect the reality of the current
selection. This in turn will fire bindable change callbacks for said
ternary toggles, which heavily use `EditorBeatmap.PerformOnSelection()`.
The thing about that method is that it will attempt to check whether any
changes were actually made to avoid producing empty undo states, *but*
to do this, it must *serialise out the entire beatmap to a stream* and
then *binary equality check that* to determine whether any changes were
actually made:
7b14c77e43/osu.Game/Screens/Edit/EditorChangeHandler.cs (L65-L69)
2024-06-04 10:32:12 +02:00
Bartłomiej Dach
4fcb902341
Merge branch 'master' into grids-1
2024-06-03 12:33:51 +02:00
Dean Herbert
fdb47f8dfa
Fix incorrect handling of nested objects when inside parent object's duration
2024-05-29 23:30:47 +09:00
Dean Herbert
126837fadd
Apply results rather than fake a replay frame
2024-05-29 23:28:37 +09:00
Dean Herbert
3b5b7b2f88
Fix the majority of cases where gameplay stil doesn't end due to judgement count mismatch
2024-05-29 22:57:17 +09:00
Dean Herbert
d2c86b0813
Avoid passing beatmap in from editor when it's already present
2024-05-29 21:32:55 +09:00
Dean Herbert
16e2fa2c6a
Merge branch 'master' into fix/editor-test-exit
2024-05-29 21:08:36 +09:00
Bartłomiej Dach
4c881b5633
Use better name if we're renaming
2024-05-29 09:40:29 +02:00
OliBomby
d143a697d2
refactor CanScaleFromPlayfieldOrigin and GetClampedScale to derived class
2024-05-28 17:12:16 +02:00
OliBomby
8eb23f8a60
remove redundant CanScaleFromSelectionOrigin
2024-05-28 16:19:57 +02:00
OliBomby
a89ba33b47
rename CanScaleSelectionOrigin/PlayfieldOrigin to make clear its not the origin being scaled
2024-05-28 16:14:16 +02:00
OliBomby
37530eebcc
Enable scale buttons at the correct times
2024-05-25 20:35:06 +02:00
OliBomby
4eeebdf60c
calculate max scale bounds for scale slider
2024-05-25 20:17:27 +02:00
OliBomby
497701950d
fix nitpick
2024-05-24 18:11:28 +02:00
Bartłomiej Dach
9f19ab092d
Merge branch 'master' into grids-1
2024-05-24 14:39:55 +02:00
Bartłomiej Dach
7255cc3344
Fix tests dying on a nullref
2024-05-24 11:25:29 +02:00
Bartłomiej Dach
807d982a72
Move workaround to subscreen
2024-05-24 10:35:33 +02:00
Bartłomiej Dach
a80dbba9d0
Update to not use obsoleted method
2024-05-24 10:35:31 +02:00
Bartłomiej Dach
4089071299
Merge branch 'master' into fix-editor-didnt-save
2024-05-24 10:16:46 +02:00
Bartłomiej Dach
8a2dd4d816
Merge branch 'master' into scaling
2024-05-23 15:10:40 +02:00
Bartłomiej Dach
128029e2af
Fix aspect ratio lock applying when shift pressed on a non-corner anchor
...
It doesn't make sense and it wasn't doing the right thing.
2024-05-23 15:08:43 +02:00
Bartłomiej Dach
9e86a08405
Simplify scale origin computation
2024-05-23 14:07:43 +02:00
Bartłomiej Dach
070668c96f
Use ShiftPressed instead of explicitly checking both physical keys
...
Not only is this simpler, but it also is more correct (for explanation
why, try holding both shift keys while dragging, and just releasing one
of them - the previous code would briefly turn aspect ratio off).
2024-05-23 13:57:34 +02:00
Dean Herbert
66ceda1d67
Update focus specifications in line with framework changes
2024-05-22 21:32:49 +08:00
Dean Herbert
d0b1ebff5a
Revert "Temporary rollback of framework / SDL3"
...
This reverts commit d7d569cf4e
2024-05-22 16:29:39 +08:00
Dean Herbert
d7d569cf4e
Temporary rollback of framework / SDL3
2024-05-21 14:36:16 +08:00
OliBomby
c4ac6d20a0
fix code quality
2024-05-15 23:40:51 +02:00
OliBomby
8df5f22b4e
Merge remote-tracking branch 'upstream/master' into scaling
2024-05-15 23:05:19 +02:00
Dan Balasescu
3b8b56cbcb
Apply required changes after framework masking updates
2024-05-09 20:18:53 +09:00
Dean Herbert
fd3f4a9e7b
Preserve storyboard events when saving a beatmap in the editor
...
Until we have full encoding support for storyboards, this stop-gap
measure ensures that storyboards don't just disappear from existence.
2024-04-30 00:01:56 +08:00
Dan Balasescu
52addc775e
Merge pull request #27965 from bdach/generic-math
...
Apply generic math-related changes
2024-04-26 01:33:54 +09:00
Bartłomiej Dach
19d006d818
Fix deleting modified difficulty via editor leaving user in broken state
...
Closes https://github.com/ppy/osu/issues/22783 .
If the difficulty being edited has unsaved changes, the editor exit flow
would prompt for save *after* the deletion method has run. This is
undesirable from a UX standpoint, and also leaves the user in a broken
state.
Thus, just fake an update of the last saved hash of the beatmap to fool
the editor into thinking that it's not dirty, so that the exit flow will
not show a save dialog.
2024-04-25 12:55:34 +02:00
Joseph Madamba
4f7c9f2970
Remove unused using
2024-04-24 01:00:03 -07:00
Joseph Madamba
f97c519451
Add chevron to distinguish all menus with submenus
2024-04-24 00:19:10 -07:00
Dean Herbert
436203a8c1
Add a chevron to distinguish editor menus with submenus
2024-04-23 21:37:01 +08:00
Bartłomiej Dach
09b0f3005e
Apply generic math-related changes
2024-04-22 10:15:56 +02:00
Andrei Zavatski
1d3fd65d86
Adjust execution order
2024-04-22 07:02:49 +03:00
Andrei Zavatski
722fa228ce
Don't consider editor table content for input
2024-04-21 17:40:35 +03:00
Salman Ahmed
9e69268676
Change editor screen selection logic to use SelectItem for sound feedback
2024-04-17 11:20:17 +03:00
Dean Herbert
aa7b357063
Merge pull request #27768 from 64ArthurAraujo/editor-fix-sliders-same-start-time-merge
...
Fix merging sliders with the same `StartTime` causing a Unhandled Exception
2024-04-03 01:45:55 +08:00
Arthur Araujo
2a2a372595
Check if blueprint is in SelectionBlueprints before changing its depth
2024-04-02 07:45:27 -03:00
Nguyên Minh Hồ
5d497ba4a8
Simplify TooltipText for EditorRadioButton
2024-03-30 16:04:22 +07:00
Nguyên Minh Hồ
9950395e5f
Merge branch 'fix-rotate-editor-button-disabled' of https://github.com/honguyenminh/osu into fix-rotate-editor-button-disabled
2024-03-30 13:57:44 +07:00
Nguyên Minh Hồ
113dbcd10f
Merge branch 'master' into fix-rotate-editor-button-disabled
2024-03-30 13:56:31 +07:00
Dean Herbert
fd509c82f5
Adjust code structure slightly
2024-03-20 12:52:54 +08:00
Andrei Zavatski
7ca45c75b3
Don't iterate backwards on children without a reason
2024-03-18 20:46:38 +03:00
Andrei Zavatski
0edc249637
Make Timeline non-nullable
2024-03-18 20:38:19 +03:00
Andrei Zavatski
57399e9899
Merge branch 'master' into editor-performance
2024-03-18 20:34:48 +03:00
Andrei Zavatski
34a5e2d606
Don't update subtree masking in TimelineTickDisplay
2024-03-16 15:20:37 +03:00
Andrei Zavatski
981ee54cdc
Fix transforms overhead in TimelineTickDisplay
2024-03-16 15:05:52 +03:00
Andrei Zavatski
e825db61ee
Fix enumerator allocation
2024-03-16 12:26:56 +03:00
Andrei Zavatski
ea3a9314f9
Improve TimelineControlPointDisplay performance
2024-03-16 11:57:18 +03:00
Andrei Zavatski
6ecef33fd7
Fic incorrect ExtendableCircle gradient
2024-03-10 22:45:29 +03:00
Andrei Zavatski
549a8d678e
Reduce allocations in ControlPointList
2024-03-09 20:50:54 +03:00
Dan Balasescu
ca92a31cf9
Fix missing event unbinds
2024-03-07 21:10:11 +09:00
Salman Ahmed
0fe139a189
Adjust editor screen switcher control design and behaviour
2024-03-07 08:20:46 +03:00
Dean Herbert
6455c0583b
Update usage of CircularProgress.Current
2024-03-06 12:13:10 +08:00
Dean Herbert
c6201ea5de
Remove unused ruleset parameter when testing beatmap in editor
2024-03-01 20:28:52 +08:00
Andrei Zavatski
eb0933c3a5
Fix allocations in EffectPointVisualisation
2024-02-29 20:35:20 +03:00
Bartłomiej Dach
f86b7f0702
Enable NRT in EditorBeatmapSkin
2024-02-23 14:52:44 +01:00
Bartłomiej Dach
d1d32fc16c
Fix editor displaying combo colours in effectively incorrect order
...
Addresses https://github.com/ppy/osu/discussions/27316 .
Stable lies about the first combo colour being first; in the `.osu`
file it is actually second. It does a thing in editor itself to correct
for this.
https://github.com/peppy/osu-stable-reference/blob/master/osu!/GameModes/Edit/Forms/SongSetup.cs#L233-L234
2024-02-23 14:49:46 +01:00
Andrei Zavatski
4cefa8bb8d
Reduce allocations in TimelineBlueprintContainer
2024-02-21 23:13:10 +03:00
Dean Herbert
9c40ff2911
Merge pull request #27278 from EVAST9919/grid-update
...
Apply padding to `GridContainer`s directly where possible
2024-02-21 17:29:21 +08:00
Andrei Zavatski
2543a48ac8
Apply padding to GridContainers directly
2024-02-20 23:18:37 +03:00
Andrei Zavatski
871bdb9cf7
Reduce string allocations in TimeInfoContainer
2024-02-20 20:31:18 +03:00
Andrei Zavatski
6678c4783b
Fix PlaybackControl string allocations
2024-02-20 19:31:28 +03:00
Berkan Diler
6adf0ac01e
Use new LINQ Order() instead of OrderBy() when possible
2024-02-08 18:01:00 +01:00
Dan Balasescu
b44f77cee1
Update R# + fix inspections
2024-02-02 21:00:28 +09:00
OliBomby
576d6ff799
Fix masking in circular snap grid
2024-02-01 17:07:57 +01:00
OliBomby
f807a3fd97
Remove Masking from PositionSnapGrid
...
This caused issues in rendering the outline of the grid because the outline was getting masked at some resolutions.
2024-02-01 16:57:45 +01:00
OliBomby
1428cbfbc3
Remove Masking from PositionSnapGrid
...
This caused issues in rendering the outline of the grid because the outline was getting masked at some resolutions.
2024-02-01 16:56:57 +01:00
Bartłomiej Dach
8a11ff1227
Apply local precision workaround to editor effect section
2024-01-29 11:52:38 +01:00
Dean Herbert
45f2980dc0
Fix potential editor data loss if exiting while a textbox is focused
2024-01-26 13:59:32 +09:00
OliBomby
c2d57dc77c
Merge remote-tracking branch 'upstream/master' into edit-nodesample
2024-01-25 11:33:29 +01:00
Mike Will
a264ac9f38
Change name and description of force parameter in SetArbitraryDivisor
2024-01-25 05:12:54 -05:00
Nguyên Minh Hồ
d5b70ed09a
Move CanRotatePlayfieldOrigin bindable to generic rotation handler
2024-01-25 16:58:44 +07:00
