4380 Commits

Author	SHA1	Message	Date
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
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
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
naoei	18ce784ae0	Allow StatisticItem's name param to be nullable	2022-08-14 14:51:35 -04:00
Dean Herbert	e5e9841652	Apply multiple other mod debuffs as decided in pull request discussion	2022-08-12 18:58:09 +09:00
OliBomby	3525dfb0f1	added merging feature	2022-08-12 01:17:33 +02:00
Dan Balasescu	61a3758cd9	Merge branch 'master' into pp-balancing	2022-08-11 19:46:16 +09:00
naoei	a42b8092af	Change message type osu resume overlay	2022-08-10 16:09:58 -04:00
naoei	3e38baca3c	Change ruleset mod description types	2022-08-10 16:09:11 -04:00
Dan Balasescu	7cac089246	Merge branch 'master' into fl-slider	2022-08-10 21:19:05 +09:00
Dean Herbert	e1189da824	Merge branch 'master' into irenderer-glwrapper	2022-08-08 12:31:53 +09:00
Dan Balasescu	6afff72865	Fix CI inspections / refactor to single enumeration	2022-08-05 20:54:10 +09:00
Dan Balasescu	802dc90cb1	Adjust using directives for vertices	2022-08-05 20:37:33 +09:00
Dean Herbert	a682a823f4	Fix test failures where Beatmap is not provided	2022-08-05 18:20:37 +09:00
Dean Herbert	9a4d0494de	Adjust various pooling defaults to better handle more intense beatmaps	2022-08-05 18:09:07 +09:00
Dean Herbert	8ae5429602	Adjust slider pooling based on beatmap ... Handles edge cases like mentioned in https://github.com/ppy/osu/issues/19585.	2022-08-05 18:08:05 +09:00
Dan Balasescu	2c6c315e3a	Merge branch 'master' into pp-balancing	2022-08-04 15:40:46 +09:00
Dan Balasescu	b4e55f7309	Apply IRenderer changes	2022-08-02 19:50:57 +09:00
Dan Balasescu	a2a913ab52	Merge branch 'irenderer-batches' into irenderer-textures	2022-08-02 19:25:08 +09:00
Dean Herbert	a5fac70c3b	Rename variable to not include mode name itself	2022-08-01 23:30:00 +09:00
Dean Herbert	d09976bb39	Merge branch 'master' into Wiggle-strength-duration	2022-08-01 23:29:03 +09:00