4401 Commits

Author	SHA1	Message	Date
Dean Herbert	706ac3e44f	Merge pull request #19982 from OliBomby/fix-illegal-merge ... Fixed 0 length merge being allowed	2022-08-30 12:28:18 +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
Dan Balasescu	e34c8e4975	Merge pull request #19716 from MBmasher/fl-grid ... Nerf repeated angles in Flashlight skill	2022-08-29 21:15:45 +09:00
Dan Balasescu	e3e204001e	Merge pull request #19907 from peppy/ruleset-api-versioning ... Add ruleset API versioning	2022-08-29 18:50:01 +09:00
Dean Herbert	780121eeee	Add setting to toggle metronome in "Target" mod ... As mentioned in https://github.com/ppy/osu/discussions/20006#discussioncomment-3496732.	2022-08-29 17:12:10 +09:00
Dean Herbert	90b9c02ac6	Remove "internal" identifier as unnecessary	2022-08-29 14:01:15 +09:00
OliBomby	16e0ec2f88	Fixed 0 length merge being allowed	2022-08-27 13:53:50 +02:00
MBmasher	b082dc1fe4	Slightly buff flashlight multiplier	2022-08-27 18:31:07 +10: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
MBmasher	454d868dd5	Remove unnecessary using call	2022-08-26 20:42:02 +10:00
MBmasher	249c3f868f	Compare raw angle values instead of rounding angles	2022-08-26 20:40:18 +10:00
MBmasher	5082ee26cf	Ensure a negative value cannot be added to angleRepeatCount	2022-08-26 20:30:14 +10:00
MBmasher	08cb70b093	Lessen repeated angle nerf for objects further back in time	2022-08-26 20:27:31 +10: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
MBmasher	d8854413cb	Add newline	2022-08-26 12:38:36 +10:00
MBmasher	6651e76e2e	Remove whitespace	2022-08-26 12:37:56 +10:00
MBmasher	b0e7f63361	Update angle multiplier to nerf repeated angles	2022-08-26 12:34:33 +10: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
o-dasher	4de6df71c5	No "gameplayClock" usage with playfield update mods	2022-08-24 20:59:32 -04: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	f5710d8000	Add ruleset API versioning	2022-08-22 16:35:08 +09:00
naoei	29ef1c8db8	Check if StatisticItem.Name is null or empty	2022-08-20 21:48:53 -04:00
Nao	189a407cb1	Merge branch 'master' into ruleset-localization	2022-08-20 21:39:10 -04: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
Dan Balasescu	237637f0c4	Merge pull request #19804 from stanriders/clamp-sb-estimation ... Clamp effective miss count to maximum amount of possible breaks	2022-08-17 18:58:12 +09: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
StanR	43e471c2a5	Clamp effective miss count to maximum amount of possible braks	2022-08-16 16:12:13 +03: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
Dean Herbert	c8764cb333	Move all usage of GameplayClock to IGameplayClock	2022-08-15 18:30:53 +09:00
Nao	c940f5abcb	Merge branch 'master' into ruleset-localization	2022-08-14 15:17:44 -04:00
naoei	45e9eda9e7	Localise hit result name	2022-08-14 14:57:02 -04:00