1370 Commits

Author	SHA1	Message	Date
Dan Balasescu	f8c1dfe57f	Merge branch 'master' into editor-fix-speed-multiplier-precision	2021-03-31 17:17:25 +09:00
Dean Herbert	90c75a64cf	Fix legacy control point precision having an adverse effect on the editor	2021-03-30 15:24:11 +09:00
Dan Balasescu	d2ef0ba644	Merge branch 'master' into add-editor-nudging-support	2021-03-30 14:34:43 +09:00
Dan Balasescu	1bb9f018a0	Merge branch 'master' into fix-timeline-depth-ordering	2021-03-29 20:47:47 +09:00
Dan Balasescu	3cf6a3f56d	Merge pull request #12076 from peppy/add-timeline-stacking-support ... Implement editor timeline stacking support	2021-03-29 20:44:52 +09:00
Dean Herbert	690debe507	Merge pull request #12030 from LeNitrous/editor-platform-clipboard-copy	2021-03-29 19:31:16 +09:00
Dean Herbert	3909eda095	Avoid using a StringBuilder	2021-03-29 18:51:28 +09:00
Dean Herbert	90ab765cf5	Reorder methods and surround with region	2021-03-29 18:46:32 +09:00
Nathan Alo	cdb779f764	move copy logic inside ComposeScreen	2021-03-29 17:30:23 +08:00
Naxess	d58ef5310b	Add verify tab ... Currently empty, but works.	2021-03-28 17:36:22 +02:00
Nathan Alo	21398e25b5	null check composer and ensure the correct start time from selected hit objects	2021-03-27 10:02:21 +08:00
Nathan Alo	c96321206a	fix appveyor complaints	2021-03-26 16:17:24 +08:00
Nathan Alo	71a0616861	remove extra semi colons	2021-03-26 15:34:45 +08:00
Nathan Alo	374f8c5e22	move to compose namespace and add license header	2021-03-26 15:33:28 +08:00
Dean Herbert	cb48e5f158	Fix timeline not visually ordering hitobjects in a stable way	2021-03-26 16:33:18 +09:00
Nathan Alo	b8b7eb4c4b	refactor logic to its own component and handle hit object to string conversion to its ruleset-specific composers	2021-03-26 15:25:20 +08:00
Nathan Alo	2bea69456e	remove implementations	2021-03-26 15:24:33 +08:00
Dean Herbert	77969bb223	Merge branch 'master' into add-timeline-stacking-support	2021-03-26 16:17:10 +09:00
Dean Herbert	f6647de769	Add support for nudging objects in the editor using ctrl+arrow keys ... Closes #12042.	2021-03-25 19:56:28 +09:00
Dean Herbert	8d4ff867bf	Fix barlines showing up in the osu!mania editor's timeline	2021-03-25 16:30:31 +09:00
Dean Herbert	9fdd23b134	Fix various issues with stacking	2021-03-25 16:28:30 +09:00
Dean Herbert	bdc783b55f	Merge branch 'master' into add-timeline-stacking-support	2021-03-25 15:28:30 +09:00
Dean Herbert	7b3336783f	Stabilise ordering instead of simple reversing ... Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2021-03-25 15:24:59 +09:00
Bartłomiej Dach	dd48b68f8a	Ensure selected blueprints are given selection priority	2021-03-19 22:44:33 +01:00
Dean Herbert	71a361337d	Add comment regarding usage of Reverse() ... Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2021-03-19 21:57:48 +09:00
Dan Balasescu	e72205eea2	Merge pull request #12080 from peppy/add-25-playback-editor ... Change editor speed adjust to adjust frequency (and restore 25% option)	2021-03-19 21:04:12 +09:00
Dean Herbert	8955071703	Change editor speed adjust to adjust frequency	2021-03-19 20:01:45 +09:00
Dean Herbert	9be7981e0d	Adjust timeline ticks to be more visible	2021-03-19 19:45:00 +09:00
Dean Herbert	563a0584d5	Implement editor timeline stacking support	2021-03-19 18:48:51 +09:00
Dean Herbert	32c571fc94	Adjust keyboard step to be something sensible	2021-03-19 17:13:30 +09:00
Dean Herbert	711d895a04	Merge pull request #8238 from voidedWarranties/editor-song-end	2021-03-19 16:32:23 +09:00
voidedWarranties	b9761c8196	Further simplify logic	2021-03-18 16:20:31 -07:00
voidedWarranties	df6570ebf5	Improve logic and add previously failing test ... Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2021-03-17 15:48:55 -07:00
Bartłomiej Dach	2e63c2ce20	Fix selection box operation hotkeys not registering in change handler ... Could lead to crashes after reversing a note cluster and playing it back. The root cause of the crash was that the hotkey operations were not ran inside of an editor change handler operation. This, in turn, caused the autoplay replay to not be regenerated after flipping an object cluster, therefore finally manifesting as a hard crash due to negative time offsets appearing in judgement results, which interfered with the default implementation of note lock. Note that this incidentally also fixes the fact that selection box hotkey operations (reverse and flip) did not handle undo/redo.	2021-03-17 22:17:42 +01:00
Bartłomiej Dach	a691291ae8	Merge branch 'master' into editor-song-end	2021-03-17 18:18:19 +01:00
Dan Balasescu	5a7e416495	Merge pull request #12027 from peppy/new-beatmap-empty-fields ... Don't fill beatmap metadata with template values on creating a new beatmap	2021-03-17 19:36:21 +09:00
Nathan Alo	51e0304c54	properly format strings per ruleset	2021-03-17 18:31:09 +08:00
Nathan Alo	133ff085a5	refactor code	2021-03-17 18:06:40 +08:00
Nathan Alo	8046b5a818	set text to platform clipboard on copy	2021-03-17 17:35:49 +08:00
Dean Herbert	d0e61e5b4d	Put back the label	2021-03-17 17:14:04 +09:00
Dean Herbert	3b6a1180b6	Remove non-accessed field	2021-03-17 17:02:11 +09:00
Dean Herbert	5adc675862	Focus artist textbox on entering song setup if fields are empty	2021-03-17 16:57:14 +09:00
Dean Herbert	eda891223c	Start the editor with empty artist/creator/difficulty name fields	2021-03-17 16:47:12 +09:00
Dean Herbert	c7740d1181	Fix opening the editor occasionally causing a hard crash due to incorrect threading logic ... Setting one of the global screen `Bindable`s (in this case, `Beatmap`) is not valid from anywhere but the update thread. This changes the order in which things happen during the editor startup process to ensure correctness. Closes #11968.	2021-03-17 15:52:25 +09:00
Dean Herbert	cd1c1bf534	Centralise cases of performing actions on the current selection ... By moving this to a central location, we can avoid invoking the EditorChangeHandler when there is no selection made. This helps alleviate the issue pointed out in https://github.com/ppy/osu/issues/11901, but not fix it completely.	2021-02-26 14:15:13 +09:00
Dean Herbert	e9730d4782	Move default sample addition to inside PlacementBlueprint ... This isn't actually required to fix the behaviour but it does feel like a better place to put this logic.	2021-02-11 17:16:18 +09:00
smoogipoo	3ce605b5e5	Small refactoring to use .Trim() instead	2021-02-09 12:00:03 +09:00
Joehu	414e05affd	Fix editor effect attribute tooltip having unnecessary whitespace when only one is enabled	2021-02-08 10:16:16 -08:00
Dean Herbert	0dd1b1026c	Merge pull request #11495 from smoogipoo/more-accurate-most-common-bpm ... Make most common BPM more accurate	2021-02-08 20:08:58 +09:00
smoogipoo	69ca440ae5	Merge branch 'master' into more-accurate-most-common-bpm	2021-02-08 18:40:58 +09:00
Joehu	5e7823b289	Fix attributes content being zero size and disappearing after being half off-screen	2021-02-08 01:37:34 -08:00
Joehu	6b26a18a23	Fix attributes header not being aligned with content in editor timing mode	2021-02-08 01:34:32 -08:00
Vincent Maggioli	96652e07cd	Merge branch 'master' into zero-spinner-slider	2021-02-05 09:40:55 -05:00
vmaggioli	5061231e59	Switch to beat length	2021-02-05 09:39:14 -05:00
Dan Balasescu	c70dd2edfc	Merge pull request #11569 from peppy/fix-editor-new-beatmap-crash ... Fix a potential crash when exiting the editor before a new beatmap is added to the database	2021-02-01 21:01:51 +09:00
Dan Balasescu	30f7e4c794	Merge branch 'master' into fix-timeline-parts-working-beatmap	2021-01-25 21:22:45 +09:00
Dean Herbert	b489e92c9e	Fix TimelineParts not using correct beatmap	2021-01-25 18:44:36 +09:00
Dean Herbert	4ac362ee1a	Move cloning local to editor	2021-01-25 18:29:00 +09:00
Dean Herbert	f054b38105	Merge branch 'master' into revert-beatmap-controlpointinfo-cloning	2021-01-25 18:25:53 +09:00
Dean Herbert	b44bd8c4ee	Remove unused using statement	2021-01-22 18:03:33 +09:00
Dean Herbert	a9c8f9bd4a	Fix a potential crash when exiting the editor before a new beatmap is added to the database	2021-01-22 17:47:38 +09:00
Dan Balasescu	04095cd5b9	Merge branch 'master' into fix-editor-scroll-interruption	2021-01-21 17:46:18 +09:00
Dan Balasescu	9eb74e86ed	Apply comment suggestion ... Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2021-01-21 17:40:15 +09:00
vmaggioli	5ee3a5f230	Use AlmostEquals	2021-01-20 13:00:25 -05:00
vmaggioli	ce3c2f07dc	Fix zero length spinners and sliders	2021-01-20 12:19:52 -05:00
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