425 Commits

Author	SHA1	Message	Date
ekrctb	8d32cca5d6	Use more specific type for caught object	2020-12-03 16:44:36 +09:00
ekrctb	a231a4aa6d	Remove unused method	2020-12-03 16:44:36 +09:00
ekrctb	af45e8d97b	Don't delay caught fruit loading ... It is not needed anymore because some code in DCHO is moved from `load` to constructor.	2020-12-03 16:44:36 +09:00
ekrctb	e5c8e06c4b	Create children in the constructor	2020-12-03 16:44:36 +09:00
Dan Balasescu	2e0fdf9bca	Merge pull request #11011 from ekrctb/catch-pooling-initial ... Initial implementation of hit object pooling in osu!catch ruleset	2020-12-02 13:02:22 +09:00
ekrctb	e8842eed81	Use bigger initial capacity for catch hit object pool	2020-12-01 14:50:42 +09:00
ekrctb	a16b265090	Apply suggested styling changes	2020-12-01 14:46:04 +09:00
smoogipoo	5945c088cb	A few code standard cleanups	2020-12-01 12:57:37 +09:00
ekrctb	08cb84b325	Pool osu!catch hit explosion	2020-12-01 11:32:20 +09:00
ekrctb	d1076778fd	Convert switch expression to switch statement	2020-12-01 09:50:52 +09:00
ekrctb	70628235e3	Use hit object pooling for BananaShower.	2020-11-30 19:22:40 +09:00
ekrctb	9611aaf09e	Use hit object pooling for JuiceStream. ... - Use `Clear(false)` to not dispose pooled children. - Don't set nested DHO `Origin`. - Simplify the layout (remove custom `Origin`).	2020-11-30 19:19:14 +09:00
ekrctb	b76ae525b2	Use hit object pooling for Fruit and Banana.	2020-11-30 19:07:50 +09:00
ekrctb	94fd607a7c	Use hit object pooling for Droplet and TinyDroplet.	2020-11-30 19:04:09 +09:00
ekrctb	05aaa377e7	Don't use CreateDrawableRepresentation in CatcherArea	2020-11-30 19:02:49 +09:00
Dean Herbert	9fbfb1aa9f	Add comment explaining requirement	2020-11-30 15:22:55 +09:00
Dean Herbert	73990a6674	Fix osu!catch combo counter not showing after 1 combo	2020-11-30 15:20:52 +09:00
ekrctb	c99d34d140	Merge branch 'master' into palpable-catch-hit-object	2020-11-26 12:24:57 +09:00
ekrctb	3c3229ac4b	Remove redundant StaysOnPlate	2020-11-25 07:59:45 +09:00
ekrctb	ab7251d742	Move members to PalpableCatchHitObject	2020-11-24 19:57:37 +09:00
ekrctb	c506b438bf	Remove more code and make some methods private	2020-11-22 18:51:16 +09:00
ekrctb	4345d8dcb6	Event -> virtual method	2020-11-21 15:20:33 +09:00
ekrctb	82aefa3868	Rework and rename to OnNewDrawableHitObject. ... The semantics is changed and hopefully more clear.	2020-11-21 00:27:19 +09:00
ekrctb	468b2a97cb	Use events instead of overriding Add (catch)	2020-11-20 17:56:47 +09:00
Dean Herbert	4024b44a53	Fix unsafe manipulation of parent's children from child	2020-10-19 17:41:21 +09:00
Bartłomiej Dach	2b1ef16f89	Replace comparison references to HitResult.Miss with IsHit	2020-10-02 23:31:24 +02:00
smoogipoo	4ca9a69de2	Use new hit results in catch	2020-09-29 16:33:38 +09:00
Dean Herbert	1c58f568d6	Simplify and reformat rewind/transform logic	2020-09-22 12:54:21 +09:00
Dean Herbert	08d8975566	Remove DisplayInitialCombo method for simplicity	2020-09-22 12:35:18 +09:00
Bartłomiej Dach	fcf3a1d13c	Encapsulate combo display better	2020-09-12 22:40:34 +02:00
Salman Ahmed	a0a4501008	Merge remote-tracking branch 'upstream/master' into catch-combo-counter	2020-09-01 20:17:25 +03:00
Salman Ahmed	ba8a4eb6f0	Move osu!catch combo counter display to inside CatcherArea	2020-09-01 20:17:21 +03:00
Salman Ahmed	cf6b34db1e	Merge remote-tracking branch 'upstream/master' into catch-combo-counter	2020-08-22 13:07:28 +03:00
smoogipoo	62d833d63d	Fix comment	2020-08-21 13:14:50 +09:00
smoogipoo	6ad7a3686b	Simplify condition	2020-08-21 13:13:08 +09:00
smoogipoo	855b5ba4ed	Merge branch 'master' into add-droplet-hypers	2020-08-21 13:09:16 +09:00
Dean Herbert	f0ba587515	Merge branch 'master' into fix-catch-double-sample	2020-08-21 12:38:29 +09:00
Bartłomiej Dach	9546fbb64b	Prevent catcher from performing invalid catches	2020-08-20 19:06:29 +02:00
Bartłomiej Dach	28534c1599	Reintroduce PalpableCatchHitObject at data level	2020-08-20 19:06:26 +02:00
smoogipoo	f956c9fe37	Clobber in a gameplay test	2020-08-21 02:01:29 +09:00
Dean Herbert	a94a86178b	Align osu!catch playfield with stable 1:1	2020-08-20 19:12:37 +09:00
Dean Herbert	1f14d9b690	Use correct width adjust for osu!catch playfield	2020-08-20 18:15:06 +09:00
Salman Ahmed	af52b73b06	Fill out missing documentation	2020-08-19 08:39:40 +03:00
Salman Ahmed	d4bde0afe5	Do not pass accent value on a reverted miss judgement	2020-08-19 08:18:30 +03:00
Salman Ahmed	4dbf695bca	Fix wrong ordering	2020-08-04 00:04:00 +03:00
Salman Ahmed	f37ba49f7f	Add catch-specific combo counter with its legacy design	2020-08-03 22:13:02 +03:00
Dean Herbert	02678c04d5	Merge pull request #9556 from gagahpangeran/toggle-hit-lighting-catch	2020-07-17 17:06:40 +09:00
Dan Balasescu	ab477c3be4	Remove returns xmldoc	2020-07-16 15:55:35 +09:00
Dean Herbert	c42b315abb	Expose via CreateProxiedContent method	2020-07-16 15:35:19 +09:00
Dean Herbert	3666599053	Remove space	2020-07-15 22:00:48 +09:00
Dean Herbert	72789dc0aa	Remove redundant array spec	2020-07-15 21:52:37 +09:00
Dean Herbert	2624862e32	Fix osu!catch dropping fruit appearing above the plate instead of behind	2020-07-15 20:58:09 +09:00
Gagah Pangeran	3e2d184a91	change hitlighting bool to bindable	2020-07-14 10:52:34 +07:00
Gagah Pangeran	a25f4880d6	disable hit explotion when hit lighting off	2020-07-14 10:35:01 +07:00
ekrctb	3278a1d7d8	Standardize osu!catch coordinate system ... There were two coordinate systems used: - 0..512 (used in osu!stable) - 0..1 (relative coordinate) This commit replaces the usage of the relative coordinate system to the coordinate system of 0..512.	2020-07-02 00:21:45 +09:00
Bartłomiej Dach	5bab53b04c	Centralise trail visibility state management	2020-05-10 17:05:30 +02:00
Salman Ahmed	b44a70ef9a	Let the catcher be responsible for stopping the trails	2020-05-07 01:46:37 +03:00
Bartłomiej Dach	25f73c0b9f	Add [NotNull] annotation	2020-05-06 23:40:36 +02:00
Bartłomiej Dach	52d1e2b5f8	Improve xmldoc	2020-05-06 23:28:54 +02:00
Bartłomiej Dach	ed83ac188e	Remove special case for moving catcher sprite	2020-05-06 23:25:25 +02:00
Salman Ahmed	278c3795e4	Merge remote-tracking branch 'upstream/master' into catch-hyperdash-catcher-colouring	2020-04-23 05:21:56 +03:00
Salman Ahmed	883788dd5a	Privatize externally-unused methods	2020-04-22 07:37:49 +03:00
Salman Ahmed	fccb30e031	Adjust documents ... *whoops*	2020-04-22 07:36:59 +03:00
Salman Ahmed	f841eb7e06	Replace constructing a whole Catcher with static calculation methods	2020-04-22 07:27:15 +03:00
Salman Ahmed	2d4077e713	Reword special default hyper-dash colour constant a bit	2020-04-22 05:25:40 +03:00
Salman Ahmed	9ab0f6d8bc	Separate trail-related logic to its own container	2020-04-22 05:12:29 +03:00
Salman Ahmed	95de2c6f7f	Mark Catcher.additiveTarget to never be null ... And provide empty containers instead.	2020-04-22 05:04:07 +03:00
Salman Ahmed	c8c2b51108	Remove redundant property set ... Co-Authored-By: Dean Herbert <pe@ppy.sh>	2020-04-21 11:44:39 +03:00
Salman Ahmed	ee62739b08	Simplify process of adding catcher trails	2020-04-21 11:44:39 +03:00
Salman Ahmed	a82efa626e	Add XMLDoc for default hyper-dash colour constant	2020-04-21 11:44:39 +03:00
Salman Ahmed	282d100109	Fix XMLDoc references	2020-04-21 06:09:57 +03:00
Salman Ahmed	9373520bca	Add constant for special colour of catcher on default skin	2020-04-21 05:59:37 +03:00
Salman Ahmed	e17a44c99b	Merge branch 'master' of github.com:ppy/osu into catch-hyperdash-catcher-colouring	2020-04-21 05:58:56 +03:00
Salman Ahmed	d27d8671ab	Convert all static getter-only properties to static readonly fields	2020-04-08 14:23:29 +03:00
Salman Ahmed	42ccee5e6c	Fix CI issue	2020-04-05 00:15:42 +03:00
Salman Ahmed	0014a8404e	GetHyperDashEndGlowColour() -> GetHyperDashCatcherAfterImageColour()	2020-04-04 23:12:42 +03:00
Salman Ahmed	19f39fe632	Change AdditiveTarget into a set method	2020-04-04 19:33:52 +03:00
Salman Ahmed	fbe95a52e3	Remove unnecessary restating comment	2020-04-04 19:29:41 +03:00
Salman Ahmed	50604dc7b2	Update catcher hyper-dashing colours on changing hyper-dash state only	2020-04-04 19:29:06 +03:00
Salman Ahmed	f3bcb0628c	Add helper methods for retrieving other skin hyper-dash colours	2020-04-04 19:09:52 +03:00
Salman Ahmed	ee247e58c8	Merge branch 'catch-hyperdash-fruit-colouring' into catch-hyperdash-catcher-colouring	2020-04-04 18:07:29 +03:00
Salman Ahmed	f67a62699b	Merge remote-tracking branch 'upstream/master' into catch-hyperdash-fruit-colouring	2020-04-03 19:57:52 +03:00
Dean Herbert	51db361c32	Update usages of Animation and Video in line with framework changes	2020-04-03 16:00:06 +09:00
Dean Herbert	f653d37058	Merge pull request #8521 from peppy/remove-scale-down-to-fit ... Remove ScaleDownToFit as it was implemented without enough safety	2020-03-31 23:22:04 +09:00
Dean Herbert	b7d73f96ea	Fix osu!catch catcher hit area being too large	2020-03-31 18:33:09 +09:00
Dean Herbert	1fce7cce01	Remove ScaleDownToFit as it was not implemented without enough safety	2020-03-31 13:50:04 +09:00
Salman Ahmed	c2e31f53f1	Merge remote-tracking branch 'upstream/master' into catch-hyperdash-fruit-colouring	2020-03-28 07:44:11 +03:00
Dean Herbert	2949e8dc27	Reduce spread of stacked fruit	2020-03-26 16:58:23 +09:00
Salman Ahmed	fecafc2e48	Fix additive target accidentally clears all of the added containers ... It sets the AdditiveTarget on the object initializer but then the catcher is set to Child which wipes up all of the existing children (containers added by Catcher through AdditiveTarget setter)	2020-03-26 09:14:44 +03:00
Salman Ahmed	302fdd834a	Add support for custom hyper-dash catcher colouring	2020-03-26 09:11:59 +03:00
Salman Ahmed	e3a7c8a124	Make catcher trails colouring per container	2020-03-26 09:11:31 +03:00
Salman Ahmed	0a368f13d9	Add default hyper-dash colour constant on Catcher	2020-03-26 05:42:11 +03:00
Dean Herbert	388cf5c83a	Fix catch positional data being incorrectly recorded	2020-03-24 15:38:54 +09:00
Dean Herbert	96a849f897	Add remaining replay recorders	2020-03-24 14:55:49 +09:00
Bartłomiej Dach	f904859943	Remove leftover unused private methods	2020-03-15 15:45:13 +01:00
Dean Herbert	d3f23b766e	Move across to new file in line with master	2020-03-14 17:06:23 +09:00
Dean Herbert	9ea0e83f3d	Merge branch 'master' into correct-trail-animation-frame	2020-03-14 16:57:35 +09:00
Dean Herbert	45dfb22bd5	Centralise additive texture creation	2020-03-14 16:39:44 +09:00
Dean Herbert	202c8cdad8	Add braces to satisfy codefactor	2020-03-14 15:35:59 +09:00
Dean Herbert	1733519c3a	Split out CatcherArea nested classes and reorder methods	2020-03-13 12:59:30 +09:00
Dean Herbert	c30bfa79e7	Merge branch 'master' into correct-trail-animation-frame	2020-03-13 09:55:41 +09:00
Andrei Zavatski	bc2a1cdb62	Apply suggestions	2020-03-12 12:04:36 +03:00
Andrei Zavatski	e46c070d95	Add test scene	2020-03-11 23:09:29 +03:00
Andrei Zavatski	09b9983286	Fix CatcherAnimationState is Fail if missing banana shower	2020-03-11 21:14:07 +03:00
Dan Balasescu	03c8140d3c	Merge branch 'master' into add-catcher-animation-states	2020-03-11 14:53:14 +09:00
Dean Herbert	73b225ad62	Make catcher's trail reflect the current animation frame rather than play the full animation	2020-03-11 14:28:13 +09:00
Dean Herbert	1bad2ff879	Load all catcher states ahead-of-time to avoid blocking loads	2020-03-11 13:45:55 +09:00
Dean Herbert	eab544b49f	Add afterimage glow when entering hyperdash	2020-03-10 16:41:08 +09:00
Dean Herbert	7069cef9ce	Add catcher kiai/fail animation states	2020-03-10 15:28:37 +09:00
Dan Balasescu	a6cf6207aa	Merge pull request #8192 from peppy/fix-hyperdash ... Fix hyperdash not initiating correctly when juice streams are present	2020-03-10 14:00:44 +09:00
Dean Herbert	0d18ea1d29	Add animation and fallback catcher support	2020-03-10 12:36:25 +09:00
Dean Herbert	e7f1f0f38b	Fix hyperdash not initiating correctly when juice streams are present	2020-03-10 10:21:32 +09:00
Dean Herbert	2aa649e073	Fix catcher dropping juice streams due to it considering ignored judgements	2020-02-26 19:31:49 +09:00
Bartłomiej Dach	bf36dc10a5	Fix invalid cast ... Since introduction of IgnoreJudgement and its usage in JuiceStream and BananaShower the hard cast in CatcherArea that was used to check if the drawable hit object should cause the fruits on the plate explode at the end of combo caused a hard crash instead, since IgnoreJudgement was no longer deriving from CatchJudgement. Replace the hard cast with a soft pattern-matched cast.	2020-02-25 23:21:54 +01:00
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
Dean Herbert	d8ce1fd86c	Fix osu!catch not handling all vertical space	2020-01-30 13:23:39 +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
smoogipoo	49bf8d27d1	Move CreateScoreProcessor() to Ruleset	2019-12-17 20:08:13 +09:00
smoogipoo	5861eca80d	Make DrawableRuleset take a converted beatmap	2019-12-12 15:58:11 +09:00
smoogipoo	48f1dad4aa	Remove abstract ScoreProcessor class	2019-12-11 17:25:06 +09:00
Dean Herbert	1e71681916	Fix osu!catch catcher not scaling down correctly	2019-12-10 02:00:39 +09:00
Dean Herbert	63128c9465	Extend mouse hiding in catch to include catcher area	2019-11-29 18:25:11 +09:00
Dean Herbert	3864ea6ca3	Move position updating logic back to CatcherArea	2019-11-29 18:24:46 +09:00
Dean Herbert	4f081f2fe8	Remove catch-specific cursor provider	2019-11-29 17:38:28 +09:00
Dean Herbert	8ec25a6af2	Merge branch 'master' into ctb-relax	2019-11-29 16:28:06 +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
unknown	131809838f	pleasing CI	2019-11-03 16:22:07 +01:00
unknown	c180a71afe	even more formatting	2019-11-03 15:57:52 +01:00
unknown	9570f7c04b	more formatting	2019-11-03 15:34:09 +01:00
unknown	2a0db8aeac	add missing access modifier	2019-11-03 15:34:08 +01:00
unknown	883d5ed58e	formatting	2019-11-03 15:34:08 +01:00
unknown	bd5cb86b15	add license header	2019-11-03 15:34:08 +01:00
unknown	8e248d5cfa	add invisible cursor for ctb	2019-11-03 15:34:08 +01: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
Dean Herbert	d1cdf49dd5	Revert SkinnableSprite lookups to old behaviour	2019-09-03 14:21:54 +09:00