931 Commits

Author	SHA1	Message	Date
ekrctb	fe85b7d482	Remove unused import	2020-11-27 10:18:00 +09:00
ekrctb	57454bbb1c	Remove hitObject argument from OnApply and OnFree	2020-11-27 10:13:05 +09:00
smoogipoo	0414e5c550	Add MaximumJudgementOffset to DrawableHitObject, use in more places	2020-11-26 01:12:42 +09:00
smoogipoo	c744db1b57	Rewind pooled DHOs into better states	2020-11-26 00:42:25 +09:00
Dan Balasescu	87ce8a53ff	Merge branch 'master' into on-drawable-hitobject-added	2020-11-24 16:09:57 +09:00
Bartłomiej Dach	1c31a4a6b6	Expose animation start time as mutable in interface	2020-11-22 13:11:22 +01:00
ekrctb	c506b438bf	Remove more code and make some methods private	2020-11-22 18:51:16 +09:00
Bartłomiej Dach	240c1b0aef	Add support for changing animation start time after load	2020-11-21 20:06:30 +01:00
ekrctb	295ca38cda	Merge remote-tracking branch 'origin/master' into on-drawable-hitobject-added	2020-11-21 15:25:16 +09:00
Dan Balasescu	4213d6bdba	Merge pull request #10890 from peppy/legacy-jugement-match-stable-transforms ... Adjust judgement animations to match stable	2020-11-20 21:47:21 +09:00
Dan Balasescu	79752bcb19	Merge branch 'master' into legacy-jugement-match-stable-transforms	2020-11-20 20:51:27 +09:00
ekrctb	cd16a3fa61	Use event instead of using custom pools (osu)	2020-11-20 17:56:47 +09:00
smoogipoo	7bd75eca81	Separate classes	2020-11-20 16:53:08 +09:00
smoogipoo	c1f56cd0ba	Remove aliveness hackery	2020-11-20 16:52:27 +09:00
smoogipoo	85eb98a7ec	Clean up some code reuse	2020-11-20 16:43:07 +09:00
smoogipoo	2418f17b0c	Fix lifetime not being set correctly in some cases	2020-11-20 16:19:02 +09:00
smoogipoo	2ed2ddfe8a	Rename methods	2020-11-20 15:39:29 +09:00
smoogipoo	33eea64cfc	Fix follow points not updating on positional changes	2020-11-20 15:31:04 +09:00
smoogipoo	2fc53a278d	Add back reorder support	2020-11-20 14:10:28 +09:00
smoogipoo	17ff7fe163	Fix failing test due to early lifetime end	2020-11-20 13:55:27 +09:00
smoogipoo	a3145ed96d	Fix test compile errors	2020-11-20 13:54:41 +09:00
smoogipoo	d467a00eea	Add initial followpoint pooling implementation	2020-11-20 00:11:31 +09:00
smoogipoo	688a04c2ff	Make slider/spinner use pooled samples	2020-11-19 20:40:30 +09:00
Dean Herbert	7f3c8ad744	Merge pull request #10872 from smoogipoo/fix-missing-triangles	2020-11-19 14:11:08 +09:00
Dean Herbert	3024ae6d86	Add better test coverage of hit lighting (and ensure reset after animation reapplication)	2020-11-19 14:10:07 +09:00
Bartłomiej Dach	24d7fa03d8	Merge branch 'master' into legacy-jugement-match-stable-transforms	2020-11-18 20:33:58 +01:00
Bartłomiej Dach	5156de3a10	Merge branch 'master' into fix-judgement-transform-logic	2020-11-18 19:20:11 +01:00
Dean Herbert	d017e725fb	Add comment for future todo task	2020-11-18 19:03:34 +09:00
Dean Herbert	9d3de5bca0	Fix hit lighting dictating lifetime even when not present in skin	2020-11-18 19:03:34 +09:00
Dean Herbert	72a15ef2dc	Handle DrawableJudgement lifetime more flexibly	2020-11-18 19:03:34 +09:00
Dean Herbert	94886a09b2	Remove fades from DrawableJudgement itself	2020-11-18 19:03:34 +09:00
smoogipoo	ce4baf328d	Move into OnApply() to resolve one-frame issues	2020-11-17 23:35:36 +09:00
smoogipoo	04805b78c3	Tighten osu! ruleset lifetime expiry for past hitobjects	2020-11-17 23:20:19 +09:00
Dean Herbert	8247e6ce91	Move result type to ctor	2020-11-17 15:43:54 +09:00
Dean Herbert	f465dd5a5e	Move all extended animation logic out of DrawableJudgement	2020-11-17 14:59:34 +09:00
Dean Herbert	82c3925a37	Remove unused DrawableOsuJudgement constructors	2020-11-17 14:13:51 +09:00
Dean Herbert	9dfa4249e0	Make Apply non-virtual	2020-11-17 14:05:13 +09:00
smoogipoo	c101f32db8	Reset osu! triangle pieces on hitobject application	2020-11-17 13:06:52 +09:00
smoogipoo	84b42f207d	Fix triangles disappearing after a while	2020-11-16 23:14:20 +09:00
smoogipoo	4cf6aca873	Fix slider ball tint not working	2020-11-16 22:40:25 +09:00
Bartłomiej Dach	532680bb36	Manually reset rest of rotation tracker state on object application	2020-11-14 23:23:11 +01:00
Bartłomiej Dach	727a886fb3	Move spinner completion info into judgement	2020-11-14 23:08:47 +01:00
Bartłomiej Dach	af392e3995	Move rate adjusted spinner rotation into judgement result	2020-11-14 21:10:12 +01:00
Dean Herbert	7ac4d2c4be	Move "drawable" to first prefix	2020-11-14 18:05:30 +09:00
Dean Herbert	90f37ff4ab	Rejig namespaces	2020-11-14 18:04:59 +09:00
smoogipoo	3f0a127196	Fix slider/spinner samples not being disposed	2020-11-12 18:51:58 +09:00
smoogipoo	3f78d81386	Add nested osu! hitobject pooling	2020-11-12 15:59:48 +09:00
smoogipoo	bf72961959	Add top-level osu! hitobject pooling	2020-11-12 15:39:02 +09:00
smoogipoo	606cfacedf	Fix state update exception in a better way	2020-11-11 19:01:12 +09:00
Dean Herbert	a82291f31f	Merge pull request #10776 from smoogipoo/fix-possible-nullref ... Fix possible nullref with non-attached hitobjects	2020-11-11 11:14:57 +09:00
smoogipoo	81844878b0	Fix possible nullref with non-attached hitobjects	2020-11-11 00:29:34 +09:00
smoogipoo	b1e039bcec	Prevent overrides from messing with application/freeing	2020-11-07 00:40:26 +09:00
smoogipoo	3a4bd73823	Fix DHOs being freed when not expected	2020-11-07 00:25:26 +09:00
smoogipoo	e190afbfed	Remove initial value changed invocations	2020-11-07 00:00:25 +09:00
smoogipoo	33b629a87a	Make top-level osu! objects use new methods	2020-11-06 23:09:23 +09:00
Dean Herbert	e0ef777e87	Merge branch 'master' into fix-hitcircle-glow-on-skin-change	2020-11-06 16:47:56 +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
Dean Herbert	a43166e8a9	Merge branch 'master' into followpointrenderer-hitobject	2020-11-05 15:42:09 +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	4457e363d3	Bring back local variables to reduce two-level-deep variable access	2020-11-05 15:22:40 +09:00
smoogipoo	9c1c9945af	Make FollowPointRenderer use hitobject models	2020-11-05 15:01:45 +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
smoogipoo	9a7fcadabc	Use BDL for top-level osu! DHOs	2020-11-05 13:51:46 +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	b069372b29	Fix skin changes resulting in incorrectly applied transforms in MainCirclePiece	2020-11-03 17:49:48 +09:00
Dean Herbert	ed982e8dd1	Make stacked hitcircles more visible when using default skin	2020-10-06 14:09:31 +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
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
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
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	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	fce3eacd7d	Move tail circle to display beneath ticks etc.	2020-10-02 14:50:03 +09:00
smoogipoo	ba76089219	Fix spinner flashing yellow glow before completion	2020-10-01 20:24:32 +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	b7ac779760	Merge branch 'master' into fix-hitobject-sample-stuck-on-future-seek	2020-10-01 16:46:14 +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
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	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
smoogipoo	b6bc829bd5	Guard against nulls (load not run)	2020-09-28 17:46:22 +09:00
Dean Herbert	e60e47ff66	Unbind events on disposal	2020-09-28 17:41:10 +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	7df8b5bce7	Merge branch 'master' into fix-spinner-rpm-user-rate-adjust	2020-09-25 13:17:03 +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
Dean Herbert	b1f7cfbd5b	Reduce children levels in RingPiece	2020-09-22 17:34:21 +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
smoogipoo	acbeb5406f	Add/improve xmldoc	2020-08-31 13:33:41 +09:00
Bartłomiej Dach	5f35b3ebb9	Fix constant casing	2020-08-15 20:44:02 +02:00
Ron B	390e872730	Fix acoording to review	2020-08-15 21:34:17 +03:00
Ron B	a1079bac32	Move frequency values into consts	2020-08-15 21:19:47 +03:00
Ron B	40445d0005	replicate osu-stable behaviour for spinningSample frequency	2020-08-15 21:07:44 +03:00
Ron B	07c25d5a78	Move spinnerFrequencyModulate set to ApplySkin	2020-08-15 20:51:33 +03:00
Ron B	5c11270b98	Add SpinnerFrequencyModulate skin config option	2020-08-15 20:12:06 +03:00
Dean Herbert	05b06e7451	Merge branch 'master' into fix-skinnable-sound-mute	2020-08-12 22:01:04 +09:00
Bartłomiej Dach	cca78235d5	Replace CumulativeRotation with RateAdjustedRotation	2020-08-10 23:02:06 +02:00
Dean Herbert	365aae799e	Merge branch 'master' into fix-skinnable-sound-mute	2020-08-10 23:55:51 +09:00
Bartłomiej Dach	a636c7052c	Merge branch 'master' into adujustable-skinnablesound	2020-08-08 21:51:47 +02:00
Dean Herbert	0d1f273603	Merge branch 'master' into fix-skinnable-sound-mute	2020-08-08 23:24:03 +09:00
smoogipoo	3c3756e42d	Merge branch 'master' into expand-number-piece-on-old-skins	2020-08-07 16:36:58 +09:00
Dean Herbert	e3105fd4c8	Add more resilient logic for whether to avoid playing SkinnableSound on no volume	2020-08-06 19:16:26 +09:00
smoogipoo	9a00ad48c6	Update components to use extension methods	2020-08-06 14:43:39 +09:00
Dean Herbert	bb73489ae5	Fix very short spinners being impossible to complete	2020-08-05 18:46:58 +09:00
Salman Ahmed	2771c95bec	Merge remote-tracking branch 'upstream/master' into expand-number-piece-on-old-skins	2020-08-04 22:17:54 +03:00
smoogipoo	cd9896c35e	Merge branch 'master' into spinner-spinning	2020-08-01 01:06:53 +09:00
Dean Herbert	180afff805	Ensure damp is always positive exponent	2020-08-01 00:39:04 +09:00
Dean Herbert	bb01ee5be9	Fix trackign alpha not being applied	2020-08-01 00:27:00 +09:00
Dean Herbert	86784e30ad	Fix spacing	2020-07-31 09:54:30 +09:00
Dean Herbert	cd570433f4	Move private methods to bottom of class	2020-07-31 09:04:20 +09:00
Dean Herbert	8e49256a5c	Rename and split up statement to make more legible	2020-07-31 09:03:29 +09:00
Dean Herbert	38a4bdf068	Add spinner spin sample support	2020-07-30 19:34:59 +09:00
Dean Herbert	c1085d49d3	Add more xmldoc	2020-07-30 12:55:34 +09:00
Dean Herbert	54fee7e716	Simplify and standardise scale for default display	2020-07-30 11:50:13 +09:00
Dean Herbert	64c7ae7686	Fix hit transforms not playing out correctly	2020-07-30 11:25:49 +09:00
Dean Herbert	2b71ffa2ed	Add back legacy implementations	2020-07-29 22:32:21 +09:00
Dean Herbert	023feaf438	Refactor to centralise implementation into a single component ... Turns out this is a better way forward.	2020-07-29 22:31:52 +09:00
Dean Herbert	2a5e9fed4d	Move default background implementation out of DrawableSpinner	2020-07-29 18:15:19 +09:00
Dean Herbert	2cd6e89cb0	Move default centre implementation out of DrawableSpinner	2020-07-29 18:02:12 +09:00
Dean Herbert	1c00cf95d5	Add initial support for spinner middle skinning	2020-07-29 16:55:47 +09:00
Dean Herbert	e98154b432	Add initial support for spinner background layer	2020-07-29 16:37:32 +09:00
Dean Herbert	d01d1ce3f1	Add initial support for spinner disc skinning	2020-07-29 16:25:10 +09:00
Dean Herbert	afceab685b	Merge pull request #9688 from peppy/less-spinner-bonus-score ... Reduce spinner tick and bonus score	2020-07-28 14:21:48 +09:00
Dean Herbert	dc577aa6fa	Fix display of bonus score	2020-07-28 11:22:58 +09:00
Bartłomiej Dach	7ad3101d08	Bring back custom fade-out delay if hit lighting is on	2020-07-27 19:21:01 +02:00
Bartłomiej Dach	21ae33e284	Determine whether to show lighting at prepare time	2020-07-27 19:07:21 +02:00
Bartłomiej Dach	bbc7d69524	Add failing test cases	2020-07-27 19:07:21 +02:00
Dean Herbert	82e4050fdd	Fix xmldoc	2020-07-24 19:41:34 +09:00
Dean Herbert	0050f6348f	Merge branch 'master' into add-spinner-bonus-score	2020-07-23 23:05:04 +09:00
smoogipoo	c348599189	Merge branch 'master' into add-slider-slide-support	2020-07-23 21:24:45 +09:00
smoogipoo	f883cb85d7	Null out the sample too	2020-07-23 21:24:31 +09:00
Dan Balasescu	f106106dc4	Merge pull request #9648 from peppy/fix-slider-ball-rotation ... Fix slider ball rotation being applied to follow circle and specular layer	2020-07-23 19:39:58 +09:00
Dean Herbert	113fac84dd	Fix circle container type	2020-07-22 21:14:04 +09:00
Dean Herbert	bd6a51f545	Hide slider repeat judgements temporarily	2020-07-22 19:30:10 +09:00
Dean Herbert	53a9ac3c1a	Fix slider ball rotation being applied to follow circle and specular layer	2020-07-22 19:06:39 +09:00
Dean Herbert	2126f6bffc	Add slider "sliding" sample support	2020-07-22 16:37:58 +09:00
Dean Herbert	1560e1786a	Revert back to bool for application	2020-07-21 19:48:44 +09:00
Dean Herbert	7f2ae694cc	Simplify rewind handling	2020-07-21 19:21:30 +09:00
Dean Herbert	947f4e0d4c	Move tick handling to DrawableSpinner itself	2020-07-21 19:20:19 +09:00
Dean Herbert	05102bc1ba	Split ticks up into bonus and non-bonus	2020-07-21 18:22:37 +09:00
Salman Ahmed	35ad409da6	Fix spinner bonus ticks samples not actually playing	2020-07-21 06:59:29 +03:00
Dean Herbert	4dd40542d5	Rename rotation set method to match others	2020-07-21 11:31:29 +09:00
Dean Herbert	f48984920d	Change bonus volume logic to work	2020-07-21 11:31:29 +09:00
Dean Herbert	35d53139e7	Merge branch 'master' into add-spinner-bonus-score	2020-07-21 11:21:17 +09:00
Dean Herbert	e06d3c5812	Minor adjustments to tick clearance	2020-07-20 17:52:59 +09:00
Dean Herbert	4cbc176cb6	Add less fill and more transparency	2020-07-20 17:50:11 +09:00
Dean Herbert	33e58bb7db	Fix sizing and colour not correct on hit	2020-07-20 17:22:30 +09:00
Dean Herbert	55d921ef85	Improve feel of animation	2020-07-20 17:22:30 +09:00
smoogipoo	8a3cadc111	Fix judgement animations not resetting on use	2020-07-13 21:21:59 +09:00
Dean Herbert	dd025262d0	Fix one more nullref	2020-07-10 22:48:34 +09:00
Dean Herbert	0a61f80c8b	Remove result nullable check	2020-07-10 22:39:35 +09:00
Dean Herbert	13205319f3	Fix null reference if hit lighting is disabled	2020-07-10 22:37:29 +09:00
Dean Herbert	f872343bab	Make Apply virtual to further simplify application process	2020-07-10 18:35:20 +09:00
Dean Herbert	3138cc455c	Merge branch 'master' into judgement-pooling	2020-07-10 17:15:19 +09:00
Dean Herbert	efb2c2f4ae	Rename variable to be more clear on purpose	2020-07-09 12:01:00 +09:00
Bartłomiej Dach	4cd874280c	Add clarifying xmldoc for RotationAbsolute	2020-07-08 22:37:50 +02:00
Bartłomiej Dach	213dfac344	Fix broken spinner rotation logic	2020-07-08 22:37:50 +02:00
Bartłomiej Dach	d229993e5c	Use RotationAbsolute instead	2020-07-05 02:12:26 +02:00
Bartłomiej Dach	cd6bdcdb88	Replace further spinner transforms with manual lerp	2020-07-05 00:25:01 +02:00
Dean Herbert	ffec4298a7	Use DrawablePool for DrawableJudgements	2020-07-04 16:45:50 +09:00
Dean Herbert	9119f41604	Merge branch 'master' into results-screen-statistics-overlapping-transition	2020-06-24 18:22:51 +09:00
Dean Herbert	14ad3835ff	Update naming	2020-06-23 21:27:01 +09:00
smoogipoo	eab00ec9d9	Move hit events to the ScoreProcessor	2020-06-19 19:58:35 +09:00
smoogipoo	900da88498	Populate hit offsets from score processor	2020-06-15 22:44:55 +09:00
smoogipoo	f3b5149648	Move some suggestions to warnings, resolve issues	2020-06-03 16:48:44 +09:00
smoogipoo	efff2bf15d	Add HitObject to DefaultsApplied event	2020-05-08 18:49:19 +09:00
alex	0e2ccac33b	Add spaces to comments	2020-05-04 18:36:24 -07:00
smoogipoo	4e4fe5cc90	Fix slider heads not being blocked when hit out of order	2020-04-17 14:33:29 +09:00
Dean Herbert	65b96079a0	Move dampening to base implementation and change range to 0..1	2020-04-13 13:01:02 +09:00
Fire937	22d89dbff7	Merge branch 'master' of https://github.com/ppy/osu into stereo-shifted-playback	2020-04-12 01:46:32 +02:00
Fire937	f274ec297c	Add positional sound support for all rulesets ... The SamplePlaybackBalance is calculated in a way that the balance remains between -0.4 and 0.4. Positional sound is not supported in osu!taiko.	2020-04-12 01:33:25 +02:00
smoogipoo	10e849d196	Separate into separate class	2020-04-10 02:02:09 +09:00
smoogipoo	a2f5a469cf	Merge branch 'master' into add-notelock	2020-04-10 01:18:54 +09:00
Dean Herbert	87b29007c2	Merge pull request #8626 from LittleEndu/arrow-easing ... Don't allow new transformations for reverse arrow after it's hit	2020-04-08 23:34:02 +09:00
Dean Herbert	067ec27859	Also fix slider repeat circles	2020-04-08 18:59:31 +09:00
Dean Herbert	f3e909539d	Fix slider ball and follow circle blending for legacy skins	2020-04-08 18:39:18 +09:00
Endrik Tombak	0b70c20aa3	Merge branch 'master' of https://github.com/ppy/osu into arrow-easing	2020-04-07 17:16:56 +03:00
Endrik Tombak	16d906d769	Get rid of unnecessary removal	2020-04-07 17:16:06 +03:00
Dan Balasescu	bbbc13021b	Merge branch 'master' into fix-sliderball-acent-colour	2020-04-07 13:53:48 +09:00