158 Commits

Author	SHA1	Message	Date
Dean Herbert	a55b2b8918	Add explosion effect when catching fruit	2020-02-21 18:09:50 +09:00
Dean Herbert	a7e3e8ace9	Merge branch 'master' into catch-drawable-namespace	2020-02-21 10:31:31 +09:00
Dean Herbert	8f5d3896f6	Remove unnecessary cast by changing method siganture	2020-02-20 15:45:47 +09:00
Dean Herbert	ea0bbd2926	Rename drawable namespace to avoid clashes with framework class	2020-02-19 18:01:59 +09:00
Dean Herbert	e1140d7c91	Fix caught fruit radius being incorrect due to moved scale	2020-02-19 17:28:40 +09:00
Dean Herbert	65320ace47	Merge branch 'master' into fix-catch-skin-change	2020-02-18 13:41:00 +09:00
Dean Herbert	79f3249d37	Fix typo in method	2020-02-18 13:40:50 +09:00
Dean Herbert	b4887f9120	Fix dropping fruit as well (with tidying along the way)	2020-02-18 12:24:22 +09:00
Dean Herbert	c51e5a8c1d	Fix osu!catch fruit exploding multiple timed is skin is changed during explode animation	2020-02-18 12:11:30 +09:00
Dean Herbert	a3e0f84fcc	Update catcher test to use SkinnableTestScene	2020-02-17 17:19:46 +09:00
smoogipoo	7b2f58eb30	Apply OnRelease method signature refactorings	2020-01-22 13:22:34 +09:00
smoogipoo	91735ff367	Update MathUtils namespace usages	2020-01-09 13:43:44 +09:00
Dean Herbert	3864ea6ca3	Move position updating logic back to CatcherArea	2019-11-29 18:24:46 +09:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08:00
Berkan Diler	6cab517b2d	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:37:47 +01:00
Huo Yaoyuan	7d7b9e36b2	Use compound assignment.	2019-11-12 19:53:50 +08:00
Dean Herbert	82561aa44a	Fix catcher additive sprite rewinding and remove unnecessary update code	2019-09-13 22:44:40 +09:00
Dean Herbert	744085fa54	Fix exploding fruit not getting correct lifetime	2019-09-13 20:25:08 +09:00
Dean Herbert	ec7a50b75f	Fix already caught osu!catch objects not correctly disappearing	2019-09-08 00:10:31 +09:00
Dean Herbert	fdd3687437	Fix catcher additive sprites staying on screen during rewind	2019-09-08 00:09:24 +09:00
iiSaLMaN	62edfe7327	Correct comment	2019-08-26 15:16:01 +03:00
Dean Herbert	48716f8f2b	Update framework	2019-08-21 13:29:50 +09:00
Lucas A	332ac0b82b	Fix CI inspections	2019-06-22 18:23:20 +02:00
Lucas A	e2f82ac29b	Move CatcherSprite to its own file + Make CatcherSprite a SkinReloadableDrawable	2019-06-22 17:53:00 +02:00
Arphox	07e17518e9	Fix all "Maintainability" CodeFactor issues	2019-06-11 10:28:16 +02:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	9bf48863b0	Fix DrawableRuleset drawable creation method's name	2019-03-25 00:00:29 +09:00
Dean Herbert	c496f6e56b	Fix usages of OnLoadComplete	2019-03-17 13:44:20 +09:00
Dean Herbert	42be7857d1	Use expression body for property get/set where possible	2019-02-28 13:58:19 +09:00
HoLLy	be6b5419c4	Remove uncommented line ... Didn't mean to push this	2019-01-31 18:10:44 +01:00
HoLLy	30292f44da	Fix Catch diffcalc being off	2019-01-31 17:57:59 +01:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
jorolf	023924396d	Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time	2018-11-11 18:38:12 +01:00
smoogipoo	cdeb4913c4	Adjust catcher size to match stable	2018-09-21 15:53:15 +09:00
Hanamuke	9b6f5c9097	Fix redundant paranthesis	2018-09-13 17:29:10 +02:00
Hanamuke	7d3380db66	Fixed comment. Created static CatchArea.GetCatcheWidth method	2018-09-13 17:01:33 +02:00
Dean Herbert	65018705f4	Restore IsLoaded check	2018-09-06 13:09:57 +09:00
Dean Herbert	c03d1d9566	Attempt to fix CI failures on CatcherArea.Explode	2018-09-06 10:14:23 +09:00
Dean Herbert	03084aa04b	Revert async changes	2018-08-31 07:07:10 +09:00
smoogipoo	1b279d383f	Use GetAsync on all textures	2018-08-27 17:26:44 +09:00
smoogipoo	35b5aeb99a	Fix missed rename	2018-08-06 12:23:08 +09:00
smoogipoo	9dff5cea07	Make Rulesets.Catch use the new judgement result structure	2018-08-02 20:37:07 +09:00
smoogipoo	71c49de031	Fix possible nullref if no fruits are ever caught	2018-07-26 21:00:18 +09:00
Dean Herbert	1d6609d9f3	Add common custom words to dotsettings dictionary ... Also fixes some typos and reduces spelling suggestions to hints.	2018-07-05 15:54:41 +09:00
Dean Herbert	f1a35f77d2	Make bananas explode even on miss	2018-06-29 16:49:01 +09:00
Dean Herbert	cc746c0dde	Merge remote-tracking branch 'upstream/master' into ekrctb-catch-stable-hyper	2018-06-26 13:02:39 +09:00
Dean Herbert	96191fc3ce	Move transition variable back to being local to function	2018-06-26 13:02:29 +09:00
ekrctb	d6084c0b30	Adapt to new input handling changes	2018-06-22 18:10:27 +09:00
smoogipoo	afcf91a4c5	What the...	2018-06-21 13:12:22 +09:00
smoogipoo	9314f49bc3	Expose the catch width from the Catcher	2018-06-21 12:57:59 +09:00
ekrctb	9194fd8dfe	don't expose HyperDashModifier directly	2018-06-20 20:08:27 +09:00
ekrctb	79c5596b27	Merge remote-tracking branch 'origin/master' into catch-stable-hyper	2018-06-20 19:06:54 +09:00
Dean Herbert	149d94116b	Fix droplets not bouncing off catcher's plate immediately	2018-06-15 15:44:47 +09:00
ekrctb	25d3f0ead1	Revert TestCaseCatcherArea	2018-06-03 15:31:51 +09:00
ekrctb	9f27dd848a	HyperDashModifier >= 1	2018-06-03 15:29:56 +09:00
ekrctb	dd7d54bcc7	Merge remote-tracking branch 'origin/master' into catch-stable-hyper	2018-06-02 18:42:40 +09:00
Dean Herbert	b7511251d9	Remove pointless FillMode specification	2018-05-31 12:50:01 +09:00
Dean Herbert	3fe25fe67d	Fix catcher sizing to (roughly) match stable	2018-05-25 17:33:53 +09:00
ekrctb	be323c7147	Fix InspectCode issues.	2018-05-25 02:14:56 +09:00
ekrctb	38e5e35743	modify catch hyperdash behavior	2018-05-25 01:20:05 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Dean Herbert	cb3d0db555	Move combo colours completely out of HitObjects	2018-03-20 15:50:12 +09:00
Dean Herbert	468205d450	Fix osu!catch autoplay missing bananas when running above 1x playback speed	2018-02-01 19:52:36 +09:00
Dean Herbert	32b540268e	Add more human-like catch autoplay support ... Closes #1611	2018-01-22 18:46:59 +09:00
Dean Herbert	b4b15b7dd0	Apply review fixes	2018-01-13 00:51:20 +09:00
Dean Herbert	9e10854840	Fix banannanananana showers not exploding enough	2018-01-12 22:30:35 +09:00
Dean Herbert	7b19353ed8	Fix weird fruit not fading out	2018-01-12 22:30:35 +09:00
Dean Herbert	93c4d58b69	Make catch plate fruit again	2018-01-12 22:30:35 +09:00
Dean Herbert	33fdc2c1d6	Add very basic replay handling	2018-01-12 18:35:28 +09:00
Dean Herbert	5b190d3cd2	Use correct container type when removing fruit ... (cherry picked from commit a2be7f7)	2018-01-11 20:55:25 +09:00
Dean Herbert	1c20fba6bc	Merge branch 'master' into drop-fruit	2018-01-10 12:29:53 +09:00
Dean Herbert	32e237d138	Merge branch 'master' into drop-fruit	2018-01-10 11:39:46 +09:00
Dean Herbert	9d099feadc	Merge branch 'master' into fix-catcher-width	2018-01-10 10:04:10 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
Dean Herbert	22fc9601ee	Add back missing code	2018-01-04 18:33:57 +09:00
Dean Herbert	f28053b2fc	Drop fruit when last in combo is not caught ... Also cleans up judgement handling a bit	2018-01-04 18:13:59 +09:00
Dean Herbert	0bbc15d24a	Clamp fruit to plate	2018-01-04 17:51:34 +09:00
Dean Herbert	5125abf681	Better plate alignment and stacking logic	2018-01-04 17:27:17 +09:00
Dean Herbert	722cad3674	Caught fruit sit behind plate	2018-01-04 17:25:51 +09:00
Dean Herbert	f45752c652	Fix catcher's catchable width being half of what it should	2018-01-04 16:29:39 +09:00
Dean Herbert	e75d73ac1c	Change hyperdash colour again	2017-12-01 20:13:46 +09:00
Dean Herbert	273793f185	Add comments	2017-12-01 20:08:49 +09:00
Dean Herbert	25207c51b5	Add directionality	2017-12-01 20:07:28 +09:00
Dean Herbert	445bb70ef5	Add hyperdash visual testing to TestCaseCatcherArea ... Also tidies up hyperdash state logic	2017-12-01 19:58:00 +09:00
Dean Herbert	51cae24a26	Add basic hyperdash movement ... Doesn't restrict direction yet. Also improves readability of fruit catch detection.	2017-12-01 19:33:13 +09:00
Dean Herbert	2bb61e51ac	Add catcher scale based on CircleSize	2017-11-28 19:43:26 +09:00
Dean Herbert	b517523f4a	Add back CatcherArea to simplify layout	2017-11-28 18:39:45 +09:00
Dean Herbert	7168629b2a	Remove CatcherArea abstraction ... Also fixes catcher size being relative to aspect ratio.	2017-10-02 21:55:37 +08:00
Dean Herbert	0aa152974a	Add interfaces to CatchBaseHit	2017-09-19 21:40:38 +09:00
Dean Herbert	4b68950428	Fix incorrect coordinate mapping on fruit explosion	2017-09-19 21:39:53 +09:00
Dean Herbert	c88b0784da	Use MaxValue instead of PositiveInfinity	2017-09-19 21:39:17 +09:00
Dean Herbert	e52a4fe72c	Put caught fruit in their own container to reduce casting	2017-09-18 12:33:01 +09:00
Dean Herbert	cfcb0c1c6e	Add (incorrectly) exploding fruit	2017-09-15 21:26:36 +09:00
Dean Herbert	b9ab034f94	Fix catcher movement speed being way too slow ... Now matches osu-stable	2017-09-15 19:32:46 +09:00
Dean Herbert	fb7740a3ab	Update all dependencies in line with framework	2017-09-13 20:25:40 +09:00
Dean Herbert	f32d444d68	Remove generics from Playfield (fixes catch)	2017-09-12 18:19:28 +09:00
Dean Herbert	1194e46ef1	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-12 17:46:21 +09:00
smoogipooo	19db7a8f72	Update in line with framework changes.	2017-09-07 22:46:21 +09:00
smoogipooo	ac8ec31b61	Make judgements able to be "added" plus make everything compile and run.	2017-09-06 17:02:13 +09:00