634 Commits

Author	SHA1	Message	Date
Dean Herbert	f1d9b225a7	Remove probably pointless comment	2022-09-05 16:40:10 +09:00
Dean Herbert	8af8adf22d	Fix incorrect slider length in timeline when non-default velocity is inherited from previous object	2022-09-05 16:17:26 +09:00
Dean Herbert	a15ea71aed	Merge branch 'master' into fix-merge-crash	2022-08-31 13:28:57 +09:00
OliBomby	44916c51d7	Updated canMerge check to be totally accurate	2022-08-30 00:18:55 +02:00
Dean Herbert	2e5770be4e	Move helper method to bottom of class	2022-08-30 02:51:42 +09:00
OliBomby	d50e9caa11	Moved guards to separate canMerge method	2022-08-29 18:58:29 +02:00
OliBomby	a296c1ec81	remove call to changeHandler BeginChange	2022-08-29 16:05:35 +02:00
OliBomby	ff2eac79d1	fix same time merge causing crash	2022-08-27 17:43:32 +02:00
OliBomby	16e0ec2f88	Fixed 0 length merge being allowed	2022-08-27 13:53:50 +02:00
Dean Herbert	69cbc0125b	Merge pull request #19964 from nanashi-1/merge-hitobject-hitsound-fix ... Fix hitobjects merge feature in editor not adding any hitsounds	2022-08-26 20:05:02 +09:00
Dean Herbert	03dcfed384	Merge branch 'master' into slider-splitter	2022-08-26 19:10:33 +09:00
Dean Herbert	47cb163015	Refactor splitting logic and comments slightly	2022-08-26 19:09:03 +09:00
Dean Herbert	f54047d17b	Move selection clearing to top	2022-08-26 18:55:20 +09:00
nanashi	4fc96f0389	Merge branch 'ppy:master' into merge-hitobject-hitsound-fix	2022-08-25 19:34:05 +08:00
nanashi-1	2d2bfac5e9	used firstHitObject.Samples as samples for mergedHitObject	2022-08-25 17:49:38 +08:00
Dean Herbert	3ca4bdc087	Add ToArray() calls to removal iteration for safety	2022-08-25 15:13:38 +09:00
Dean Herbert	091c51e664	Fix SliderPath.Version bindings not being correctly cleaned up on path changes	2022-08-25 15:00:32 +09:00
OliBomby	631ea9a3ed	added a gap between objects and made it theoretically possible to retain sample control point	2022-08-23 23:29:59 +02:00
OliBomby	1f9cdff013	remove these lines	2022-08-23 22:19:40 +02:00
Dean Herbert	885ea4270b	Reorder context menu items and tidy up surrounding code	2022-08-20 14:03:54 +09:00
Dean Herbert	36e202c70e	Add inline comment explaining necessity to use AddRange for slider transform operations	2022-08-20 11:38:43 +09:00
OliBomby	65f7ecec83	moving all controlpoints at once for slider	2022-08-20 00:26:04 +02:00
OliBomby	d1519343f6	Improved visual tests for slider splitting	2022-08-19 18:29:01 +02:00
OliBomby	89eb0a4079	Added TestScene for slider splitting	2022-08-19 01:10:54 +02:00
OliBomby	cb6339a20b	added slider splitting option	2022-08-18 01:29:03 +02:00
Dean Herbert	615c5cf6ae	Merge branch 'master' into slider-merger	2022-08-17 13:36:15 +09:00
Dean Herbert	0ff5547b83	Make changeHandler optional in convertToStream method to match new implementation	2022-08-17 13:35:44 +09:00
Dean Herbert	ee153a345c	Add a few more overlooked beatmap save states on setup screen modifications	2022-08-16 16:31:56 +09:00
Dean Herbert	0833a6fb9a	Avoid multiple iteration of LINQ query using a local	2022-08-16 15:39:23 +09:00
Dean Herbert	7cc9fdbaa0	Simplify context menu check by using existing mergeable object list	2022-08-16 15:39:23 +09:00
Dean Herbert	ecb9351bab	Remove unnecessary null pre-checks	2022-08-16 15:36:43 +09:00
Dean Herbert	e636fcd9b8	Use DI'd components from parent class rather than fetching locally	2022-08-16 15:35:32 +09:00
OliBomby	3abc333813	added hotkey for merging selection	2022-08-15 17:18:55 +02:00
OliBomby	3525dfb0f1	added merging feature	2022-08-12 01:17:33 +02:00
Dean Herbert	06ae30a7d2	Fix slider velocity not using previous value if slider is not adjacent	2022-07-19 22:54:11 +09:00
Dean Herbert	31a447fda0	Update parameter discards	2022-06-24 21:26:19 +09:00
Dan Balasescu	f8830c6850	Automated #nullable processing	2022-06-17 16:37:17 +09:00
Dan Balasescu	64a371638e	Merge pull request #18236 from peppy/snap-unification ... Add `enum` to snap method as alternative to multiple nested invocations	2022-05-20 11:35:05 +09:00
Dean Herbert	cf3ead8047	Remove unused local	2022-05-13 22:06:30 +09:00
Dean Herbert	d9782b5ef6	Remove redundant parenthesis	2022-05-13 21:31:49 +09:00
Dean Herbert	38b8baf095	Remove unused border colour	2022-05-13 21:28:50 +09:00
Dean Herbert	1529162318	Remove circle scaling (apparently the fixed scale is required for spacing)	2022-05-13 21:28:45 +09:00
Dean Herbert	0318944b80	Fix incorrect alive criteria causing clicking future objects to be too greedy	2022-05-12 23:37:29 +09:00
Dean Herbert	0c335592b3	Tidy up interpolation and move const to new home	2022-05-12 19:44:07 +09:00
Dean Herbert	f22ff4e087	Remove editor animation toggling (replaced by overlap markers)	2022-05-12 19:28:56 +09:00
Dean Herbert	be3d4c9bf5	Add circle overlap marker, bringing back stable-like visibility of circles in the past	2022-05-12 19:27:32 +09:00
Dean Herbert	1b2c07e142	Extend lifetime of OsuSelectionBlueprint to allow for lingering display	2022-05-12 19:25:51 +09:00
Dean Herbert	c0abce918f	Add enum to snap method as alternative to mutliple nested invocations	2022-05-12 16:19:07 +09:00
Dean Herbert	c7e7aa5962	Don't draw distance snap grid on the start time of the next object	2022-05-06 17:05:52 +09:00
Dean Herbert	19cf9dc20b	Merge branch 'snapping-tidy-distance'	2022-05-05 16:51:32 +09:00