330 Commits

Author	SHA1	Message	Date
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
Dan Balasescu	64d1b4b11b	Merge branch 'master' into move-setter-to-duration	2020-06-01 15:55:48 +09:00
Dean Herbert	cbd563e80b	Rename to IHasDuration	2020-05-27 12:38:39 +09:00
Dean Herbert	b8e0a6f127	Move sett from EndTime to Duration	2020-05-27 12:37:44 +09:00
Dean Herbert	6b5b215299	Split out IHasPath from IHasCurve to better define hitobjects	2020-05-26 17:44:47 +09:00
smoogipoo	6d29ff0928	Fix banana showers not using cancellation token	2020-05-21 12:13:02 +09:00
smoogipoo	4719fcc291	Actually use the cancellation token	2020-05-15 18:17:39 +09:00
smoogipoo	98125102a7	Add cancellation token support to CreateNestedHitObjects()	2020-05-15 18:07:41 +09:00
Dean Herbert	081a02f748	Merge branch 'master' into catch-hyperdash-fruit-colouring	2020-04-14 10:01:15 +09:00
Dean Herbert	65b96079a0	Move dampening to base implementation and change range to 0..1	2020-04-13 13:01:02 +09:00
Fire937	f274ec297c	Add positional sound support for all rulesets ... The SamplePlaybackBalance is calculated in a way that the balance remains between -0.4 and 0.4. Positional sound is not supported in osu!taiko.	2020-04-12 01:33:25 +02:00
Salman Ahmed	d27d8671ab	Convert all static getter-only properties to static readonly fields	2020-04-08 14:23:29 +03:00
Salman Ahmed	c4f7b45768	Revert "Add support for custom hyper-dash fruit colouring" ... This reverts commit 6f2cc5471a and also its testing cases. This became dead code after actual correct osu!catch skin colouring, we don't support modern skinning (non-legacy skinning) at the moment, so for what it's worth this can be reverted to default red-coloured	2020-04-05 00:07:25 +03:00
Salman Ahmed	7e82f5740b	Add a skin extension for simplifying falling back on hyper-dash colours	2020-04-03 19:35:50 +03:00
Salman Ahmed	16a4525a9c	CatchSkinConfiguration -> CatchSkinColour	2020-03-30 09:33:47 +03:00
Salman Ahmed	6f2cc5471a	Add support for custom hyper-dash fruit colouring	2020-03-26 05:42:12 +03:00
Dan Balasescu	42bc8bc50d	Merge pull request #8199 from peppy/add-banana-scale-rotate ... Add random rotation and scale factors to osu!catch bananas	2020-03-11 16:31:18 +09:00
Dean Herbert	966e5bbc8a	User helper function to reduce copy paste	2020-03-11 15:54:21 +09:00
Dan Balasescu	cd5f0d6e96	Merge pull request #8201 from peppy/fix-hyperdash-test ... Fix hyperdash test having a zero-length juice stream	2020-03-11 13:46:59 +09:00
Dan Balasescu	ba98155832	Merge branch 'master' into fix-hyperdash-test	2020-03-11 12:56:40 +09:00
Dan Balasescu	df52b58543	Merge branch 'master' into remove-tiny-droplet-samples	2020-03-11 12:46:16 +09:00
Dean Herbert	8ec2c35c4f	Change origin of nested objects inside JuiceStream to fix visibility issues	2020-03-10 19:35:10 +09:00
Dean Herbert	9ad519e5a5	Remove fade and custom InitialLifetimeOffset	2020-03-10 19:35:10 +09:00
Dean Herbert	4daba48a1d	Stop rotating DrawableCatchHitObjects at the top level	2020-03-10 19:30:31 +09:00
Dean Herbert	14192c069f	Don't play samples on catching a tiny droplet	2020-03-10 18:05:44 +09:00
Dean Herbert	5329b222f6	Fix hyperdash test having a zero-length juice stream	2020-03-10 17:49:51 +09:00
Dean Herbert	2b33594400	Add random rotation and scale factors to osu!catch bananas	2020-03-10 15:59:13 +09:00
Dean Herbert	015a39abc7	Fix hyperdash fruit not visible on default skin	2020-02-26 19:22:31 +09:00
Dean Herbert	ffc7eaa3f2	Fix hitobjects with unknown lifetimes by enforcing non-null judgement ... We've seen multiple cases where DrawableHitObject are stuck in the lifetime management container due to not implementing a judgement (meaning they are never "hit" or "missed"). To avoid this going forward CreateJudgement() must be implemented and return a non-null judgement. This fixes BananaShower and JuiceStreams in osu!catch. This also makes HitObject abstract and cleans up convert HitObject implementations.	2020-02-23 13:49:06 +09:00
Dan Balasescu	8d48008dd5	Merge branch 'master' into split-out-pulp-formations	2020-02-21 11:45:06 +09:00
Dean Herbert	9344f62cf0	Merge branch 'master' into catch-droplet-rotation	2020-02-21 11:09:02 +09:00
Dean Herbert	a7e3e8ace9	Merge branch 'master' into catch-drawable-namespace	2020-02-21 10:31:31 +09:00
Dean Herbert	8a6a424893	Merge branch 'master' into catch-droplet-rotation	2020-02-21 10:31:02 +09:00
smoogipoo	6468bfa543	Apply adjustments	2020-02-21 10:01:38 +09:00
Dean Herbert	5551343cf3	Throw instead of null return	2020-02-20 15:45:25 +09:00
Dean Herbert	2869128e11	Update in line with combo colour API changes	2020-02-20 15:41:57 +09:00
Dean Herbert	13873ff1b6	Split out pulp formations into own piece classes	2020-02-19 23:32:56 +09:00
Dean Herbert	ea0bbd2926	Rename drawable namespace to avoid clashes with framework class	2020-02-19 18:01:59 +09:00
Dean Herbert	7b27f6b378	Add droplet rotation animation	2020-02-19 17:55:40 +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	4c4140ae54	Adjust droplets to match stable	2020-02-19 15:55:22 +09:00
Dean Herbert	5261579531	Fix indices in beatmap not being transferred to children (and being off by one)	2020-02-19 15:37:12 +09:00
Dean Herbert	3f99d25e37	Use new UpdateComboColour method to simplify colouring	2020-02-19 15:28:29 +09:00
Dean Herbert	26fe15b038	Fix fruit representation not cycling as often as it should	2020-02-19 14:41:25 +09:00
Dean Herbert	aeb45c8442	Fix ordering of fruits to match stable	2020-02-19 14:31:43 +09:00
Dean Herbert	24e33abcbf	Fix banana colouring for skins	2020-02-19 14:31:32 +09:00
Dean Herbert	3eeb60f60f	Centralise and fix scaling	2020-02-19 14:31:14 +09:00
Dean Herbert	ce1a57550f	Add droplet skinning support	2020-02-19 13:29:05 +09:00
Dean Herbert	0f85e81240	Fix handling of bindable changes in accent colour	2020-02-19 12:10:09 +09:00
Dean Herbert	f245fe5934	Fix catch combo colouring	2020-02-19 10:28:20 +09:00
Dean Herbert	ab863cdfd9	Fix incorrect scaling factor being applied	2020-02-19 09:52:29 +09:00
Dean Herbert	73e5018696	Move radius adjust local to fruit piece	2020-02-19 09:39:56 +09:00
Dean Herbert	89bff32274	Fix metrics not matching between skins and lazer	2020-02-17 19:16:40 +09:00
Dean Herbert	7ce00bebf0	Add basic structure for skinning fruits	2020-02-17 18:47:22 +09:00
Dean Herbert	bb541f5ae4	Update inspectcode version and fix new issues	2020-02-15 11:54:29 +09:00
Dean Herbert	daf5fa9da4	Throw NotSupportedException instead	2020-02-06 13:16:32 +09:00
Dean Herbert	cd6902a312	Make EndTime and RepeatCount settable	2020-02-05 17:52:51 +09:00
smoogipoo	91735ff367	Update MathUtils namespace usages	2020-01-09 13:43:44 +09:00
smoogipoo	a554ca728b	Don't reuse the same control point references	2019-12-16 15:27:54 +09:00
smoogipoo	fa1468325e	Refactor hitobjects to remove default control point	2019-12-09 17:48:27 +09:00
smoogipoo	b9d12e5fe4	Fix nested hitobjects not updating	2019-12-06 20:53:40 +09:00
Huo Yaoyuan	c0fe91a84c	Merge branch 'master' into sharpen	2019-11-26 18:21:50 +08:00
Dean Herbert	709ec1404f	Centralise End/StartTime retrieval to extension method	2019-11-25 19:09:14 +09:00
Berkan Diler	fccdbffa93	Use MathF instead of Math- functions when possible ... MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.	2019-11-25 00:45:42 +01: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	144812669d	Use static local functions.	2019-11-12 19:56:54 +08:00
Huo Yaoyuan	bbeab6fa76	Use auto property.	2019-11-12 19:53:25 +08:00
Dean Herbert	b37bf4ea01	Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition	2019-11-12 10:44:53 +09:00
Huo Yaoyuan	ccc8aa6fa4	Apply brace style.	2019-11-11 20:13:13 +08:00
smoogipoo	6fc1be64c2	Make hitobject samples a bindable list	2019-11-08 14:04:57 +09:00
smoogipoo	f429a8f7c2	Add back/obsolete old AddNested() method	2019-10-17 14:02:08 +09:00
smoogipoo	d8f3678c3c	Rename parameter	2019-10-17 12:53:54 +09:00
smoogipoo	1a0dfcdd46	Make catch use the new nested hitobject structure	2019-10-17 12:37:09 +09:00
Dean Herbert	51bf600ea7	Use empty hitwindows instead of null	2019-10-09 19:08:31 +09:00
smoogipoo	bbf0544a8d	Add bindables for IHasComboInformation properties	2019-09-26 16:55:08 +09:00
Dean Herbert	1c317bc9dc	Merge branch 'reset-dho-lifetimes' into fix-catch-rewind	2019-09-12 19:40:26 +09:00
Dean Herbert	f21e47d6d2	Move expire to DrawableHitObject	2019-09-12 19:29: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	f925e781a9	Refactor HitWindows for legibility	2019-09-06 15:24:14 +09:00
Dean Herbert	9a98f39f06	Share logic with other rulesets (and make default)	2019-08-28 18:12:47 +09:00
iiSaLMaN	fb69755869	Use transform management for catch hit objects	2019-08-26 15:15:23 +03:00
Dean Herbert	48716f8f2b	Update framework	2019-08-21 13:29:50 +09:00
smoogipoo	38a2b9d92b	Fix multiple invocations by using a separate variable	2019-08-01 13:33:00 +09:00
Dean Herbert	c3b81bef4a	Flip default to the preferred method going forward	2019-07-22 15:55:38 +09:00
Dean Herbert	91f86adb66	Move DrawableHitObject state management to base class	2019-07-22 15:07:12 +09:00
Dean Herbert	8327452fe1	Make AccentColour a bindable	2019-07-22 14:48:59 +09:00
Dean Herbert	392985a95b	Merge branch 'master' into ctb-hd	2019-07-03 13:29:59 +09:00
Dean Herbert	60ea3d4e1a	Fix skinning support for combobreak	2019-06-30 21:58:30 +09:00
Unknown	01508e6813	implement HD for CtB	2019-06-28 10:34:04 +02:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	14cef94a53	Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation	2019-03-29 12:59:26 +09:00
Dean Herbert	39df8cce19	Fix incorrect usage of InternalChildren ... Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)	2019-03-25 13:48:55 +09:00
Dean Herbert	9bf48863b0	Fix DrawableRuleset drawable creation method's name	2019-03-25 00:00:29 +09:00
Dean Herbert	489153579a	Add xmldoc and clarify struct variables	2019-03-11 14:36:29 +09:00
Dean Herbert	165a353a83	Add extensive commenting about LegacyLastTick usage	2019-03-08 20:12:48 +09:00
Dean Herbert	355705f0a5	Fix legacy tick handling	2019-03-08 19:57:30 +09:00
Dean Herbert	0788a7e9f1	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Dean Herbert	42be7857d1	Use expression body for property get/set where possible	2019-02-28 13:58:19 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Dean Herbert	5b1f111922	Rollback other fallthrough regressions	2019-02-05 18:14:43 +09:00
Dean Herbert	a5c1ef03f9	Merge branch 'master' into catch-slider-conversion-tweak	2019-01-31 19:27:08 +09:00
ekrctb	ea48d6a88a	reduce code duplication / allocations	2019-01-26 16:16:49 +09:00
ekrctb	1a5a238752	Use integer count for tiny droplet generation	2019-01-26 16:14:37 +09:00
ekrctb	3375096f1d	Fix juice stream generates tiny droplet at tick time	2019-01-25 18:11:27 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
ekrctb	67ea3beeb4	Fix catch slider conversion for last droplets	2019-01-21 18:05:55 +09:00
Dean Herbert	4cee21f356	Make skinning better	2019-01-07 20:12:39 +09:00
smoogipoo	b64932f6db	Implement hit windows	2018-12-27 22:39:15 +09:00
Dan Balasescu	b5fdbe8d87	Merge branch 'master' into master	2018-11-25 01:38:19 +09:00
123tris	b2d21e4ee0	* Corrected misspelling of function in DrawableFruit.cs and refactored all of its use cases	2018-11-24 16:50:23 +01:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
smoogipoo	3aba462e52	Make Path.Distance a property again	2018-11-12 14:07:48 +09:00
smoogipoo	54ab256c8e	Instantiate a new path rather than setting properties on it ... # Conflicts: # osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs # osu.Game.Rulesets.Catch/Objects/JuiceStream.cs # osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/SliderPath.cs	2018-11-12 13:50:19 +09:00
smoogipoo	a4caaf56ef	Merge remote-tracking branch 'origin/master' into fix-slider-samples ... # Conflicts: # osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs	2018-11-05 16:38:28 +09:00
Dean Herbert	bb2f8deb18	ControlPoint -> PathControlPoint ... Also Curve -> Path.	2018-11-01 03:56:51 +09:00
smoogipoo	47be95ce0b	Fix slider nodes using the wrong samples	2018-10-16 17:10:24 +09:00
smoogipoo	83fd251c7b	Pass sub-controlpoints as span slices	2018-10-11 17:44:25 +09:00
Hanamuke	a17200a66a	Merge branch 'master' into fix_combo	2018-09-14 18:48:13 +02:00
Hanamuke	1c2cc3837a	Compute combo for nested Objects. Display fruit depending on Combo for ... osu!catch	2018-09-13 21:52:15 +02:00
Hanamuke	7d3380db66	Fixed comment. Created static CatchArea.GetCatcheWidth method	2018-09-13 17:01:33 +02:00
Hanamuke	a3c3bfb1a8	Fixes hyperdash computation (for nested objects)	2018-09-12 19:48:35 +02:00
smoogipoo	31f324945e	Implement combo offsets	2018-08-15 11:47:31 +09:00
smoogipoo	3a7488767c	Make HitObject not store the judgement	2018-08-06 11:50:18 +09:00
smoogipoo	741ec0021e	Rename more judgement-related methods to "result"	2018-08-06 11:31:46 +09:00
smoogipoo	2a4994e5ce	Make hitobjects only have one judgement + result	2018-08-03 15:38:48 +09:00
smoogipoo	9dff5cea07	Make Rulesets.Catch use the new judgement result structure	2018-08-02 20:37:07 +09:00
smoogipoo	e825edb6d7	Migrate Rulesets.Catch to the new judgement system	2018-08-02 15:44:48 +09:00
Dean Herbert	f1a35f77d2	Make bananas explode even on miss	2018-06-29 16:49:01 +09:00
Dean Herbert	f7fbf61306	Centralise judgement logic	2018-06-29 15:27:02 +09:00
Dean Herbert	0940715631	Merge branch 'master' into catch-scoring	2018-06-29 14:59:15 +09:00
smoogipoo	80501de4b9	Add legacy slider offsets	2018-06-27 12:09:21 +09:00
Dean Herbert	1a8aa6eab1	Fix regression causing new combos to once again not be respected	2018-06-26 20:13:55 +09:00
Dean Herbert	f7f17bab78	Merge branch 'master' into catch-droplet-fix	2018-06-26 19:29:15 +09:00
smoogipoo	c9581a2d56	Merge remote-tracking branch 'origin/master' into catch_star_rating ... # Conflicts: # osu-framework # osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs # osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs	2018-06-21 12:15:25 +09:00
ekrctb	516b1c5495	Fix droplet position clamping	2018-06-20 18:29:23 +09:00
ekrctb	9d7e5b4920	Clamp juice stream position	2018-06-20 17:23:55 +09:00
Dan Balasescu	0ba80fad60	Merge branch 'master' into droplets-should-bounce	2018-06-15 17:34:54 +09:00
Dean Herbert	149d94116b	Fix droplets not bouncing off catcher's plate immediately	2018-06-15 15:44:47 +09:00
Dean Herbert	2ff7b4cdcf	Merge branch 'master' into catch-droplet-fix	2018-06-15 14:34:01 +09:00
smoogipoo	31bd59442f	Remove banana positioning comment	2018-06-14 21:38:08 +09:00
Dean Herbert	c41a50bf24	Fix combos ending with JuiceStreams never leaving the catcher's plate ... Closes #2634.	2018-06-14 16:39:31 +09:00
Dan Balasescu	cbb883614a	Merge branch 'master' into catch-droplet-fix	2018-06-13 15:18:52 +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	456dc81f2f	Fix InspectCode issues	2018-05-25 19:18:11 +09:00
ekrctb	26c6313dec	catch: the fruit positions are finalized on the post process	2018-05-25 19:11:29 +09:00