853 Commits

Author	SHA1	Message	Date
Dean Herbert	ded7f5ff1b	Merge branch 'master' into catch-fruit-skinning	2020-02-19 09:38:03 +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	89bff32274	Fix metrics not matching between skins and lazer	2020-02-17 19:16:40 +09:00
Dean Herbert	2133ba38e5	Add overlay layer	2020-02-17 19:07:43 +09:00
Dean Herbert	7ce00bebf0	Add basic structure for skinning fruits	2020-02-17 18:47:22 +09:00
Dean Herbert	a3e0f84fcc	Update catcher test to use SkinnableTestScene	2020-02-17 17:19:46 +09:00
Dean Herbert	bb541f5ae4	Update inspectcode version and fix new issues	2020-02-15 11:54:29 +09:00
Dean Herbert	53b62816f8	Add index constants for cross-class safety	2020-02-13 14:07:37 +09:00
voidedWarranties	ca237fd987	Simplify ordering by using only numbers, add xmldoc	2020-02-10 16:21:49 -08:00
voidedWarranties	ea521b466f	Switch numerical consts to an enum	2020-02-09 21:37:40 -08:00
voidedWarranties	137181017b	Naming consistency with osu!web	2020-02-09 20:36:54 -08:00
voidedWarranties	88a56d00bf	Allow specifying order to SettingSource	2020-02-09 20:11:37 -08: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
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	97b5d71ee4	Adjust catch HP increase values	2020-01-07 15:09:30 +09:00
Albie Spriddell	3a903339d6	add playingverb and database migrations	2020-01-03 11:39:15 +00:00
Dean Herbert	2c8879f0fb	Lock user adjusted difficulty settings when changing beatmap	2019-12-27 19:05:17 +09:00
smoogipoo	522847987b	Implement break/gameplay start times	2019-12-26 15:00:58 +09:00
smoogipoo	90cb9d9162	Simplify scoreprocesor/healthprocessor implementations	2019-12-26 14:59:49 +09:00
smoogipoo	7414a6aadd	Merge remote-tracking branch 'huoyaoyuan/master' into health-processor ... # Conflicts: # osu.Game.Rulesets.Catch/CatchRuleset.cs # osu.Game.Rulesets.Mania/ManiaRuleset.cs # osu.Game.Rulesets.Taiko/TaikoRuleset.cs	2019-12-26 14:56:54 +09:00
Dan Balasescu	9702cc9809	Merge branch 'master' into remove-legacy-id	2019-12-25 21:01:12 +09:00
Dean Herbert	504a55e803	Merge branch 'master' into better-beatmap-conversion	2019-12-25 19:52:06 +09:00
Dean Herbert	911dc2d98d	Fix code inspections	2019-12-25 15:20:10 +09:00
Dean Herbert	52ba0cd816	Rename method to be more appropriate ... Also adds xmldoc.	2019-12-25 15:20:04 +09:00
Dean Herbert	0677f746aa	Provide the ruleset to converter classes	2019-12-24 16:02:16 +09:00
Dean Herbert	a324bfbc2c	Remove LegacyID from Ruleset	2019-12-24 13:48:27 +09:00
smoogipoo	6e7426a098	Simplify/improve beatmap conversion precheck	2019-12-23 17:44:18 +09:00
unknown	fe73b9f8d3	make HP and OD generic and instantiate CS and AR to modes that need it	2019-12-22 16:45:32 +08:00
unknown	08b477ed52	make ModDifficultyAdjust abstract	2019-12-20 18:30:23 +08:00
smoogipoo	76f2fb378f	Separate score and health parts of ScoreProcessor	2019-12-19 20:03:14 +09:00
Dean Herbert	ea661fce21	Merge branch 'master' into adjustable-map-settings	2019-12-18 18:44:11 +09:00
Dean Herbert	51a01c7006	Merge pull request #7256 from peppy/remove-ruleset-ctor-param ... Remove RulesetInfo parameter from Ruleset constructor	2019-12-18 18:42:42 +09:00
smoogipoo	2a128340d0	Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats	2019-12-18 17:58:37 +09:00
Dean Herbert	6e0802e50c	Remove RulesetInfo parameter from Ruleset constructor	2019-12-18 14:49:09 +09:00
Dean Herbert	e0ce87adca	Move CreateScoreProcessor() to Ruleset (#7244) ... Move CreateScoreProcessor() to Ruleset	2019-12-17 22:15:42 +09:00
Dan Balasescu	fd2785bab3	Merge branch 'master' into fxcop	2019-12-17 20:14:45 +09:00
smoogipoo	49bf8d27d1	Move CreateScoreProcessor() to Ruleset	2019-12-17 20:08:13 +09:00
Huo Yaoyuan	ecfc6dfa3d	CA1825: use Array.Empty.	2019-12-17 12:59:48 +08:00
Dean Herbert	b5db927d93	Merge branch 'master' into cinema-mod	2019-12-17 12:56:06 +09:00
Dean Herbert	3f3ba603c1	Merge remote-tracking branch 'upstream/master' into nightcore-beats	2019-12-16 18:03:32 +09:00
smoogipoo	a554ca728b	Don't reuse the same control point references	2019-12-16 15:27:54 +09:00
unknown	01c036b0b0	implement backing beats for nightcore mods	2019-12-15 16:56:02 +08:00
unknown	7f659cd057	Merge branch 'update-beatmap-settings' into adjustable-map-settings	2019-12-13 09:45:10 +08:00
unknown	002a125b4a	make ModDifficultyAdjust generic	2019-12-12 21:14:26 +08:00
Dean Herbert	37a94988a3	Merge branch 'improve-hud-hiding' into cinema-mod	2019-12-12 16:12:19 +09:00
smoogipoo	5861eca80d	Make DrawableRuleset take a converted beatmap	2019-12-12 15:58:11 +09:00
Albie	4a1c6db3ed	Merge branch 'master' into cinema-mod	2019-12-11 18:00:17 +00:00
unknown	b0cf44c3be	fix appveyor issues	2019-12-11 20:12:29 +08:00
unknown	b795532aa5	add difficulty adjustment mods	2019-12-11 19:43:16 +08:00
smoogipoo	48f1dad4aa	Remove abstract ScoreProcessor class	2019-12-11 17:25:06 +09:00
Dean Herbert	77b9989e11	Fix some weird private field names	2019-12-11 14:10:35 +09:00
Albie	a61f8cc2c3	Merge branch 'master' into cinema-mod	2019-12-10 17:06:53 +00:00
Dean Herbert	5f3d163772	Merge branch 'master' into segmented-slider-paths-3	2019-12-10 14:28:20 +09:00
Dean Herbert	1e71681916	Fix osu!catch catcher not scaling down correctly	2019-12-10 02:00:39 +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
Dean Herbert	15ee65b8e9	Merge branch 'master' into ctb-relax	2019-12-04 23:35:55 +09:00
Dean Herbert	f0d49d0cdf	Decouple APILegacyScoreInfo from ScoreInfo	2019-12-03 15:31:11 +09:00
Dean Herbert	c7305f0b44	Simplify implementation structure	2019-11-29 18:27:27 +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
Albie	7864899249	Merge branch 'master' into cinema-mod	2019-11-28 16:42:01 +00:00
Dan Balasescu	c6a85a11bd	Merge branch 'master' into sharpen	2019-11-27 17:09:11 +09:00
Huo Yaoyuan	9425e80a5d	Unify to use double in performance calculators.	2019-11-26 18:34:23 +08:00
Huo Yaoyuan	c0fe91a84c	Merge branch 'master' into sharpen	2019-11-26 18:21:50 +08:00
Albie	09158b6b08	Merge branch 'master' into cinema-mod	2019-11-26 06:57:47 +00:00
Dean Herbert	709ec1404f	Centralise End/StartTime retrieval to extension method	2019-11-25 19:09:14 +09:00
Albie	0a70ec0b11	Merge branch 'master' into cinema-mod	2019-11-25 07:25:30 +00: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
Albie Spriddell	3b9f59cb33	add cinema mod support	2019-11-23 17:34:53 +00:00
Albie Spriddell	20edaf4ba6	add cinema mod support	2019-11-23 17:32:16 +00: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	374ef6ff83	Merge branch 'master' into sharpen	2019-11-20 17:30:58 +08:00
Huo Yaoyuan	608785b99a	Update .Net Standard projects to 2.1	2019-11-18 18:35:58 +08:00
Huo Yaoyuan	144812669d	Use static local functions.	2019-11-12 19:56:54 +08:00
Huo Yaoyuan	e5e8e70704	Use pattern matching.	2019-11-12 19:55:19 +08:00
Huo Yaoyuan	7d7b9e36b2	Use compound assignment.	2019-11-12 19:53:50 +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	e9b8cbb516	Apply other styles.	2019-11-11 20:27:04 +08: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
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
unknown	750e3c4aaf	replace 'as' with direct cast to avoid possible nullref	2019-11-03 15:34:07 +01:00
unknown	a8fab4cba1	make catcher field readonly	2019-11-03 15:34:07 +01:00
unknown	a842d727c7	formatting	2019-11-03 15:34:07 +01:00
unknown	5761cc673f	implement CatchModRelax	2019-11-03 15:34:07 +01:00
Huo Yaoyuan	bcf8e3a9d4	Remove redundant properties from desktop projects. ... While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.	2019-10-30 22:56:33 +08:00
Huo Yaoyuan	31595159be	Normalize .props	2019-10-30 21:54:14 +08: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	381daffe52	Generate better temporary frames to support framed handling flaws	2019-09-18 16:09:48 +09:00
Dean Herbert	77947e8309	Fix rewind tests failing	2019-09-17 22:33:27 +09:00
Bartłomiej Dach	a407e267a2	Fix PF/SD legacy mod conversion ... Upon investigating an user report in #6091 that indicated that viewing replays using the Perfect mod would also display the Sudden Death mod icon despite Perfect being the more restrictive of the two, it turned out that the logic of importing legacy scores was missing that corner case. A similar case of Double Time/Nightcore mutual exclusion was handled, but PF/SD was missed. Add analogous handling of PF/SD legacy mods for all four rulesets, and additionally cover a tiny fraction of all cases with unit tests. The most problematic cases (NC+HD and PF+SD) are covered in all four basic rulesets.	2019-09-15 22:55:25 +02:00
Dean Herbert	624e5644a4	Change osu!catch key trigger to occur on frame before positional change	2019-09-13 23:06:35 +09: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	8ba12fc91f	Merge remote-tracking branch 'upstream/master' into fix-catch-rewind	2019-09-13 19:49:36 +09:00
Dan Balasescu	125b3fda6c	Merge branch 'master' into improve-catch-replay-frames	2019-09-13 19:23:15 +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	acdfeef1dc	Improve how osu!catch stores and replays key actions	2019-09-12 18:33:46 +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	f925e781a9	Refactor HitWindows for legibility	2019-09-06 15:24:14 +09:00
Dean Herbert	d1cdf49dd5	Revert SkinnableSprite lookups to old behaviour	2019-09-03 14:21:54 +09:00
Dean Herbert	0261456d5a	Merge branch 'master' into play-to-gameplay	2019-09-03 11:42:15 +09:00
Dean Herbert	0f04357f1f	Revert short name change for now	2019-09-02 14:41:14 +09:00
Dean Herbert	70e417533f	Update naming	2019-08-30 15:13:29 +09:00
Dean Herbert	a15828ab25	Introduce the concept of SkinComponents ... Removes reliance on string lookups and better defines elements for introduction into database	2019-08-30 14:55:52 +09:00
smoogipoo	6ab2b20c70	Add an interface for working beatmaps	2019-08-29 19:38:44 +09:00
Dean Herbert	9a98f39f06	Share logic with other rulesets (and make default)	2019-08-28 18:12:47 +09:00
iiSaLMaN	62edfe7327	Correct comment	2019-08-26 15:16:01 +03: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	e9eea7157d	Trim unnecessary file contents	2019-08-01 18:04:57 +09:00
smoogipoo	2ae8cba24d	Add hardrock spinner test	2019-08-01 17:58:20 +09:00
smoogipoo	b978727422	Add stream + repeat slider tests	2019-08-01 14:58:17 +09:00
smoogipoo	8a1d690011	Reset tick offsets	2019-08-01 14:57:54 +09:00
smoogipoo	423857f403	Fix inverted offset	2019-08-01 14:57:07 +09:00
smoogipoo	38a2b9d92b	Fix multiple invocations by using a separate variable	2019-08-01 13:33:00 +09:00
smoogipoo	fdc6a3958d	Make catch HR properly utilise the RNG	2019-08-01 13:10:20 +09:00
smoogipoo	8a64ab0384	Remove generics from IApplicableToBeatmap	2019-08-01 12:39:32 +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	3b5ffdc2cb	Merge branch 'master' into android	2019-07-03 19:05:58 +09:00
Dean Herbert	392985a95b	Merge branch 'master' into ctb-hd	2019-07-03 13:29:59 +09:00
Dean Herbert	9bed0094de	Merge remote-tracking branch 'upstream/master' into android	2019-07-02 19:40:50 +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
Albert Tang	3cf2ffc1a7	Merge branch 'master' into android	2019-06-25 17:54:23 -05:00