621 Commits

Author	SHA1	Message	Date
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	42eaabe24c	Fix editor blueprints being misplaced ... Regressed with PlayfieldAdjustmentContainer changes.	2019-03-31 01:29:37 +09:00
Dean Herbert	3e8952b087	Merge pull request #4521 from peppy/hitobject-drawable-representation ... Fix DrawableRuleset drawable creation method's name	2019-03-29 14:08:23 +09:00
Dean Herbert	c72705217a	Merge branch 'master' into framed-replay-handler-fixes	2019-03-29 12:59:51 +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	e5b49b1657	Merge branch 'master' into ctb-pp	2019-03-29 12:24:47 +09:00
Dean Herbert	785433bb74	Merge branch 'master' into universal-playfield-adjust	2019-03-29 11:25:54 +09:00
Dean Herbert	7715606188	Merge branch 'master' into sprite-icon-compatibility	2019-03-29 11:15:34 +09:00
Dean Herbert	8642886ffa	Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust	2019-03-29 00:39:51 +09:00
Dean Herbert	d770dac3bc	Fix interpolation nullrefs	2019-03-29 00:35:26 +09:00
Dean Herbert	70f99400ad	Fix many behavioural issues and add tests	2019-03-28 19:28:13 +09:00
Dean Herbert	09a7950a3b	Fix handlers for other rulesets	2019-03-28 15:09:06 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
smoogipoo	5c8e8a1697	Fix license header	2019-03-27 16:56:15 +09:00
smoogipoo	8fcb75809d	Add LegacyScoreInfo for statistics preservation/conversion	2019-03-27 16:55:46 +09:00
smoogipoo	1a6c2022ea	Fix up/adjust counts	2019-03-27 14:53:29 +09:00
smoogipoo	2dc5447928	Merge remote-tracking branch 'origin/master' into ctb-pp	2019-03-27 14:01:02 +09:00
Dean Herbert	ed3746e166	Make PlayfieldAdjustmentContainer universal	2019-03-26 13:32:44 +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
tangalbert919	00c659a5ca	Merge all changes from 2019.321.0 to android	2019-03-20 11:00:27 -05:00
Dean Herbert	6f1610be79	Merge branch 'master' into ruleset-container-refactor	2019-03-20 14:55:58 +09:00
smoogipoo	8f0440d14c	Ensure RNG max value cannot go below min value	2019-03-20 12:06:37 +09:00
smoogipoo	003e36862f	Fix JuiceStreams not affecting lastPosition/lastStartTime	2019-03-20 12:06:14 +09:00
Dean Herbert	7b6d882ce6	Remove double-generic type	2019-03-20 11:29:16 +09:00
Dean Herbert	3b7a76aa4e	Fix typo	2019-03-20 11:22:34 +09:00
Dean Herbert	baea7230bc	Rename RulesetContainer to DrawableRuleset	2019-03-19 23:47:31 +09:00
Dean Herbert	68f28326a2	Refactor RulesetContainer for readability	2019-03-19 20:21:31 +09:00
Dean Herbert	6f372e7c07	Merge pull request #4489 from smoogipoo/fix-diffcalc-catcher-size ... Fix difficulty calculation using the pre-mod catcher size Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-03-19 16:49:38 +09:00
Dean Herbert	0fbc049f8d	Remove newline	2019-03-19 16:25:34 +09:00
smoogipoo	dd60e3f1c4	Fix halfCatchWidth not being reset between runs	2019-03-19 15:59:04 +09:00
smoogipoo	57727ac184	Remove preprocess until a later point in time	2019-03-19 15:53:27 +09:00
smoogipoo	5d9477e1e4	Fix difficulty calculation using the pre-mod catcher size	2019-03-19 15:35:14 +09:00
smoogipoo	5b07cce3cb	Invert unintuitive variable	2019-03-19 14:12:10 +09:00
smoogipoo	1b696ade50	Refactor to reduce code complexity	2019-03-19 14:10:39 +09:00
smoogipoo	a26e237e26	Fix relative position being compared to time	2019-03-18 18:59:38 +09:00
smoogipoo	bb8171b88a	Fix HR mod being applied to non-fruit objects	2019-03-18 18:36:16 +09:00
tangalbert919	e865ac2086	Merge remote-tracking branch 'origin/master' into android	2019-03-17 09:39:34 -05:00
Dean Herbert	c496f6e56b	Fix usages of OnLoadComplete	2019-03-17 13:44:20 +09:00
smoogipoo	d13423fcdb	Fix catch difficulty calculator not providing adjustment mods	2019-03-14 23:06:23 +09:00
Dean Herbert	489153579a	Add xmldoc and clarify struct variables	2019-03-11 14:36:29 +09:00
Albert Tang	7f30fce3fe	Merge branch 'master' into android	2019-03-08 10:39:24 -06:00
Dean Herbert	c6194d5487	Merge branch 'master' into extract-slider-tick-creation	2019-03-08 20:40:03 +09:00
Dean Herbert	48e54c84c1	Merge branch 'master' into mod-wind	2019-03-08 20:23:02 +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	1f44dde96b	Fix autoplay tests not working	2019-03-07 18:34:56 +09:00
Dean Herbert	d70b373af9	Merge branch 'master' into mod-wind	2019-03-06 14:04:04 +09:00
tangalbert919	1e6cb3e7d8	Merge remote-tracking branch 'upstream/master' into android	2019-03-05 17:56:13 -06:00
LeNitrous	c271a3a781	remove ruleset specific mods	2019-03-04 17:36:44 +08:00
HoLLy	679d30d08a	Fix comment mentioning 4 frames instead of 1/4	2019-03-03 11:21:39 +00:00
LeNitrous	ecc2c28a62	mod rule changes	2019-03-03 16:22:00 +08:00
HoLLy	5ff47924ab	Add missing grace time in hyperdash calculation	2019-03-02 14:06:53 +01: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
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	7e41fbc29b	Remove LegacyDifficultyCalculator	2019-02-21 13:12:37 +09:00
smoogipoo	cab7a030f0	Merge remote-tracking branch 'origin/master' into ctb-diffcalc	2019-02-20 15:15:12 +09:00
smoogipoo	d25d10d8fc	Fix position not being set for the first hitobject	2019-02-20 14:14:45 +09:00
smoogipoo	9192f7d717	Merge remote-tracking branch 'origin/master' into ctb-diffcalc ... # Conflicts: # osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs	2019-02-20 12:22:32 +09:00
smoogipoo	ea281e8596	Add beatmap argument	2019-02-19 17:54:00 +09:00
smoogipoo	1a645b5115	Fix mods not being populated	2019-02-19 17:45:52 +09:00
smoogipoo	2765ffa190	Update with PopulateAttributes() removal	2019-02-19 17:42:24 +09:00
smoogipoo	3abb281ad5	Fix post-merge errors	2019-02-19 16:41:53 +09:00
smoogipoo	9463475202	Remove now unused member	2019-02-18 14:51:43 +09:00
smoogipoo	83cab2ba8a	Fix incorrect hitobject being used as the last hitobject	2019-02-18 14:50:47 +09:00
smoogipoo	f6b13ca79d	Rewrite catch diffcalc for readability + attempt to fix	2019-02-18 14:50:47 +09:00
smoogipoo	e02ae927b3	Fix nullrefs	2019-02-18 14:50:47 +09:00
smoogipoo	8eba94e8c9	Implement new difficulty calculator for Rulesets.Catch	2019-02-18 14:50:47 +09:00
smoogipoo	a8faa942a6	Implement new difficulty calculator structure	2019-02-18 14:49:43 +09:00
smoogipoo	09e717d219	Add catch difficulty calculator tests	2019-02-15 15:49:51 +09:00
tangalbert919	7349a6c527	Merge remote-tracking branch 'upstream/master' into android	2019-02-12 20:41:54 -06:00
Dean Herbert	5b1f111922	Rollback other fallthrough regressions	2019-02-05 18:14:43 +09:00
Dean Herbert	2d7c23dd9f	Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics	2019-02-04 12:15:53 +09:00
HoLLy	f6318d3670	Add comment explaining *= 0.8f	2019-02-01 13:06:36 +01:00
tangalbert919	52110e5dc0	Merge remote-tracking branch 'upstream/master' into android	2019-01-31 11:19:03 -06:00
HoLLy	be6b5419c4	Remove uncommented line ... Didn't mean to push this	2019-01-31 18:10:44 +01:00
HoLLy	30292f44da	Fix Catch diffcalc being off	2019-01-31 17:57:59 +01:00
Dean Herbert	a5c1ef03f9	Merge branch 'master' into catch-slider-conversion-tweak	2019-01-31 19:27:08 +09:00
tangalbert919	80006109a2	Merge remote-tracking branch 'upstream/master' into android	2019-01-29 18:13:43 -06:00
LeNitrous	03e57d0423	fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp	2019-01-26 20:15:19 +08: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
LeNitrous	73dbf5712d	add license headers	2019-01-26 13:43:27 +08:00
LeNitrous	1427c9f576	trim whitespaces	2019-01-26 13:11:08 +08:00
LeNitrous	c6e26a92ec	add wind up and wind down mods	2019-01-26 12:15:45 +08:00
ekrctb	aaba377e11	Add a test for catch slider conversion	2019-01-25 18:13:14 +09:00
ekrctb	3375096f1d	Fix juice stream generates tiny droplet at tick time	2019-01-25 18:11:27 +09:00
Dean Herbert	014ea972d9	Merge remote-tracking branch 'origin/master' into samah-ios	2019-01-25 11:51:44 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
tangalbert919	e3ce203c68	Merge remote-tracking branch 'upstream/master' into android	2019-01-23 17:45:46 -06:00
Dean Herbert	8160162cde	Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics	2019-01-21 20:58:17 +09:00
ekrctb	67ea3beeb4	Fix catch slider conversion for last droplets	2019-01-21 18:05:55 +09:00
Shane Woolcock	a6c54a9675	Merge branch 'master' into samah-ios	2019-01-12 00:16:09 +10:30
Unknown	6eff79913b	remove blank lines	2019-01-11 10:34:56 +01:00
Dan Balasescu	09f12fcd42	Removed TODO comment regarding Aim being StarRating ... Co-Authored-By: HoLLy-HaCKeR <HoLLy-HaCKeR@users.noreply.github.com>	2019-01-10 22:47:28 +00:00
HoLLy	75a5691c5f	Set license header year to 2018, remove old TODO comment	2019-01-09 00:51:49 +01:00
HoLLy	41d0bff243	Assume katu is part of HitResult.Miss	2019-01-09 00:20:15 +01:00