134 Commits

Author	SHA1	Message	Date
ekrctb	c8b0934573	Rename caughtFruitContainer -> caughtObjectContainer	2020-12-09 10:35:36 +09:00
ekrctb	ccca7e0b25	more specific type droppedObjectContainer	2020-12-09 10:35:01 +09:00
ekrctb	b80204642e	Revert rename error	2020-12-09 10:25:35 +09:00
ekrctb	1212ffd24f	Rename to CopyStateFrom, and add comment	2020-12-08 23:35:24 +09:00
ekrctb	1f36bbecd1	Fix dropped objects not removed on revert result	2020-12-08 23:07:30 +09:00
ekrctb	749d5380ca	Pool caught objects and dropped objects	2020-12-08 22:38:10 +09:00
ekrctb	a32dac00dd	Introduce IHasCatchObjectState implemented by DHO and CaughtObject	2020-12-08 21:29:26 +09:00
ekrctb	c301223d8c	Make object on the catcher plate separate CaughtObject class	2020-12-08 21:11:40 +09:00
ekrctb	94a59ac3b2	Make catch hit lighting logic not dependent on caught object	2020-12-08 20:41:26 +09:00
ekrctb	56721a6fa9	Compute object position in stack via a pure function	2020-12-08 20:36:59 +09:00
ekrctb	02571ec7ae	Remove hit explosion on revert result	2020-12-08 15:43:17 +09:00
ekrctb	1a66d8f2bc	Remove caught objects on revert result	2020-12-08 15:24:39 +09:00
ekrctb	100b365c98	Restore hyper dash state on revert judgement result	2020-12-08 15:21:47 +09:00
ekrctb	cb76a2d7b5	Restore catcher state on revert judgement result	2020-12-08 15:03:03 +09:00
ekrctb	0213f77b4b	Move catcher state changing logic to OnNewResult method	2020-12-08 14:28:30 +09:00
Dean Herbert	d3a17b65d5	Move public methods upwards	2020-12-04 14:36:40 +09:00
Dean Herbert	8988023407	Tidy up code formatting and remove unnecessarily publicly exposed methods	2020-12-04 14:35:56 +09:00
ekrctb	23af70dd32	Invert if	2020-12-04 10:24:25 +09:00
ekrctb	7e66714c2f	Use ApplyCustomUpdateState for dropping transformation ... We cannot just apply the transforms because DHO clears transforms when state is updated	2020-12-03 18:46:58 +09:00
ekrctb	be456f9c6b	Make DroppedObjectAnimation private	2020-12-03 18:46:58 +09:00
ekrctb	5a5c956ced	Move more logic to Catcher from CatcherArea	2020-12-03 16:44:36 +09:00
ekrctb	2eb2c934cc	Refactor fruit dropping code ... - The repeated `Remove` call was quadratic complexity. Now it is linear time.	2020-12-03 16:44:36 +09:00
ekrctb	873f2363c1	Simplify the fruit stacking code ... It is now more clear that the expression of distance checking is probably unintended (a bug)	2020-12-03 16:44:36 +09:00
ekrctb	8d32cca5d6	Use more specific type for caught object	2020-12-03 16:44:36 +09:00
ekrctb	e5c8e06c4b	Create children in the constructor	2020-12-03 16:44:36 +09:00
ekrctb	a16b265090	Apply suggested styling changes	2020-12-01 14:46:04 +09:00
ekrctb	08cb84b325	Pool osu!catch hit explosion	2020-12-01 11:32:20 +09:00
ekrctb	ab7251d742	Move members to PalpableCatchHitObject	2020-11-24 19:57:37 +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	60695bee8c	Remove fades when changing trail colour across skins	2020-08-24 15:57:41 +02:00
Dean Herbert	b98d4d9cff	Merge branch 'master' into hyperdash-full-catch-width	2020-08-22 19:55:45 +09: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
smoogipoo	738ff7ba21	Use full catcher width for hyperdash calculation	2020-08-21 02:21:16 +09:00
Bartłomiej Dach	9546fbb64b	Prevent catcher from performing invalid catches	2020-08-20 19:06:29 +02:00
smoogipoo	f956c9fe37	Clobber in a gameplay test	2020-08-21 02:01:29 +09: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	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	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	b7d73f96ea	Fix osu!catch catcher hit area being too large	2020-03-31 18:33:09 +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	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
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	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	b517523f4a	Add back CatcherArea to simplify layout	2017-11-28 18:39:45 +09:00
Dean Herbert	8f3fd7092e	CatchBaseHit -> CatchHitObject ... Also moves default scale to CatchHitObject.	2017-11-28 18:37:41 +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