25 Commits

Author	SHA1	Message	Date
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