736 Commits

Author	SHA1	Message	Date
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	f674fcf2c8	Merge branch 'mask-separation' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs # osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs # osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs	2018-10-26 14:05:30 +09:00
smoogipoo	70f1d17b7e	Merge remote-tracking branch 'origin/master' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs # osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs # osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs	2018-10-16 17:28:16 +09:00
smoogipoo	47be95ce0b	Fix slider nodes using the wrong samples	2018-10-16 17:10:24 +09:00
smoogipoo	5095fbcdf7	Merge remote-tracking branch 'origin/master' into optimise-diffcalc	2018-10-16 10:27:18 +09:00
Dean Herbert	ffbc88c1bf	Merge branch 'master' into fix-catch-scale	2018-10-12 20:56:37 +09:00
smoogipoo	83fd251c7b	Pass sub-controlpoints as span slices	2018-10-11 17:44:25 +09:00
smoogipoo	ff559a3a1b	Merge remote-tracking branch 'origin/master' into playfield-scaling-rework ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs # osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs	2018-10-05 10:40:16 +09:00
smoogipoo	d0007c047a	PlayfieldLayer -> PlayfieldAdjustmentContainer	2018-10-05 10:39:18 +09:00
smoogipoo	540a010fbb	Implement an intermediary EditRulesetContainer	2018-10-03 15:36:24 +09:00
Hanamuke	08f58047c2	Remade measurements, turns out the correction was not needed	2018-09-30 16:08:17 +02:00
Hanamuke	b983e20067	Merge branch 'master' into AR_Catch	2018-09-30 16:01:55 +02:00
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
Dan Balasescu	29e023b252	Merge branch 'master' into fix_combo	2018-09-18 12:54:51 +09: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	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	9b6f5c9097	Fix redundant paranthesis	2018-09-13 17:29:10 +02:00
Hanamuke	7e07a07c01	Fix HitObjects being out of order because of nested objects	2018-09-13 17:15:46 +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
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	31f324945e	Implement combo offsets	2018-08-15 11:47:31 +09:00
smoogipoo	da3e2cfee2	Catch/osu! spinners should have combo	2018-08-15 11:13:23 +09:00
Dan Balasescu	c1517e1521	Merge branch 'master' into judgement-rework	2018-08-06 12:30:46 +09:00
smoogipoo	35b5aeb99a	Fix missed rename	2018-08-06 12:23:08 +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	5fd4ed2f4e	Rename judgement-related methods/events + commenting	2018-08-06 10:55:25 +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	3c06655672	Split out Special mods into Automation and Conversion	2018-07-31 18:00:42 +09:00
smoogipoo	71c49de031	Fix possible nullref if no fruits are ever caught	2018-07-26 21:00:18 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dan Balasescu	64cde1ebad	Merge branch 'master' into use-switch-over-if	2018-07-17 16:44:57 +09:00
Dean Herbert	9f933187e9	Apply review feedback	2018-07-17 16:33:08 +09:00
smoogipoo	827c5c4939	Remove scroll direction from ScrolingPlayfield constructor	2018-07-17 15:14:03 +09:00
Dean Herbert	825941aff1	Use switch with type matching in place of if-else where possible	2018-07-17 14:35:09 +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	812929fa05	Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess	2018-07-02 13:10:42 +09:00
Dean Herbert	c0b65a6a73	Change default IsBonus definition and remove unnecessary overrides	2018-06-29 17:07:08 +09:00
Dean Herbert	cacabeb67e	Remove unused field	2018-06-29 17:00:41 +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	3b262e0d16	Use better casting	2018-06-29 15:01:33 +09:00
Dean Herbert	0940715631	Merge branch 'master' into catch-scoring	2018-06-29 14:59:15 +09:00
smoogipoo	4fb276bab7	Move hyperdash init to PostProcess	2018-06-29 13:52:13 +09:00
smoogipoo	756cabd5d0	Add a preprocess method to BeatmapProcessor	2018-06-29 12:45:48 +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
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
Dean Herbert	34498f7f86	Use var where possible	2018-06-21 17:49:04 +09:00
Dean Herbert	c64f64814f	Remove unnecessary AimRating	2018-06-21 17:32:10 +09:00
Dean Herbert	a9cb214aa9	Replace usage of GetEnumerator	2018-06-21 16:31:33 +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
smoogipoo	5d0c847835	Fix post-merge errors	2018-06-21 12:26:21 +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	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
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
Dean Herbert	a6437c005c	Merge branch 'master' into diffcalc-rework	2018-06-15 18:02:18 +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	e840083ab4	Oops fix incorrectly changed file	2018-06-14 21:38:08 +09:00
smoogipoo	31bd59442f	Remove banana positioning comment	2018-06-14 21:38:08 +09:00
smoogipoo	6867a398ca	Add one more test case	2018-06-14 21:38:08 +09:00
smoogipoo	ced4e61b54	Adjust expected output with spinner changes	2018-06-14 21:38:08 +09:00
smoogipoo	e1f5498924	Discarding 3 times is correct	2018-06-14 21:38:08 +09:00
smoogipoo	250e8645e1	finalisePosition -> applyPositionOffsets	2018-06-14 21:38:08 +09:00
smoogipoo	9b403b0053	Fix non-catch beatmaps not getting properly converted ... Because Osu.ConvertSpinner implements IHasXPosition.	2018-06-14 21:38:08 +09:00
smoogipoo	a97a7e13bd	Rework RNG discarding comment	2018-06-14 21:38:08 +09:00
smoogipoo	cafdbc2d25	Fix discarding too many RNG values, and add test	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
smoogipoo	6ff06d4757	Adjust CatchDifficultyCalculator in-line with changes	2018-06-14 15:48:56 +09:00
Dan Balasescu	cbb883614a	Merge branch 'master' into catch-droplet-fix	2018-06-13 15:18:52 +09:00
clayton	785c24b11b	Check for null CatchJudgement	2018-06-11 13:30:30 -07:00
clayton	d3ada7914c	Fix condition for dropping health on miss	2018-06-11 13:29:36 -07:00
clayton	e44e08201b	Remove unnecessary usings and move Banana out of BananaShower	2018-06-11 12:43:01 -07:00
clayton	3e6e2ac09a	Add CatchBananaShowerJudgements in simulated autoplays	2018-06-09 18:23:05 -07:00
Crusensis	fbc0cd6f5f	Split AffectsCombo into IsBonus	2018-06-09 18:14:33 -07:00
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
Dean Herbert	c4490b5fe8	Fix incorrect licence header	2018-01-09 22:24:12 +09:00
Dan Balasescu	9c602f8770	Merge branch 'master' into drawable-fruit-improvements	2018-01-09 22:06:16 +09:00
Dean Herbert	b8bb0a52e3	Move mod implementations to individual files	2018-01-09 14:08:18 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	36e9232472	Merge master into netstandard	2018-01-05 00:42:48 +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	5bd489863c	Rename enum	2018-01-04 18:20:23 +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	5253ee5c08	Ignore ruleset test	2018-01-04 15:34:57 +09:00
Dean Herbert	996a72b279	Degrade yearin header	2018-01-04 15:25:12 +09:00
Dean Herbert	5f1d360a69	Fix incorrect file header	2018-01-04 15:21:33 +09:00
Dean Herbert	3c06318521	Improve the look of hyperdash fruit	2018-01-03 20:55:52 +09:00
Dean Herbert	b03cbaca77	Add back random rotation	2018-01-03 20:55:44 +09:00
Dean Herbert	9bde8d3da1	Move combo colouring to test case	2018-01-03 20:52:01 +09:00
Dean Herbert	4ee845fea8	Adjust border thickness and fade out rate of border	2018-01-03 19:15:25 +09:00
Dean Herbert	b137c3b2ca	Adjust ticks size	2018-01-03 18:35:43 +09:00
Dean Herbert	921ca6956d	Improve fruit visuals	2018-01-03 18:26:54 +09:00
Dean Herbert	cf1f84cc32	Give fruit a border	2018-01-03 16:32:58 +09:00
Dean Herbert	fd34b36e1a	Add fruit drawable testcase	2018-01-03 16:32:09 +09:00
Dean Herbert	02131d75d4	Let fruits know what index they are in the beatmap to draw a visual representation	2018-01-03 16:31:57 +09:00
Aergwyn	ccb69d16d9	move HitResult in Scoring namespace to replace HitCount	2017-12-30 21:23:18 +01:00
Dean Herbert	2ca10b28c6	Use a non-broken opentk library	2017-12-29 15:42:51 +09:00
smoogipoo	7a793eaded	Merge master into netstandard	2017-12-27 20:48:53 +09:00
smoogipoo	5b529511ec	Update OpenTK nuget package ... Fixes the recent AppVeyor errors	2017-12-27 13:18:34 +09:00
smoogipoo	d288d8a51f	Remove SampleInfoList	2017-12-25 15:40:01 +09:00
smoogipoo	6a29f6020a	Make HitObjects construct nested hit objects	2017-12-22 21:42:54 +09:00
smoogipoo	ac1d27e925	Fix possible nullref exceptions	2017-12-21 23:02:46 +09:00
smoogipoo	d80079a73a	Merge remote-tracking branch 'origin/master' into beatmap-serialization	2017-12-21 20:15:01 +09:00
smoogipoo	cb7e192aff	Determine SampleInfo defaults in DrawableHitObject	2017-12-21 16:02:33 +09:00
Dean Herbert	020d272636	Make all TestCases public	2017-12-20 21:51:00 +09:00
Dean Herbert	08727266e7	Merge branch 'master' into add-ruleset-shortname	2017-12-11 15:41:11 +09:00
FreezyLemon	4a723f7382	Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files	2017-12-08 11:05:00 +01:00
Dean Herbert	679134c030	Add ShortName to rulesets	2017-12-08 18:55:25 +09:00
Dean Herbert	8c3ae9430b	Add difficulty scaling considerations to hyperdash initialisation	2017-12-01 20:39:58 +09:00
Dean Herbert	997cdfaee4	Add missing licence header	2017-12-01 20:31:54 +09:00
Dean Herbert	912d5edcf6	Merge branch 'master' into catch-hyperdash	2017-12-01 20:16:37 +09:00
Dean Herbert	79e1bf3394	Remove unused testcase	2017-12-01 20:14:42 +09:00
Dean Herbert	e75d73ac1c	Change hyperdash colour again	2017-12-01 20:13:46 +09:00
Dean Herbert	bf606522c1	Make hyperdash testcase easier to win again	2017-12-01 20:13:32 +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	07081f400c	Make hyperdash testcase easier to win	2017-12-01 19:33:20 +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
smoogipoo	a30270658d	Merge remote-tracking branch 'origin/master' into netstandard	2017-12-01 18:50:28 +09:00
Dean Herbert	881745d756	Initial implementation of hyperdash calculation	2017-12-01 17:59:36 +09:00
Dean Herbert	76a1c7db3b	Hyperdash preparation	2017-12-01 13:10:51 +09:00
smoogipoo	36be171c29	Fix up/clean up csprojs for C#7 support	2017-11-30 02:06:03 +09:00
smoogipoo	a0c3349935	Add LangVer.props and osu.Game.props for common csproj properties	2017-11-30 00:45:37 +09:00
smoogipoo	267bb75458	Merge remote-tracking branch 'Aergwyn/master' into netstandard	2017-11-29 23:45:29 +09:00
smoogipoo	7db7fb91dd	Ignore ruleset testcases from CI	2017-11-28 21:45:24 +09:00
smoogipoo	a9cc156d7a	Merge remote-tracking branch 'origin/master' into performance-calculator	2017-11-28 21:38:26 +09:00
Dean Herbert	23b4d2163c	Fix spelling and grammar	2017-11-28 21:30:03 +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	5ae9b4c791	Make CatchStacker testcase more useful	2017-11-28 18:39:54 +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	2deb33ac41	Add basic fruit scaling support	2017-11-28 18:34:40 +09:00
Dean Herbert	11d406aa0c	Fix osu!catch conversion expecting full positional data, rather than just X. ... Closes #1367.	2017-11-24 11:49:10 +09:00
smoogipoo	f9ad4b6acb	Make categoryDifficulties return doubles to improve decimal accuracy	2017-11-21 19:55:09 +09:00
smoogipoo	b3bf6e7bee	Merge master into netstandard	2017-11-21 16:39:21 +09:00
smoogipoo	756f6f2d16	Remove net461 targets	2017-11-20 10:10:28 +09:00
smoogipoo	067c018422	Cleanups	2017-11-19 17:31:35 +09:00
smoogipoo	d2ab0621f3	Make osu.Game + rulesets compile with netstandard	2017-11-19 13:46:51 +09:00
smoogipoo	bf44b3d0ef	Cleanups	2017-11-17 16:54:50 +09:00
smoogipoo	38fe95d94a	Add basic display for pp in TestCasePerformancePoints	2017-11-17 14:37:19 +09:00
smoogipoo	95fd323c6b	Fix ManiaDifficultyCalculator possibly failing due to nullref	2017-11-17 14:37:06 +09:00
smoogipoo	ac6213d1fa	CI fixes	2017-11-17 14:26:33 +09:00
smoogipoo	62155e6dd5	Make DifficultyCalculator support mod applications ... Fixes https://github.com/ppy/osu/issues/476.	2017-11-17 12:36:07 +09:00
smoogipoo	f461f03b08	Make osu! compile with framework changes	2017-11-16 14:51:31 +09:00
Dean Herbert	bbc5c05055	Disable ruleset-level tests for now	2017-10-23 21:25:54 +09:00
Dean Herbert	36af0dc809	Update app config for rulesets	2017-10-19 14:59:11 +09:00
Dean Herbert	179542daf1	Standardise AssemblyInfos	2017-10-14 15:02:20 +09:00
Dean Herbert	c5046f6b3c	Add back osu.Desktop project ... While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day. This allows for the project to build again with default visual studio settings.	2017-10-14 14:33:05 +09:00
Dean Herbert	bb6b656ec6	Fix code review issues	2017-10-12 22:27:22 +09:00
Dean Herbert	4a4c01f221	Fix CI problems	2017-10-11 21:25:15 +09:00
Dean Herbert	744d548738	Add missing licence header	2017-10-11 20:28:10 +09:00
Dean Herbert	0b282a49bd	Add tiny droplet support	2017-10-11 20:11:29 +09:00
Dean Herbert	1b732c799a	Make all juice nested objects from ticks	2017-10-11 19:10:07 +09:00
Dean Herbert	1f1bdc6162	Make juice streams interactive (and correctly positioned)	2017-10-11 18:18:06 +09:00
Dean Herbert	e4f915e5af	Fix scoring simulation not supporting juice	2017-10-10 20:22:57 +09:00
Dean Herbert	03fbf47bc2	Add juicy streams	2017-10-10 20:22:42 +09:00
Dean Herbert	26215b4488	Create an abstract base class for drawable catch objects	2017-10-09 19:42:55 +09:00
Dean Herbert	37393ab2c9	Move brace	2017-10-02 22:24:22 +08:00
Dean Herbert	3338024c17	Fix incorrect whitespace	2017-10-02 22:12:53 +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	66afba6219	Allow TestCasePlayer to instantiate only one ruleset type	2017-10-02 20:48:24 +08:00
Sinnoh	3b9c2d1d5f	changed description for hidden ... ctb doesn't have approach circles	2017-09-26 16:50:12 +08:00
Dean Herbert	e0911f014e	Fix ruleset target path for release builds	2017-09-19 22:50:36 +09:00
Dean Herbert	611f4df484	Add licence header	2017-09-19 21:41:51 +09:00
Dean Herbert	f96875a470	Add a catch specific player test	2017-09-19 21:40:57 +09:00