436 Commits

Author	SHA1	Message	Date
clayton	808118e4d4	Add health drain to catch	2018-06-09 17:39:17 -07:00
clayton	f486bcfee1	Add judgements to catch	2018-06-09 17:38:17 -07:00
smoogipoo	83ff47ec80	Rewrite difficulty mod combinations	2018-06-06 16:20:17 +09:00
smoogipoo	8274623ad6	Cleanup multi mod constructions	2018-06-06 14:07:50 +09: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
Dan Balasescu	9924ec9606	Merge branch 'master' into catch-sizing-fixes	2018-05-31 12:31:52 +09:00
ekrctb	0b7fdd4e8d	Merge branch 'master' into catch-stable-hyper	2018-05-29 18:52:09 +09:00
Dean Herbert	8b2a6b8cce	Fix formatting	2018-05-26 12:38:33 +09: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
ekrctb	8c8e87ed7a	Make FastRandom public	2018-05-25 18:57:59 +09:00
ekrctb	ca2c209701	add FastRandom	2018-05-25 18:57:46 +09:00
Dean Herbert	f5ab93a712	Make all drawable fruit absolute values easily scalable	2018-05-25 17:37:52 +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
frankhjwx	fda7025ac3	Re-order positionData judgement for correct banana creation	2018-05-23 13:47:33 +08:00
frankhjwx	4784538d73	Fixing minor bugs	2018-05-21 13:53:48 +08:00
frankhjwx	193a298601	Fixing minor bugs	2018-05-21 13:36:57 +08:00
frankhjwx	6d71f7f220	Minor fixes	2018-05-21 13:35:02 +08:00
frankhjwx	2e5bc4323a	Fixing null reference exception bugs	2018-05-21 13:31:00 +08:00
frankhjwx	871743204b	Fixing parameters naming	2018-05-21 10:41:58 +08:00
frankhjwx	68a929eb0c	Fixing parameters naming	2018-05-21 10:39:16 +08:00
frankhjwx	886be8ce1f	Adding lisence header	2018-05-21 10:16:32 +08:00
frankhjwx	0405383e4e	Fixing code style	2018-05-21 10:12:18 +08:00
frankhjwx	44fd4b95bd	We need DistanceToHyperDash for star rating calculation	2018-05-21 09:58:46 +08:00
frankhjwx	0ef718a09e	Fixes on categoryDifficulty	2018-05-21 09:55:07 +08:00
frankhjwx	6bf5ea73d5	Fix CatcherWidth	2018-05-21 09:53:20 +08:00
frankhjwx	79c64d16e4	Realization on Catch Star Rating	2018-05-21 09:49:23 +08:00
Dean Herbert	0e0cc8bb69	Merge branch 'master' into namespace-cleanup	2018-05-15 18:10:48 +09:00
smoogipoo	803200ff6a	Apply similar changes to other rulesets	2018-05-15 17:40:19 +09:00
smoogipoo	995fda9b6f	Move base classes to osu.Game.Rulesets.Difficulty namespace	2018-05-15 17:38:08 +09:00
smoogipoo	6e1d651087	Merge remote-tracking branch 'origin/master' into convert-object-hitwindows	2018-05-14 11:17:39 +09:00
smoogipoo	97a523584d	Make HitWindows not return null by default	2018-05-11 15:52:51 +09:00
smoogipoo	7eb64ab590	Remove object counts from mania/taiko/catch	2018-05-07 15:51:08 +09:00
smoogipoo	b9e4b59e46	Actually construct catch beatmaps	2018-05-07 15:51:08 +09:00
smoogipoo	8a4717d2e9	Add catch statistics	2018-05-07 15:51:08 +09:00
smoogipoo	e20323b5f6	Trim whitespace	2018-05-07 11:23:29 +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
smoogipoo	66b3b295e7	Use IBeatmap wherever possible	2018-04-19 20:44:38 +09:00
Dean Herbert	d307b8dc2e	Merge remote-tracking branch 'upstream/master' into tgi74-ctb_hr_mangling	2018-04-18 16:46:02 +09:00
tgi74000	9b36cf2066	Review changes	2018-04-16 14:14:40 +02:00
tgi74000	b23b0a445b	Add support for replay mods	2018-04-13 15:41:35 +02:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
tgi74000	82d9504cbf	Changed relative position to [0, 1]	2018-04-09 09:02:32 +02:00
tgi74000	b40af0848f	White space	2018-04-08 15:52:40 +02:00
tgi74000	58dbc63c6e	Add HardRock position mangling for CatchTheBeat	2018-04-08 15:24:34 +02:00
Dean Herbert	acbdbcc3df	Update AssemblyInfo in line with framework changes	2018-04-06 13:17:26 +09:00
smoogipoo	364c3bca06	Fix osu!catch autoplay missing starts/ends of JuiceStreams ... Fixes #2328. Would only happen when ticks and ends were spaced too far apart (or there were no ticks in a juicestream).	2018-04-04 16:24:03 +09:00
smoogipoo	551ba6ac4b	Fix ScalableContainer irrepairably altering content size	2018-04-02 13:06:06 +09:00
Dan Balasescu	824201336a	Merge branch 'master' into hr-on-mania-is-unranked	2018-03-30 16:35:00 +09:00
Joseph Madamba	0887dafa2c	Revert changes on hard rock mod	2018-03-29 20:36:52 -07:00
smoogipoo	187a025d36	Make hitobjects sorted by their start times	2018-03-29 16:07:31 +09:00
Dean Herbert	9aae568bbe	Tidy up csproj further	2018-03-28 15:19:56 +09:00
Dean Herbert	9667d54ecb	Add missing licence headers	2018-03-28 14:48:08 +09:00
Dean Herbert	0026b94cd3	Consolidate and move ruleset test projects	2018-03-28 14:41:25 +09:00
Dean Herbert	1a8aa87469	Make everything better	2018-03-27 18:56:54 +09:00
Dean Herbert	b290d2d039	Move NUnit includes to individual projects	2018-03-27 15:07:09 +09:00
smoogipoo	dd5bbbbd9f	Define testable projects	2018-03-26 19:11:23 +09:00
smoogipoo	5159127bce	Fix SQLite failing to initialize on test projects	2018-03-26 18:07:09 +09:00
smoogipoo	35ef9d99c6	Only compile with net461 in visual studio	2018-03-26 15:44:55 +09:00
smoogipoo	96901b6498	Add msbuild/dotnet build + launch targets	2018-03-26 10:52:54 +09:00
smoogipoo	31920f1866	Fix ruleset resources not getting included in build	2018-03-25 02:12:01 +09:00
smoogipoo	d28de89e50	Add net461 target to test projects for nunit discovery ... Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632).	2018-03-25 01:35:50 +09:00
smoogipoo	c29f7a4333	Merge remote-tracking branch 'origin/master' into netstandard	2018-03-24 14:49:46 +09:00
Dean Herbert	af65f2dd48	Move AccentColour changes local to rulesets which rely on it	2018-03-22 18:53:16 +09:00
Dean Herbert	7bdca0ff39	Merge remote-tracking branch 'upstream/master' into accent-colour-properties	2018-03-22 15:07:28 +09:00
Dean Herbert	78a8f60b39	IHasComboIndex -> IHasComboInformation	2018-03-22 12:35:17 +09:00
Dean Herbert	c38c26eacb	Move combo index processing to BeatmapProcessor	2018-03-20 15:57:43 +09:00
Dean Herbert	cb3d0db555	Move combo colours completely out of HitObjects	2018-03-20 15:50:12 +09:00
Dean Herbert	8d790e180d	Fix juice stream droplets spawning in incorrect locations ... Closes #2149.	2018-03-16 17:03:38 +09:00
Dean Herbert	7e7f8ed7a2	Merge branch 'master' into drawable-composite-hit-object	2018-03-16 15:53:16 +09:00
Dean Herbert	23ffee3d38	Merge branch 'master' into drawable-composite-hit-object	2018-03-16 15:38:52 +09:00
Dean Herbert	46f5c0fc19	Merge branch 'master' into mod-fixes	2018-03-16 15:38:41 +09:00
Dean Herbert	a42035f494	Make DrawableHitObject a CompositeDrawable ... No reason for it to be a container.	2018-03-15 13:41:06 +09:00
Joseph Madamba	d122aa80e4	Edit mods description, multiplier, and code	2018-03-13 20:07:03 -07:00
Dean Herbert	c55d70ec13	Merge branch 'master' into fix-combo-colours	2018-03-13 19:19:45 +09:00
Dean Herbert	e43de68ad3	Move colour parsing to LegacyDecoder	2018-03-13 19:13:50 +09:00
smoogipoo	7406cb290f	Split out test beatmap from TestCasePlayer into instantiable class	2018-03-12 19:41:09 +09:00
Dean Herbert	e82cadc811	Make LegacyID nullable ... The -1 default was getting stored to the database.	2018-03-06 17:40:14 +09:00
Dean Herbert	ed8b7d12c4	Merge branch 'master' into fix-catch-legacy-replays	2018-03-04 02:21:10 +09:00
Dean Herbert	0e928429d4	Merge branch 'master' into ruleset-replayframes	2018-03-04 01:57:43 +09:00
Dean Herbert	46d018922e	Ignore catch conversion failures	2018-03-02 20:50:12 +09:00
smoogipoo	a2c239d5e3	Rename to IBeatmapConverter, move to separate file	2018-03-02 20:19:47 +09:00
smoogipoo	71755f5363	Prettyfy some JSON	2018-03-02 20:12:29 +09:00
smoogipoo	820a852caf	Remove unnecessary .osu properties	2018-03-02 18:37:38 +09:00
smoogipoo	cdca7371a3	Replace testcases with a basic test suite	2018-03-02 18:20:33 +09:00
smoogipoo	1f21ccffb0	Add lenience to start times	2018-03-02 18:20:12 +09:00
Dan Balasescu	4aff659272	Merge branch 'master' into beatmap-conversion-testcases	2018-03-02 16:04:32 +09:00
smoogipoo	3d5fefae8c	Add TestFixtureAttribute to all tests	2018-03-02 15:34:31 +09:00
smoogipoo	6fff6da751	Ignore broken testcases	2018-03-02 14:01:34 +09:00
smoogipoo	bae598b9f4	Add a catch beatmap conversion testcase	2018-03-02 13:13:01 +09:00
smoogipoo	7d7a3bab0e	Fix catch legacy replay positions not being relative to playfield size	2018-03-01 14:43:45 +09:00
smoogipoo	a24e8b02e8	Rename catch frame's X to Position	2018-03-01 02:28:15 +09:00
smoogipoo	195b6642e6	Reimplement important frames	2018-03-01 02:28:15 +09:00
smoogipoo	cf42d5bbd5	Remove mostly-unused Score parameter	2018-03-01 02:28:14 +09:00
smoogipoo	c9c65cab53	CreateReplayFrame -> CreateConvertibleReplayFrame	2018-03-01 02:28:14 +09:00
smoogipoo	4a20513fc4	Fix catch always dashing	2018-03-01 02:28:14 +09:00
smoogipoo	222ae70062	Populate rulesets with their replay frames	2018-03-01 02:28:14 +09:00
smoogipoo	a3c7755ade	Implement a conversion process for ReplayFrames	2018-03-01 02:28:14 +09:00
smoogipoo	f5fc9cdfba	Fix catch now having incorrect offsets	2018-02-24 02:59:55 +09:00
smoogipoo	b500b76407	Merge branch 'master' into update-branch	2018-02-08 23:35:48 +09:00
smoogipoo	ccc948a0b9	Update framework (testing)	2018-02-08 12:45:51 +09:00
Dean Herbert	dfc344b47a	Update OpenTK version	2018-02-06 13:47:54 +09:00
Dean Herbert	6b35ef7063	Update OpenTK version	2018-02-05 16:13:30 +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	3bd42e3c85	Fix catch never hitting result screen	2018-02-01 18:08:15 +09:00
Dean Herbert	daac7494dd	Fix incorrect offset check for DrawableCatchHitObjects	2018-02-01 18:08:15 +09:00
FreezyLemon	8f0ab2040f	Add Jetbrains.Annotations NuGet package	2018-01-26 12:46:28 +01:00
smoogipoo	d37844c068	Clean up off-by-one offsets from repeat-related properties	2018-01-23 13:37:25 +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
Aergwyn	ae1adfd2f2	remove unnecessary empty lines ... codefactor.io \(o.o)/ also one unnecessary semicolon	2018-01-12 19:30:34 +01: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	f03b8206da	Make banana showers always last in combo (explodey)	2018-01-12 22:30:35 +09:00
Dean Herbert	20c6f84efa	Fix banana test regression	2018-01-12 22:30:35 +09:00
Dean Herbert	93c4d58b69	Make catch plate fruit again	2018-01-12 22:30:35 +09:00
smoogipoo	90bcec42d7	Remove unused using	2018-01-12 20:48:58 +09:00
Dan Balasescu	56e4212883	Merge branch 'master' into catch-autoplay	2018-01-12 20:25:24 +09:00
Dan Balasescu	d9c47f98a8	Merge branch 'master' into catch-banana-shower	2018-01-12 20:00:00 +09:00
Dean Herbert	7bdedf802c	Fix juice streams not propagating accent colours to nested objects	2018-01-12 19:39:56 +09:00
Dean Herbert	33fdc2c1d6	Add very basic replay handling	2018-01-12 18:35:28 +09:00
Dean Herbert	9e3091bfe9	Change anchors in line with new ScrollingPlayfield implementation ... (cherry picked from commit 079827d)	2018-01-12 18:33:41 +09:00
Dean Herbert	3b929ffd21	Make test more useful ... (cherry picked from commit 5985115)	2018-01-12 18:33:41 +09:00
Dean Herbert	26fedd7e61	Update in line with upstream changes ... (cherry picked from commit 2b6d991)	2018-01-12 18:33:41 +09:00
Dean Herbert	5b15073010	Add actual banana conversion/reading ... (cherry picked from commit d353158)	2018-01-12 18:33:41 +09:00
Dean Herbert	5c79bdc41c	Use switch pattern matching in more places ... Also switch access to many classes to public. (cherry picked from commit 86cc3b7)	2018-01-12 18:33:41 +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	1c3c90bac6	Add banana design ... (cherry picked from commit 6961ca2)	2018-01-12 18:33:41 +09:00
Dean Herbert	354d781002	Merge remote-tracking branch 'upstream/master' into fix-mod-implementation-check	2018-01-12 17:49:31 +09:00
Dean Herbert	9a77005d2e	Make sure unimplemented auto mods aren't consumable	2018-01-12 14:26:23 +09:00
Dean Herbert	e5f17e3ddb	Remove scale from all but palpable fruit	2018-01-11 22:36:21 +09:00
Dean Herbert	0609fc40de	Fix up DrawableJuiceStream/BananaShower ... (cherry picked from commit 0bfb3b6)	2018-01-11 20:56:09 +09:00
Dean Herbert	66ebe2ee66	Change anchors in line with new ScrollingPlayfield implementation ... (cherry picked from commit 079827d)	2018-01-11 20:55:43 +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	9d00e5bb7d	Make ScrollingHitObjectContainer handle nested hitobjects	2018-01-11 15:08:30 +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	58626e3b30	Allow rulesets to create their own instantiation info	2018-01-10 17:04:07 +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