1305 Commits

Author	SHA1	Message	Date
Bartłomiej Dach	1d7be6a604	Merge branch 'master' into android-multiple-import-support-suppot	2021-01-16 23:13:11 +01:00
Dean Herbert	d6e6b4bbee	Revert forced cloning of ControlPointInfo ... This reverts commit 3c3e860dbc. Closes https://github.com/ppy/osu/issues/11491.	2021-01-15 17:34:59 +09:00
Dean Herbert	831c06a3c7	Expose and consume boolean covering whether an ongoing smooth seek is running	2021-01-15 16:14:38 +09:00
Dean Herbert	04fa32bc34	Rename and add xmldoc for smooth seeking method	2021-01-15 16:14:21 +09:00
Dean Herbert	ed78be825f	Fix editor timeline not snapping on non-precise wheel scroll ... For wheel input with precision, we still prefer exact tracking for now. May change this in the future based on feedback from mappers, but it makes little sense to do non-snapped scrolling when input is coming from a non-precise source.	2021-01-15 15:47:42 +09:00
smoogipoo	c6e9a6cd5a	Make most common BPM more accurate	2021-01-15 14:28:49 +09:00
Dean Herbert	2cfd1e8b47	Merge branch 'master' into fix-control-point-pollution	2021-01-08 00:02:45 +09:00
Dean Herbert	3c3e860dbc	Move ControlPointInfo copying to base Beatmap.Clone method (and remove setter)	2021-01-07 23:52:04 +09:00
Dean Herbert	77b55212a3	Change access of beatmap to use working for consistency in file	2021-01-07 19:11:51 +09:00
Dean Herbert	42643fbaf6	Use already resolved EditorBeatmap rather than resolving a second time locally	2021-01-07 19:10:19 +09:00
Dean Herbert	b3f08b29ca	Ensure that all changes to screen backgrounds are on the correct thread	2021-01-05 15:22:50 +09:00
Dean Herbert	6b8e1913ee	Fix dependency not always available due to nested LoadComponentAsync call	2021-01-05 13:27:45 +09:00
Dean Herbert	b7dd54847f	Move resolved usage of WorkingBeatmap in editor components as local as possible to avoid misuse	2021-01-04 16:56:37 +09:00
Dean Herbert	7fdf876b4c	Fix editor timing screen mutating the WorkingBeatmap instead of EditorBeatmap	2021-01-04 16:38:15 +09:00
Dean Herbert	b4a779108e	Ensure working beatmap is reloaded on exiting the editor	2021-01-04 16:37:49 +09:00
Dean Herbert	ba4e411422	Clone and copy ControlPointInfo when retrieving a playable beatmap	2021-01-04 16:37:07 +09:00
Lucas A	7ae4979882	Fix merge conflicts.	2020-12-27 13:52:45 +01:00
Dean Herbert	9de42f8646	Merge pull request #11238 from peppy/editor-timeline-selection-ux ... Improve drag and selection UX on editor timeline	2020-12-22 12:58:24 +09:00
Dean Herbert	423c6158e1	Highlight timeline drag area when hovered for better visibility	2020-12-21 18:10:11 +09:00
Dean Herbert	d1be7c23d9	Increase height of timeline drag area	2020-12-21 18:09:56 +09:00
Dean Herbert	d11d754715	Increase size of circle display on timeline	2020-12-21 18:09:37 +09:00
Dean Herbert	83f1350d7d	Fix editor background not being correctly cleaned up on forced exit ... Closes #11214. Should be pretty obvious why.	2020-12-21 17:49:11 +09:00
Bartłomiej Dach	f1878eff63	Use yet another solution leveraging padding	2020-12-18 23:45:42 +01:00
Graham Johnson	122250f454	replace drag cirle function with dictionary	2020-12-18 10:45:23 -05:00
Dean Herbert	9079d33412	X before Y for sanity	2020-12-18 11:20:21 +09:00
Dean Herbert	44f4ed4fd3	Fix spacing	2020-12-18 11:19:40 +09:00
Graham Johnson	a0235a06e6	update comment	2020-12-17 19:40:21 -05:00
Graham Johnson	a01ed1827a	Align the drag circles on the selction box in the editor to be on the center of the border	2020-12-17 19:34:16 -05:00
Lucas A	5d7294451f	Refactor Import() overload to take a list of import tasks instead.	2020-12-16 14:28:16 +01:00
Graham Johnson	7d2b77cdbd	improve selection box rotation UX	2020-12-13 07:58:58 -05:00
Dean Herbert	eb38bc4b4c	Add the ability to import into ArchiveModelManagers from a stream	2020-12-07 18:09:18 +09:00
Dan Balasescu	297283491a	Merge pull request #11031 from peppy/editor-fix-beat-snapping-new-beatmap ... Fix editor beat snapping not working correctly when starting with a new beatmap	2020-12-02 15:17:09 +09:00
Dean Herbert	71a121389b	Merge pull request #11033 from smoogipoo/immutable-hit-samples ... Make HitSampleInfo immutable	2020-12-02 14:44:26 +09:00
Dean Herbert	d6e0dc2216	Merge branch 'master' into editor-fix-beat-snapping-new-beatmap	2020-12-02 14:37:00 +09:00
Dean Herbert	e84dab8589	Move new beatmap construction above beat divisor binding	2020-12-02 14:36:52 +09:00
Dan Balasescu	878ded4dd6	Merge pull request #11032 from peppy/editor-fix-ticks-updating-after-timing-change ... Fix timeline not updating ticks correctly after arbitrary timing control point changes	2020-12-02 10:58:44 +09:00
Pennek	477de1bab0	change min/max values	2020-12-02 01:11:24 +01:00
Bartłomiej Dach	94a8784e04	Allow editor change handler to be null	2020-12-01 20:08:31 +01:00
Dean Herbert	190c6ef45e	Fix timeline not updating ticks correctly after arbitrary timing control point changes	2020-12-01 16:44:08 +09:00
Dean Herbert	2b268ee012	Fix editor beat snapping not working correctly when starting with a new beatmap	2020-12-01 16:16:26 +09:00
smoogipoo	5760e1c1fc	Make HitSampleInfo immutable	2020-12-01 15:37:51 +09:00
Dean Herbert	c17d67bc7d	Merge branch 'master' into editor-beat-snap-always	2020-11-30 18:34:38 +09:00
Dan Balasescu	5a276f8577	Merge branch 'master' into fix-editor-reapply-same-state-change	2020-11-30 13:34:03 +09:00
Dean Herbert	7e34c5e239	Fix state application always checking newest state for early abort, rather than current	2020-11-27 16:57:11 +09:00
Dean Herbert	7edbba58f7	Avoid updating hitobjects unnecessarily for start time changes ... This was firing regardless of whether the start time was changed, such as where beat snap provided the same time the object already has. The case where a change actually occurs is already handled by EditorBeatmap (see `startTimeBindables`), so it turns out this local handling is not required at all.	2020-11-27 16:31:06 +09:00
Dean Herbert	741902f1b3	Merge pull request #10971 from smoogipoo/fix-timeline-combo-colour ... Fix timeline blueprints sometimes not receiving combo colours	2020-11-26 19:47:21 +09:00
Dean Herbert	da6bccc812	Apply beat snap if positional snap doesn't give a time result	2020-11-26 19:20:51 +09:00
Dean Herbert	91592cf32d	Expose EditorClock for consumption	2020-11-26 19:20:39 +09:00
Dean Herbert	9811c46e35	Rename application method to better describe what it actually does	2020-11-26 19:16:18 +09:00
smoogipoo	e53f849aa0	Completely separate combo colours from DHOs	2020-11-26 18:14:25 +09:00
smoogipoo	f562854feb	Fix timeline objects sometimes not receiving combo colours	2020-11-26 17:22:22 +09:00
Dan Balasescu	aad6cf4ad3	Merge branch 'master' into editor-multiple-object-positional-snap	2020-11-26 17:06:47 +09:00
Dean Herbert	0ddeff648d	Fix incorrect index lookup on non-ordered selections	2020-11-25 17:25:54 +09:00
Dean Herbert	d4c6d6275e	Fix volume not being adjustable in the editor using alt-scroll ... We do this in other places so I think it's fine to handle like this for now (until we come up with a better global solution). Closes #10958.	2020-11-25 16:46:22 +09:00
Dean Herbert	c9a41f9dae	Make all objects in selection candidates for spatial snapping ... Closes #10898.	2020-11-24 17:35:54 +09:00
Dean Herbert	bd1dad5477	Remove null allowance for now	2020-11-24 15:54:27 +09:00
Dean Herbert	3ed7868801	Scroll editor setup screen to file selector on display ... Previously the file selector would potentially display off-screen, making for confusing UX. Closes #10942.	2020-11-23 13:49:14 +09:00
Bartłomiej Dach	6356b2dde9	Prevent editor from crashing for rulesets with no compose screen implementation	2020-11-19 22:11:52 +01:00
smoogipoo	f00c23b4a0	Add comment + xmldoc	2020-11-18 13:37:15 +09:00
smoogipoo	783c172b5d	Make sealed and cleanup comparator	2020-11-18 13:33:22 +09:00
smoogipoo	58c8184ad7	Define blueprint order similarly to hitobjects	2020-11-17 22:56:31 +09:00
Dean Herbert	7b79b9b9c1	Merge branch 'master' into fix-quick-delete-crash	2020-11-16 13:54:54 +09:00
Bartłomiej Dach	399a1a16a0	Refactor beginClickSelection in a slightly different way	2020-11-15 21:06:47 +01:00
kamp	1db303b159	Revert beginClickSelection logic	2020-11-15 16:54:48 +01:00
Bartłomiej Dach	8a78d408db	Add more missed null checks	2020-11-14 15:52:12 +01:00
Bartłomiej Dach	610ed99ae3	Add null checks to unguarded resolved-as-null fields	2020-11-14 14:52:58 +01:00
kamp	4d2bc790fd	Fix crash on shift+right-click deleting objects	2020-11-14 13:20:16 +01:00
smoogipoo	0219aff7bc	Add timeline visible range adjustment	2020-11-13 17:10:29 +09:00
smoogipoo	3957697c48	Add pooling support to the editor	2020-11-13 17:08:20 +09:00
smoogipoo	4ef2e9548c	Pass HitObjectComposer to BlueprintContainer via ctor	2020-11-13 16:59:37 +09:00
Bartłomiej Dach	546249b071	Temporarily fix crash on deleting control point groups	2020-11-10 21:32:47 +01:00
Dean Herbert	de6fcd1792	Fix BlueprintContainer triggering assert when left and right mouse button are pressed together	2020-11-10 17:16:28 +09:00
Dean Herbert	a012105dac	Fix editor quick delete being triggerable from left mouse button ... Closes https://github.com/ppy/osu/issues/10629.	2020-11-10 16:54:37 +09:00
Dan Balasescu	a2877fb00a	Merge pull request #10730 from peppy/fix-patcher-no-object-crash ... Fix legacy patcher crash on no objects present	2020-11-09 18:51:00 +09:00
Bartłomiej Dach	ddbd6df24d	Unbind bindable lists for general safety	2020-11-07 20:59:57 +01:00
Bartłomiej Dach	e078b78dcc	Ensure callbacks don't fire when restoring default beatmap	2020-11-07 20:59:57 +01:00
Dean Herbert	b0052210b6	Add asserts of HitObjects indices	2020-11-08 00:18:38 +09:00
Dan Balasescu	ea2fd831ab	Merge branch 'master' into editor-slider-control-point-quick-delete	2020-11-05 00:38:42 +09:00
Dean Herbert	d19b799f44	Invert boolean logic	2020-11-04 17:53:03 +09:00
Dan Balasescu	3322c2bbc5	Merge branch 'master' into ios-editor-crash-fix	2020-11-04 15:56:40 +09:00
Dean Herbert	487a5ecdba	Replace all usage of IBindableList.GetBoundCopy	2020-11-04 15:29:14 +09:00
Dan Balasescu	42c543f5b9	Merge branch 'master' into fix-editor-play-after-drag	2020-11-04 14:45:20 +09:00
Bartłomiej Dach	3bb86ce127	Merge branch 'master' into editor-waveform-opacity	2020-11-03 23:04:19 +01:00
Bartłomiej Dach	13f729916a	Merge branch 'master' into editor-timeline-scroll-mousewheel	2020-11-03 22:27:35 +01:00
Bartłomiej Dach	ddf0d75c38	Don't fall through to seek if handling zoom	2020-11-03 21:49:21 +01:00
Bartłomiej Dach	4b528e80d0	Use AltPressed shorthand	2020-11-03 21:49:04 +01:00
Bartłomiej Dach	18428dff8e	Ensure hotkey actions are executable in handler	2020-11-03 18:01:12 +01:00
Dean Herbert	83c004bbde	Add key bindings for flip and reverse patterns	2020-11-03 21:10:31 +09:00
Dean Herbert	9f333ac58a	Add the ability to delete slider control points using shift+right click ... Closes https://github.com/ppy/osu/issues/10672. In two minds about how this should be implemented but went in this direction initially. The other way would be to add local handling of Shift-Right Click inside PathControlPointPiece (which is already doing mouse handling itself).	2020-11-03 20:46:33 +09:00
Dean Herbert	c2ffc18379	Change editor timeline mouse wheel handling to scroll by default (and zoom with alt held)	2020-11-03 16:30:11 +09:00
Dean Herbert	0dcb4ea441	Add handling of opacity to timeline waveform display	2020-11-03 16:07:01 +09:00
Dean Herbert	7e4314684b	Add editor waveform opacity selection to menu	2020-11-03 16:01:14 +09:00
Dean Herbert	6bf35d5767	Fix editor menu not supporting stateful item drawables	2020-11-03 16:00:07 +09:00
Dean Herbert	34aa59f237	Fix editor clock not always remaining stopped when dragging timeline ... Closes https://github.com/ppy/osu/issues/10461.	2020-11-03 15:00:01 +09:00
Dean Herbert	ab308d28d2	Debounce calls to UpdateTernaryStates ... Just something I noticed in passing recently which may help with reducing performance overhead of some batch operations.	2020-11-03 01:08:36 +09:00
smoogipoo	3956a0669a	Fix editor seek transform seeking too much	2020-11-02 21:08:58 +09:00
Dan Balasescu	8a768669ad	Merge pull request #10606 from FamousPig/fix-timeline-drag-select-weirdness ... Fix timeline zoom during drag-select causing unexpected behaviour	2020-11-02 13:04:26 +09:00
Dan Balasescu	5ae3da9399	Merge branch 'master' into fix-timeline-drag-select-weirdness	2020-11-02 11:18:37 +09:00
Bartłomiej Dach	432282e8de	Use alternative solution to avoid storing last zoom	2020-11-01 21:25:05 +01:00
Dean Herbert	1f8d627af4	Merge branch 'master' into shift-delete-all-selected	2020-11-01 23:03:01 +09:00
Bartłomiej Dach	007c27d3ff	Schedule visibility update once per frame	2020-10-31 14:45:11 +01:00
Bartłomiej Dach	d74c19e2d7	Shorten show/hide code	2020-10-31 13:54:02 +01:00
Bartłomiej Dach	3322b8a7ea	Run OnSelectionChanged() on each change	2020-10-31 13:54:02 +01:00
Bartłomiej Dach	003994ab75	Bind UpdateVisibility() directly to source of truth	2020-10-31 13:54:02 +01:00
Bartłomiej Dach	129b1bc6d3	Delete all selected objects if shift-clicked on one	2020-10-31 11:46:25 +01:00
Dan Balasescu	8ccc3c2ec8	Merge pull request #10596 from charlie-gray/right-click-circle-delete ... Add support for deleting objects when Shift is held down	2020-10-29 11:37:22 +09:00
Bartłomiej Dach	a1696942f0	Merge branch 'master' into right-click-circle-delete	2020-10-28 22:12:14 +01:00
Bartłomiej Dach	202fe09306	Group selection actions back up in SelectionHandler	2020-10-28 22:06:48 +01:00
Dean Herbert	351acce698	Merge branch 'master' into fix-editor-bindable-crash	2020-10-28 13:34:54 +09:00
Dean Herbert	01b576c861	Fix editor crash on exit when forcing exit twice in a row	2020-10-28 13:32:39 +09:00
Leon Gebler	0ddf840a63	Merge branch 'master' into fix-timeline-drag-select-weirdness	2020-10-27 15:31:55 +01:00
Leon Gebler	983a2774e8	Code Formatting	2020-10-27 15:09:10 +01:00
Leon Gebler	064c50c3ac	Expose currentZoom to fix selection box wiggle	2020-10-27 14:38:35 +01:00
Dan Balasescu	26a7545534	Merge branch 'master' into fix-editor-samples-not-pausing-screen-swap	2020-10-27 21:29:16 +09:00
Dean Herbert	e0ad005cc1	Move editor sample disabling logic to editor class (and support screen switching)	2020-10-27 14:33:44 +09:00
Dean Herbert	3c2e2f29bc	Remove unused using statement	2020-10-27 13:17:44 +09:00
Dean Herbert	27c1a4c4d3	Move right-click deletion logic to be handled at a SelectionBlueprint level	2020-10-27 12:53:54 +09:00
Dean Herbert	e1f578c590	Change editor timing screen seek behaviour to only occur on clicking table rows ... Previously it would react to any selection changed event, which could in lude time changes (which is done by removing then adding the ControlPointGroup). Closes #10590.	2020-10-27 12:28:12 +09:00
Bartłomiej Dach	3f8c4c57d0	Fix code style issues & restructure	2020-10-26 22:16:28 +01:00
Charlie	255bb9d100	fixed issue with returns	2020-10-26 14:52:59 -05:00
Charlie	ccaf6560ec	formatting	2020-10-26 14:30:37 -05:00
Charlie	1239670566	moved right click shift delete functionality to HandleSelectionRequested + reduced func size	2020-10-26 14:28:53 -05:00
Charlie	ead3c19567	added function so circle is deleted when shift+right click	2020-10-26 13:40:42 -05:00
Leon Gebler	704f8cc4f2	Fix selection box wandering off into the distance	2020-10-26 18:45:03 +01:00
Dean Herbert	8273715bde	Merge pull request #9484 from FlashyReese/visible-playfield-boundary	2020-10-20 19:43:41 +09:00
Dean Herbert	22bde43106	Merge branch 'master' into visible-playfield-boundary	2020-10-19 18:05:28 +09:00
Dean Herbert	79a17b2371	Reapply waveform colour fix	2020-10-19 16:57:08 +09:00
Dan Balasescu	829241a9f0	Merge pull request #10521 from peppy/fix-editor-seek-interval-when-playing ... Fix editor not seeking by full beat when track is playing	2020-10-16 13:55:03 +09:00
Dean Herbert	aea31d1582	Fix editor not seeking by full beat when track is playing ... This is expected behaviour as my osu-stable, and I still stand behind the reasoning behind it. Closes #10519.	2020-10-16 13:07:00 +09:00
Dean Herbert	88f74921fb	Update with new r# inspections	2020-10-16 12:49:39 +09:00
Dean Herbert	b0f8a7794a	Make SelectionHandler require EditorBeatmap presence	2020-10-09 21:44:10 +09:00
Dean Herbert	681e88af40	Merge branch 'master' into editor-fix-button-states-after-paste	2020-10-09 20:51:09 +09:00
Dan Balasescu	ecfb7e94c5	Merge branch 'master' into fix-editor-batch-handling	2020-10-09 20:06:06 +09:00
Dan Balasescu	07f19342d1	Merge pull request #10428 from peppy/editor-reset-newcombo-on-placement ... Reset new combo button state after successful placement	2020-10-09 19:48:47 +09:00
Dan Balasescu	bcc096ee49	Merge pull request #10446 from peppy/fix-timeline-tick-bar-lines ... Fix bar lines ("down beat" as people call it) showing up too often in timeline	2020-10-09 19:24:29 +09:00
Dan Balasescu	62690e4873	Merge pull request #10432 from peppy/editor-reverse-pattern ... Add "reverse pattern" support to editor selection handler	2020-10-09 19:19:24 +09:00
Dean Herbert	3838f405dd	Fix missed usages	2020-10-09 18:50:05 +09:00
Dean Herbert	edaf6db5c6	Reference EditorBeatmap directly for selected objects	2020-10-09 18:44:23 +09:00
Dean Herbert	21c6242f90	Fix bar lines ("down beat" as people call it) showing up too often in timeline	2020-10-09 18:35:44 +09:00
Dan Balasescu	a1226ccaa2	Merge pull request #10440 from peppy/fix-editor-song-after-exit ... Fix editor playing deleted beatmap's track on exit-without-save	2020-10-09 17:58:31 +09:00
Dean Herbert	5d888f687a	Account for the width of points so they don't suddenly appear at timeline edges	2020-10-09 16:49:51 +09:00
Dean Herbert	ceb1494c33	Only run regeneration when passing a new min/max tick boundary	2020-10-09 16:47:29 +09:00
Dean Herbert	017a8ce496	Only recalculate when display actually changes	2020-10-09 15:57:31 +09:00
Dean Herbert	9baf704942	Add local pooling to TimelineTickDisplay	2020-10-09 15:48:24 +09:00
Dean Herbert	68039cff40	Set beatmap to sane default on exiting editor	2020-10-09 13:12:48 +09:00
Dean Herbert	825e10ec8c	Add reverse handler button to selection box	2020-10-09 06:32:23 +09:00
Dean Herbert	eacc7dca9a	Fix SliderPath not handling Clear correctly	2020-10-09 06:31:59 +09:00
Dean Herbert	85b33fffd0	Fix incorrect comments	2020-10-09 05:14:44 +09:00
Dean Herbert	5966205037	Fix ternary button states not updating correctly after a paste operation	2020-10-09 04:31:45 +09:00
Dean Herbert	e7eda19b07	Reset new combo button state after successful placement	2020-10-09 03:31:01 +09:00