2747 Commits

Author	SHA1	Message	Date
Dan Balasescu	44c6457c85	Merge branch 'master' into add-spinner-spin	2020-11-06 15:40:40 +09:00
Dan Balasescu	41dc3a7abd	Merge branch 'master' into add-spinner-glow	2020-11-06 14:37:54 +09:00
Dan Balasescu	71a1165209	Merge branch 'master' into drawable-hit-object-hit-state-fix	2020-11-06 13:19:25 +09:00
Dean Herbert	d7a912a0d2	Match stable's transform 1:1	2020-11-05 19:44:34 +09:00
Dean Herbert	71253cb5e9	Add support for spinner "clear" text in legacy skins	2020-11-05 19:35:32 +09:00
Dean Herbert	5e387e92cd	Add positional offset to avoid the SPM counter	2020-11-05 19:16:47 +09:00
Dean Herbert	901102918e	Centralise scale and apply to SPIN text	2020-11-05 19:05:59 +09:00
Dean Herbert	3ec813da03	Add "spin" sprite	2020-11-05 18:48:47 +09:00
Dean Herbert	2bbdbfda5c	Merge pull request #10696 from smoogipoo/visibility-adjustment-mod	2020-11-05 18:18:57 +09:00
Dean Herbert	5ec6011340	Apply new style spinner scale to only local sprites	2020-11-05 18:14:49 +09:00
Dean Herbert	11c18952e3	Allow children to be added in base class	2020-11-05 18:12:06 +09:00
Dean Herbert	64e3325b41	Abstract out common part of legacy spinner implementations ... Some elements going forward will be shared, so it makes sense to have a common base class to add these shared elements.	2020-11-05 18:00:27 +09:00
Dean Herbert	82d8c1bbea	Add support for spinner glow	2020-11-05 17:27:41 +09:00
Dean Herbert	0cadb31947	Merge branch 'master' into drawable-hit-object-hit-state-fix	2020-11-05 17:07:52 +09:00
Dean Herbert	4a4fa96fef	Merge pull request #10692 from smoogipoo/followpointrenderer-hitobject	2020-11-05 16:39:05 +09:00
Dean Herbert	54775ccacf	Merge pull request #10690 from smoogipoo/osu-remove-hitobject-references	2020-11-05 16:22:13 +09:00
smoogipoo	d1fa391d25	Make OsuModHidden apply fadein adjustment on custom state update	2020-11-05 16:12:55 +09:00
smoogipoo	f513c95ab2	Use class with transform and wiggle mods	2020-11-05 16:04:42 +09:00
smoogipoo	cc518feca7	Make methods abstract	2020-11-05 16:03:10 +09:00
smoogipoo	77a618dd71	Use class with other osu! mods	2020-11-05 15:52:06 +09:00
Dean Herbert	a43166e8a9	Merge branch 'master' into followpointrenderer-hitobject	2020-11-05 15:42:09 +09:00
Dean Herbert	54f927ee11	Move casts to DrawableHitObject instead	2020-11-05 15:41:55 +09:00
smoogipoo	628b8be15d	Implement ModWithVisibilityAdjustment	2020-11-05 15:40:25 +09:00
Dean Herbert	c26fd4dc3d	Merge pull request #10691 from smoogipoo/osu-lighting-colour-reuse ... Remove AccentColour binding from judgement lighting	2020-11-05 15:37:28 +09:00
Dean Herbert	e2d028908a	Fix one more case of local variable preference	2020-11-05 15:25:20 +09:00
Dean Herbert	4457e363d3	Bring back local variables to reduce two-level-deep variable access	2020-11-05 15:22:40 +09:00
Dean Herbert	3f24fabb57	Add change handler support for contorl point deletion	2020-11-05 15:05:43 +09:00
smoogipoo	9c1c9945af	Make FollowPointRenderer use hitobject models	2020-11-05 15:01:45 +09:00
Dean Herbert	242ec1ca82	Don't override PathControlPointVisualiser's positional handling ... It turns out it was relying on this to deselect control points on clicking away from them.	2020-11-05 14:58:30 +09:00
smoogipoo	9ac822beed	Remove AccentColour binding from judgement lighting	2020-11-05 14:49:15 +09:00
smoogipoo	400fcedf0f	Remove stored hitobject references from skinnable components	2020-11-05 14:40:48 +09:00
Dean Herbert	eed9894d3a	Remove usage of case-when (caught me off-gaurd)	2020-11-05 13:58:41 +09:00
smoogipoo	9a7fcadabc	Use BDL for top-level osu! DHOs	2020-11-05 13:51:46 +09:00
Dean Herbert	f9fc58c45c	Apply same fix to LegacyMainCirclePiece	2020-11-04 17:30:23 +09:00
Dean Herbert	65fb8628e0	Use HitStateUpdateTime	2020-11-04 17:30:11 +09:00
Dean Herbert	e5a5c3713d	Merge branch 'drawable-hit-object-hit-state-fix' into fix-hitcircle-glow-on-skin-change	2020-11-04 17:15:20 +09:00
Dean Herbert	a3dc1d5730	Update existing implementations	2020-11-04 17:14:23 +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	b069372b29	Fix skin changes resulting in incorrectly applied transforms in MainCirclePiece	2020-11-03 17:49:48 +09:00
Bartłomiej Dach	164370bc7d	Resolve more CA1805 inspections	2020-11-01 20:51:23 +01:00
Dean Herbert	606a4304a8	Remove unused usings	2020-10-27 14:33:16 +09:00
Dean Herbert	9cfb81589e	Use bindable flow instead	2020-10-27 14:10:12 +09:00
Bartłomiej Dach	5ef1b5dcb5	Remove unused locals	2020-10-25 23:55:22 +01:00
Bartłomiej Dach	0a23e994e2	Hide sliderend & repeat circles in traceable mod	2020-10-25 23:30:26 +01:00
Dean Herbert	267b399f9f	Add some simple border styles	2020-10-20 13:59:03 +09:00
Bartłomiej Dach	7c388f1132	Move editor playfield border locally to osu! composer	2020-10-19 21:20:13 +02:00
Bartłomiej Dach	bca0539735	Move setting to osu! ruleset subsection	2020-10-19 21:05:21 +02:00
Bartłomiej Dach	4267d23d59	Move border to more appropriate namespace	2020-10-19 20:56:34 +02:00
Bartłomiej Dach	4af3fd1ed6	Allow toggling border on & off during gameplay	2020-10-19 20:41:45 +02:00
Bartłomiej Dach	053c7a69a6	Fix code style issues & compilation failures	2020-10-19 20:22:48 +02:00
Dean Herbert	22bde43106	Merge branch 'master' into visible-playfield-boundary	2020-10-19 18:05:28 +09:00
Bartłomiej Dach	f41879ee7c	Show current hit circle placement in timeline	2020-10-10 17:54:37 +02:00
Bartłomiej Dach	146b15371d	Merge branch 'master' into fix-slider-sample-parsing	2020-10-10 14:02:33 +02:00
Dean Herbert	681e88af40	Merge branch 'master' into editor-fix-button-states-after-paste	2020-10-09 20:51:09 +09:00
smoogipoo	696e3d53af	Fix slider samples being overwritten by the last node	2020-10-09 20:50:09 +09:00
Dan Balasescu	ecfb7e94c5	Merge branch 'master' into fix-editor-batch-handling	2020-10-09 20:06:06 +09:00
Dan Balasescu	93f5ea57a5	Merge pull request #10427 from peppy/fix-hidden-first-object ... Fix first hitobject in osu! hidden mod not getting correct fade applied	2020-10-09 19:23:47 +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	febfe9cdd0	Don't fade the approach circle on increased visibility	2020-10-09 18:43:16 +09:00
Dan Balasescu	6572ce5f36	Merge pull request #10441 from peppy/editor-selection-blueprint-performance ... Improve performance of slider blueprints	2020-10-09 18:01:25 +09:00
Dean Herbert	a0af2eb6c8	Private protect setters	2020-10-09 16:54:43 +09:00
Dean Herbert	6b9e94ae93	Avoid retaining slider selection blueprints FBO backing textures after deselection	2020-10-09 14:05:00 +09:00
Dean Herbert	34d1439f8e	Only update slider selection blueprints paths when visible	2020-10-09 14:04:26 +09:00
Dean Herbert	07558b5bc0	Merge branch 'master' into ruleset-result-types	2020-10-09 13:17:05 +09:00
Dean Herbert	2a790c76d5	Add reverse implementation for osu!	2020-10-09 06:32:33 +09:00
Dean Herbert	2d0275ba95	Fix first hitobject in osu! hidden mod not getting correct fade applied	2020-10-09 03:07:01 +09:00
Dean Herbert	afed832b19	Tidy up EditorBeatmap slightly	2020-10-08 18:06:49 +09:00
Dean Herbert	f1a3b6d0ba	Merge branch 'master' into perf-calculator-remove-working-beatmap	2020-10-07 17:43:17 +09:00
Dean Herbert	6020ec9ca3	Add valid result types for all rulesets	2020-10-07 15:43:52 +09:00
Dan Balasescu	c803be2dd2	Merge pull request #10385 from peppy/fix-slider-end-circle-fallback-case ... Fix incorrect sliderendcircle fallback logic	2020-10-06 20:10:51 +09:00
Dan Balasescu	e1b5c83ae6	Merge pull request #10386 from peppy/fix-stacked-circles-visibility ... Make stacked hitcircles more visible when using default skin	2020-10-06 19:48:07 +09:00
Dean Herbert	9d7880afda	Make SettingsItem conform to IHasCurrentValue	2020-10-06 17:18:54 +09:00
Dean Herbert	048507478e	Join declaration and specification	2020-10-06 14:12:46 +09:00
Dean Herbert	ed982e8dd1	Make stacked hitcircles more visible when using default skin	2020-10-06 14:09:31 +09:00
Dean Herbert	767a2a10bd	Fix incorrect sliderendcircle fallback logic ... Correctly handle the case where a skin has "sliderendcircle.png" but not "sliderendcircleoverlay.png".	2020-10-06 13:56:42 +09:00
Dan Balasescu	6d50a1ed7d	Merge branch 'master' into osu-selection-flip-rotate-buttons	2020-10-05 19:17:33 +09:00
Dan Balasescu	08f7b18dbe	Merge pull request #10294 from peppy/osu-selection-scaling ... Add selection scale and rotate support	2020-10-05 19:17:19 +09:00
Dan Balasescu	cbf697336f	Merge pull request #10323 from peppy/skin-slider-end-circle-support ... Add legacy skin "sliderendcircle" support	2020-10-05 19:02:38 +09:00
Dan Balasescu	b20dc793cc	Merge pull request #10321 from LittleEndu/trail-density ... Try to match stable's cursor trail density	2020-10-05 19:02:28 +09:00
Dan Balasescu	2df5ea8ba8	Merge branch 'master' into osu-selection-scaling	2020-10-05 18:47:17 +09:00
Dean Herbert	f0b5ba9534	Merge branch 'master' into skin-slider-end-circle-support	2020-10-05 17:45:51 +09:00
Dan Balasescu	692ca87bec	Merge branch 'master' into fix-spinner-rewind-crash	2020-10-05 15:32:52 +09:00
Dean Herbert	5dea37792c	Merge branch 'master' into health-adjustments	2020-10-04 21:38:40 +09:00
Bartłomiej Dach	a366591d6d	Merge branch 'master' into osu-selection-scaling	2020-10-04 13:28:59 +02:00
Bartłomiej Dach	26eff0120d	Apply same fix for miss-triggering case ... See 5888ecd - the same fix is applied here, but in the miss case.	2020-10-03 21:11:34 +02:00
Dean Herbert	5888ecdeb1	Fix spinner crashing on rewind	2020-10-04 01:08:24 +09:00
Lucas A	27cc6c5046	Rename HitCirclesCount -> HitCircleCount.	2020-10-03 16:52:33 +02:00
Lucas A	d7747ebb2d	Remove unused WorkingBeatmap argument.	2020-10-03 16:51:22 +02:00
Bartłomiej Dach	db31280671	Award health for completed slider tails	2020-10-03 12:16:22 +02:00
Bartłomiej Dach	1f0620ffd4	Replace assignment references to HitResult.Miss with Judgement.MinResult	2020-10-02 23:31:24 +02:00
Bartłomiej Dach	2b1ef16f89	Replace comparison references to HitResult.Miss with IsHit	2020-10-02 23:31:24 +02:00
Lucas A	abd395a030	Remove unecessary using references.	2020-10-02 19:41:24 +02:00
Lucas A	cb2f695fdd	Calculate hit circle count in OsuPerformanceCalculator.	2020-10-02 19:34:41 +02:00
Lucas A	0163688a17	Remove IBeatmap from PerformanceCalculator.	2020-10-02 19:24:30 +02:00
Endrik Tombak	676f58c3bf	Merge branch 'master' of https://github.com/ppy/osu into trail-density	2020-10-02 19:36:40 +03:00
Endrik Tombak	8cd13729ee	Actually multiply by the multiplier	2020-10-02 19:34:49 +03:00
Endrik Tombak	16f331cf6d	Move implementation to LegacyCursorTrail	2020-10-02 19:34:06 +03:00
Dean Herbert	b1e7a5113e	Merge pull request #10328 from smoogipoo/fix-spinner-transforms ... Fix spinners not transforming correctly	2020-10-02 23:51:09 +09:00
Dean Herbert	a3ecc6c5a4	Remove redundant array type specification	2020-10-02 19:56:24 +09:00
Dean Herbert	5a6c45e2ff	Fix hidden mod support for sliderendcircle	2020-10-02 18:41:28 +09:00
smoogipoo	fe818a020a	Fix spinners not transforming correctly	2020-10-02 16:17:57 +09:00
Dean Herbert	dde7f706aa	Avoid rapid triangle repositioning during editor slider placement	2020-10-02 15:51:14 +09:00
Dean Herbert	ad4cac13ac	Add preempt adjustment and fade in first end circle with slider to match stable	2020-10-02 15:21:52 +09:00
Dean Herbert	2975ea9210	Adjust repeat/tail fade in to match stable closer	2020-10-02 14:50:03 +09:00
Dean Herbert	2427ae43da	Share fade in logic with repeats	2020-10-02 14:50:03 +09:00
Dean Herbert	5d2a8ec764	Add final sliderendcircle display support	2020-10-02 14:50:03 +09:00
Dean Herbert	fc7f3173e1	Add the ability to use LegacyMainCirclePiece with no combo number displayed	2020-10-02 14:50:03 +09:00
Dean Herbert	fce3eacd7d	Move tail circle to display beneath ticks etc.	2020-10-02 14:50:03 +09:00
Endrik Tombak	fa1903cd03	Get bound copy instead	2020-10-01 23:41:24 +03:00
Endrik Tombak	abf1afd3f1	Do not decrease density	2020-10-01 23:27:57 +03:00
Endrik Tombak	9e52f9c858	Consider cursor size in trail interval	2020-10-01 23:23:28 +03:00
Dean Herbert	3069428efe	Merge pull request #10316 from smoogipoo/fix-spinner-flicker ... Fix default spinner flashing yellow glow before completion	2020-10-01 22:29:48 +09:00
Dean Herbert	94996f2cc0	Merge branch 'master' into osu-selection-scaling	2020-10-01 21:09:52 +09:00
smoogipoo	6d3f4c8699	Fix a few more similar cases	2020-10-01 20:38:47 +09:00
Dan Balasescu	df07ca445f	Merge branch 'master' into legacy-SpinnerNoBlink	2020-10-01 20:34:23 +09:00
smoogipoo	ba76089219	Fix spinner flashing yellow glow before completion	2020-10-01 20:24:32 +09:00
smoogipoo	3e6af7ce43	Refactor for readability	2020-10-01 20:09:09 +09:00
Max Hübner	7e5ecd84bc	Add braces to clear up operator precedence	2020-10-01 12:41:44 +02:00
Dean Herbert	b6dc8bb2d3	Fix remaining manual degree-to-radian conversions	2020-10-01 18:10:05 +09:00
Dan Balasescu	3a81602d0c	Merge pull request #10286 from peppy/fix-hitobject-sample-stuck-on-future-seek ... Fix HitObject samples getting stuck in a playing state on seeking far into the future	2020-10-01 18:08:17 +09:00
Dean Herbert	538973e394	Use float methods for math operations	2020-10-01 17:06:05 +09:00
Dean Herbert	b7ac779760	Merge branch 'master' into fix-hitobject-sample-stuck-on-future-seek	2020-10-01 16:46:14 +09:00
Dean Herbert	983b693858	Add flip logic to OsuSelectionHandler	2020-10-01 16:24:50 +09:00
Dean Herbert	02f14ab4b0	Rename operation start/end to be more encompassing	2020-10-01 16:24:09 +09:00
smoogipoo	7890319802	Merge branch 'master' into adjust-hit-result-types	2020-10-01 16:19:07 +09:00
smoogipoo	cb6b35116a	Merge branch 'master' into scoring-standardisation	2020-10-01 12:28:51 +09:00
smoogipoo	3c9ee6abc1	Use local static to determine score per spinner tick	2020-10-01 12:15:34 +09:00
Dean Herbert	4b70fe8585	Merge branch 'fix-storyboard-sample-pausing' into fix-hitobject-sample-stuck-on-future-seek	2020-09-30 22:46:09 +09:00
Dean Herbert	7f579850dd	Merge branch 'master' into fix-editor-silence-on-seek	2020-09-30 17:03:23 +09:00
Dean Herbert	414c40d298	Reverse inheritance order of SkinnableSound's pause logic	2020-09-30 15:45:14 +09:00
Dean Herbert	59ce9fcab9	Merge branch 'master' into fix-editor-silence-on-seek	2020-09-30 15:35:55 +09:00
Dean Herbert	7fad9ce34a	Simplify HandleScale method	2020-09-30 15:20:25 +09:00
Dean Herbert	f1298bed79	Combine scale operations and tidy up scale drag handle construction	2020-09-30 15:08:56 +09:00
Dean Herbert	313b0d149f	Refactor scale and rotation operations to share code better ... Also adds support for scaling individual sliders.	2020-09-30 14:41:33 +09:00
Dean Herbert	39b55a85df	Move a lot of the implementation to base SelectionHandler	2020-09-30 13:52:57 +09:00
Dean Herbert	99a3801267	Tidy up scale/rotation operation code	2020-09-30 13:02:05 +09:00
Dean Herbert	5ae6b2cf5b	Fix syntax	2020-09-29 20:10:17 +09:00
Dean Herbert	a2e2cca396	Add proper change handler support	2020-09-29 20:08:56 +09:00
Dean Herbert	934db14e03	Add rotation support	2020-09-29 20:08:56 +09:00
Dean Herbert	33b24b6f46	Refactor to be able to get a quad for the current selection	2020-09-29 20:08:56 +09:00
Dean Herbert	0a10e40ce0	Add scaling support to osu! editor	2020-09-29 20:08:56 +09:00
smoogipoo	f439c1afbc	Make osu/taiko/catch use Ok+Great	2020-09-29 17:16:55 +09:00
smoogipoo	cd895c792c	Merge branch 'master' into scoring-standardisation	2020-09-29 17:04:59 +09:00
smoogipoo	bad48d6d44	Merge branch 'master' into scoring-standardisation	2020-09-29 16:33:38 +09:00
smoogipoo	31fae045fa	Update judgement processors with new hit results	2020-09-29 16:33:38 +09:00
smoogipoo	a1394c1830	Fix a few missed judgements	2020-09-29 16:33:38 +09:00
smoogipoo	a77741927c	Use new hit results in osu	2020-09-29 16:33:38 +09:00
Dean Herbert	5d1c377379	Fix HitObject samples getting stuck in a playing state on seeking far into the future	2020-09-29 15:07:55 +09:00
Dean Herbert	d6f3beffb6	Use existing bindable flow instead	2020-09-29 12:50:17 +09:00
Dean Herbert	cc9bf67d42	Merge branch 'master' into fix-spinner-rpm-user-rate-adjust	2020-09-29 12:10:24 +09:00
Dan Balasescu	66e89f56d9	Merge pull request #10280 from peppy/editor-fix-spinner-extending ... Fix extending spinners in editor causing them to disappear temporarily	2020-09-28 19:41:44 +09:00
Max Hübner	54852991f3	Move SpinnerNoBlink to OsuSkinConfiguration	2020-09-28 12:24:30 +02:00
Max Hübner	40a4654ef9	Invert spinnerNoBlink to spinnerBlink locally	2020-09-28 12:21:43 +02:00
smoogipoo	b6bc829bd5	Guard against nulls (load not run)	2020-09-28 17:46:22 +09:00
Dean Herbert	fd58a24183	Merge branch 'master' into fix-spinner-rpm-user-rate-adjust	2020-09-28 17:45:48 +09:00
Dan Balasescu	1b6ef60f36	Merge branch 'master' into editor-fix-slider-drag-after-snaking	2020-09-28 17:45:04 +09:00
Dean Herbert	e60e47ff66	Unbind events on disposal	2020-09-28 17:41:10 +09:00
Dean Herbert	63b5b8b841	Fix sliders not dragging correctly after snaking has begun ... Closes #10278.	2020-09-28 17:33:00 +09:00
Dean Herbert	8692c24dfc	Fix extending spinners in editor causing them to disappear temporarily	2020-09-28 17:20:36 +09:00
Dean Herbert	5237fa7bf2	Remove unused local in case statement	2020-09-28 16:37:54 +09:00
Dean Herbert	467a16bf75	Fix fade out extension logic (and make it generally look better for sliders)	2020-09-28 16:21:20 +09:00
Dean Herbert	6095446f10	Fix autoplay generators failing on empty hitobjects lists	2020-09-28 15:38:54 +09:00
Max Hübner	33d000e532	Add support for SpinnerNoBlink in legacy spinner	2020-09-26 16:25:57 +02:00
Dean Herbert	b2261f03e2	Merge branch 'master' into fix-spinner-rpm-user-rate-adjust	2020-09-25 20:21:35 +09:00
Dean Herbert	346d14d40b	Rename variables to match	2020-09-25 17:45:19 +09:00
Dean Herbert	22511c36c3	Ensure toggles are not instantiated more than once for safety	2020-09-25 17:43:09 +09:00
Dean Herbert	ae68dcd962	Add ternary toggle buttons to editor toolbox selection	2020-09-25 16:38:12 +09:00
Dean Herbert	0f8551e9ea	Merge branch 'editor-ternary-states' into new-combo-toggle	2020-09-25 15:36:33 +09:00
Dean Herbert	bca774a0d4	Allow BlueprintContainer to specify toggles	2020-09-25 14:09:31 +09:00
Dean Herbert	7df8b5bce7	Merge branch 'master' into fix-spinner-rpm-user-rate-adjust	2020-09-25 13:17:03 +09:00
Dean Herbert	d9e8ac6842	Add support for slider end snapping	2020-09-24 16:24:35 +09:00
Dean Herbert	44be0ab762	Add basic osu! object to object snapping	2020-09-24 16:24:35 +09:00
Dean Herbert	ba160aab76	Fix large construction/disposal overhead on beatmaps with hitobjects at same point in time	2020-09-23 15:41:43 +09:00
Dan Balasescu	625c146460	Merge pull request #10199 from peppy/fix-editor-binding-crash ... Fix bindings not correctly being cleaned up in OsuHitObjectComposer	2020-09-23 12:38:18 +09:00
Dan Balasescu	53788968c8	Merge pull request #10205 from peppy/fix-composer-distance-snap-selection ... Fix compose mode not showing distance snap grid when entering with a selection	2020-09-23 11:55:42 +09:00
Dean Herbert	b1f7cfbd5b	Reduce children levels in RingPiece	2020-09-22 17:34:21 +09:00
Dean Herbert	8e43266460	Fix compose mode not showing distance snap grid when entering with a selection	2020-09-22 16:02:07 +09:00
Dean Herbert	25bf160d94	Fix missing GameplayClock in some tests	2020-09-21 22:30:14 +09:00
Dean Herbert	3f788da06d	Fix SPM changing incorrectly with playback rate changes	2020-09-21 19:39:54 +09:00
Dean Herbert	842f8bea55	Fix bindings not correctly being cleaned up in OsuHitObjectComposer	2020-09-21 18:15:33 +09:00
Dean Herbert	1e09d8fd1a	Merge branch 'master' into catch-combo-counter	2020-09-21 17:53:00 +09:00
Dean Herbert	141fbbf5bb	Merge pull request #10180 from smoogipoo/beatmap-conversion-cancellation ... Make beatmap conversion support cancellation tokens	2020-09-17 22:30:46 +09:00
smoogipoo	c7d24203ce	Make beatmap conversion support cancellation tokens	2020-09-17 17:40:05 +09:00
smoogipoo	009e1b4445	Make Spinner use cancellation token	2020-09-17 17:05:24 +09:00
Dan Balasescu	0761aab42f	Merge branch 'master' into catch-combo-counter	2020-09-15 17:20:31 +09:00
Dean Herbert	a8b405791a	Fix non-convert slider and spinner serialization	2020-09-14 17:32:32 +09:00
Dean Herbert	23b51e8f7f	Merge pull request #10106 from smoogipoo/score-recalc	2020-09-10 19:05:42 +09:00
Dean Herbert	ef44c7d063	Merge branch 'master' into score-recalc	2020-09-10 18:30:41 +09:00
Dean Herbert	df1537f2a0	Update framework	2020-09-10 18:10:39 +09:00
Dan Balasescu	6f6adb61d7	Merge pull request #10099 from peppy/add-editor-tool-icons ... Add icons for editor toolbox tools	2020-09-09 22:22:58 +09:00
Dean Herbert	fb2aced3ac	Add toggle for distance snap	2020-09-09 19:15:35 +09:00
Dean Herbert	c9f5005efd	Add icons for editor toolbox tools	2020-09-09 18:40:01 +09:00
smoogipoo	117c7ec6b2	Merge branch 'master' into score-recalc	2020-09-09 14:38:36 +09:00
Dean Herbert	4680728b9c	Merge branch 'master' into update-dcc-exclusions	2020-09-07 18:01:44 +09:00
Dan Balasescu	025ead195c	Merge branch 'master' into fix-sliderborder-more-thicker	2020-09-07 15:40:34 +09:00
Yao Chung Hu	96f39dd350	Merge remote-tracking branch 'upstream/master' into visible-playfield-boundary	2020-09-05 01:50:13 -05:00
smoogipoo	1143d5d992	Update class exclusion for dynamic compilation	2020-09-04 20:41:08 +09:00
Salman Ahmed	569a56eccb	Revert "Move adjustment to LegacySkinConfiguration as a default value" ... This reverts commit 18927304f1.	2020-09-04 13:33:23 +03:00
Dean Herbert	25e142965d	Strongly type and expose default beatmap information icon implementations for other rulesets	2020-09-04 15:01:32 +09:00