283 Commits

Author	SHA1	Message	Date
smoogipoo	cdeb4913c4	Adjust catcher size to match stable	2018-09-21 15:53:15 +09:00
smoogipoo	c3fa7f167f	Move aspect adjustments out of CatchPlayfield	2018-09-21 15:53:06 +09:00
smoogipoo	0bc2bcaf14	Remove GetAspectAdjustedSize() and PlayfieldArea	2018-09-21 15:14:49 +09:00
smoogipoo	26094ea325	Simplify + rename playfield layers in Osu/Catch	2018-09-21 15:01:58 +09:00
smoogipoo	368ceec47c	Simplify creation of a playfield	2018-09-21 14:35:50 +09:00
smoogipoo	826dc6ceb7	Make Playfield not a ScalableContainer	2018-09-21 14:02:32 +09:00
Hanamuke	309d8c8cb4	CI	2018-09-19 18:43:39 +02:00
Hanamuke	e7d78b94ae	Remove ScrollingVisualisation from settings	2018-09-19 18:30:25 +02:00
Hanamuke	e3cc25a96a	Implement ConstantScrollingSpeedVisualiser	2018-09-18 20:21:10 +02:00
Dean Herbert	2d74c088ce	Add newline	2018-09-15 17:03:51 +09:00
Hanamuke	dd7f667fe3	Disable scrolling speed control for osu!catch	2018-09-15 00:18:42 +02: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	5fd4ed2f4e	Rename judgement-related methods/events + commenting	2018-08-06 10:55:25 +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
smoogipoo	827c5c4939	Remove scroll direction from ScrolingPlayfield constructor	2018-07-17 15:14:03 +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	0940715631	Merge branch 'master' into catch-scoring	2018-06-29 14:59:15 +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
clayton	e44e08201b	Remove unnecessary usings and move Banana out of BananaShower	2018-06-11 12:43:01 -07:00
clayton	f486bcfee1	Add judgements to catch	2018-06-09 17:38:17 -07: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
Dean Herbert	5e4f83b80b	Add more correct catch playfield sizing	2018-05-25 17:33:27 +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
smoogipoo	4ecdea8b2e	Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer	2018-05-07 10:17:54 +09:00
smoogipoo	03a5df84c6	Initial rework of beatmap conversion process	2018-04-19 22:04:12 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
smoogipoo	551ba6ac4b	Fix ScalableContainer irrepairably altering content size	2018-04-02 13:06:06 +09:00
smoogipoo	187a025d36	Make hitobjects sorted by their start times	2018-03-29 16:07:31 +09:00
Dean Herbert	cb3d0db555	Move combo colours completely out of HitObjects	2018-03-20 15:50:12 +09:00
smoogipoo	a3c7755ade	Implement a conversion process for ReplayFrames	2018-03-01 02:28:14 +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
smoogipoo	c309cc9454	Privatise OnJudgements as much as possible	2018-01-16 15:37:32 +09:00
smoogipoo	8c5ef0a330	Remove base OnJudgement from Playfield to properly accomodate nested playfields	2018-01-15 20:48:57 +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
Dan Balasescu	56e4212883	Merge branch 'master' into catch-autoplay	2018-01-12 20:25:24 +09:00
Dean Herbert	33fdc2c1d6	Add very basic replay handling	2018-01-12 18:35:28 +09:00
Dean Herbert	a36cfd4265	Add BananaShower models and representations ... (cherry picked from commit e12e095)	2018-01-12 18:33:41 +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
smoogipoo	f71d086a41	Fix post-merge issues	2018-01-10 18:08:43 +09:00
smoogipoo	86b5591583	Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite	2018-01-10 18:02:49 +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
smoogipoo	a7aab21a29	Re-namespace files	2018-01-04 19:22:15 +09:00
smoogipoo	651e24e3cc	Implement proper scrolling directions	2018-01-04 19:17:40 +09:00
smoogipoo	f34131f8f4	Initial game-wide replacement of scrolling playfields	2018-01-04 18:50:17 +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	152b846cff	Fix incorrect scaling of hitobjects in catch	2018-01-04 16:29:53 +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	881745d756	Initial implementation of hyperdash calculation	2017-12-01 17:59:36 +09:00
Dean Herbert	2bb61e51ac	Add catcher scale based on CircleSize	2017-11-28 19:43:26 +09:00
Dean Herbert	b11de50df2	Cleanups	2017-11-28 18:42:50 +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	1f1bdc6162	Make juice streams interactive (and correctly positioned)	2017-10-11 18:18:06 +09:00
Dean Herbert	03fbf47bc2	Add juicy streams	2017-10-10 20:22:42 +09:00
Dean Herbert	37393ab2c9	Move brace	2017-10-02 22:24:22 +08: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	d192c2d83b	Merge remote-tracking branch 'upstream/master' into ctb-improvements	2017-09-19 20:54:39 +09:00
Dean Herbert	6d3d485565	And then everything became one	2017-09-19 16:06:58 +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	4e0aed4b8a	Add combo/colour metadata to CatchBaseHit	2017-09-15 20:54:34 +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
smoogipooo	093d82ac45	Set depths from playfield add methods instead of DrawableHitObject	2017-09-13 16:17:01 +09:00
smoogipooo	6682c3a736	Override instead of re-binding event	2017-09-13 16:15:11 +09:00
Dean Herbert	86de4fa2e2	Apply CI fixes	2017-09-12 18:36:19 +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
Dean Herbert	20dae5ee11	Minor refactors	2017-09-12 17:36:46 +09:00
smoogipooo	19db7a8f72	Update in line with framework changes.	2017-09-07 22:46:21 +09:00
smoogipooo	0cc443e618	Remove all generic judgements.	2017-09-06 18:05:51 +09:00
smoogipooo	ac8ec31b61	Make judgements able to be "added" plus make everything compile and run.	2017-09-06 17:02:13 +09:00
Dean Herbert	84c22df3f5	Combine Judgement.HitResults into one.	2017-09-06 17:01:48 +09:00
Dean Herbert	16e96888ab	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
Dean Herbert	7c9d6c9c83	Initial refactoring of key binding logic	2017-08-14 20:19:25 +09:00
Dean Herbert	99458aab48	Propagate framework updates	2017-08-12 19:54:07 +09:00
Dean Herbert	48d4ed55e9	Move a lot of code to framework	2017-08-11 16:11:46 +09:00
Dean Herbert	798fff00b2	Remove shortcomings, remove InputState.Data usage, make everything amazing ... No more casting!	2017-08-10 19:28:24 +09:00
Dean Herbert	b6bb07c0b5	Add ConcurrentActionModes to support osu! gameplay more easily	2017-08-10 18:28:22 +09:00
Dean Herbert	459a4cafb1	Remove unnecessary HandleInput	2017-08-09 15:17:05 +09:00
Dean Herbert	723e27353c	HitRenderer -> RulesetContainer	2017-08-09 13:28:29 +09:00
Dean Herbert	7c0e7ebcd0	Give HitRenderer a reference to Ruleset ... Used to get correct bindings for a mode (ActionMappingInputManager).	2017-08-09 13:05:52 +09:00
Dean Herbert	b88f37de45	Add custom actions for Catch ... Reworks input management for rulesets	2017-08-09 11:50:34 +09:00
Dean Herbert	2203d55d64	fixes	2017-08-08 13:31:55 +09:00
Dean Herbert	ff490cf44c	Add catching support	2017-08-08 12:58:43 +09:00
Dean Herbert	e67379b6de	Use ScrollingHitRenderer	2017-08-08 10:35:56 +09:00
Dean Herbert	4d1dd70cfb	Licence headers	2017-08-08 07:32:23 +09:00
Dean Herbert	b71caca131	Expand abilities of catcher	2017-08-07 15:09:31 +09:00
Dean Herbert	51d2b9c35c	Tidy up visually	2017-08-07 11:05:58 +09:00
Dean Herbert	81b738f68c	Add basic Catcher	2017-08-07 11:05:54 +09:00
Dean Herbert	554d0d6fb8	Update basic structure of Catch project	2017-08-07 11:05:48 +09:00
paparony03	62dee59672	Shapes namespace ... Depends on https://github.com/ppy/osu-framework/pull/837	2017-06-20 15:54:23 +10:00
smoogipooo	67cf64062a	Add flag to determine whether the beatmap requested for conversion is for the current ruleset.	2017-05-19 16:02:40 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00