154 Commits

Author	SHA1	Message	Date
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
Dean Herbert	f5ab93a712	Make all drawable fruit absolute values easily scalable	2018-05-25 17:37:52 +09:00
frankhjwx	44fd4b95bd	We need DistanceToHyperDash for star rating calculation	2018-05-21 09:58:46 +08:00
smoogipoo	97a523584d	Make HitWindows not return null by default	2018-05-11 15:52:51 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +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	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	a42035f494	Make DrawableHitObject a CompositeDrawable ... No reason for it to be a container.	2018-03-15 13:41:06 +09:00
smoogipoo	f5fc9cdfba	Fix catch now having incorrect offsets	2018-02-24 02:59:55 +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
smoogipoo	d37844c068	Clean up off-by-one offsets from repeat-related properties	2018-01-23 13:37:25 +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	93c4d58b69	Make catch plate fruit again	2018-01-12 22:30:35 +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	9e3091bfe9	Change anchors in line with new ScrollingPlayfield implementation ... (cherry picked from commit 079827d)	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	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
smoogipoo	9d00e5bb7d	Make ScrollingHitObjectContainer handle nested hitobjects	2018-01-11 15:08:30 +09:00
smoogipoo	86b5591583	Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite	2018-01-10 18:02:49 +09:00
Dan Balasescu	9c602f8770	Merge branch 'master' into drawable-fruit-improvements	2018-01-09 22:06:16 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	f34131f8f4	Initial game-wide replacement of scrolling playfields	2018-01-04 18:50:17 +09:00
Dean Herbert	5bd489863c	Rename enum	2018-01-04 18:20:23 +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	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
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	cb7e192aff	Determine SampleInfo defaults in DrawableHitObject	2017-12-21 16:02:33 +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
Dean Herbert	881745d756	Initial implementation of hyperdash calculation	2017-12-01 17:59:36 +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	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	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	0aa152974a	Add interfaces to CatchBaseHit	2017-09-19 21:40:38 +09:00
Dean Herbert	fe221905fa	Make fruits look a bit closer to the final design	2017-09-15 20:55:04 +09:00
Dean Herbert	4e0aed4b8a	Add combo/colour metadata to CatchBaseHit	2017-09-15 20:54:34 +09:00
smoogipooo	0cc443e618	Remove all generic judgements.	2017-09-06 18:05:51 +09:00
smoogipooo	ac8ec31b61	Make judgements able to be "added" plus make everything compile and run.	2017-09-06 17:02:13 +09:00
Dean Herbert	84c22df3f5	Combine Judgement.HitResults into one.	2017-09-06 17:01:48 +09:00
Dean Herbert	06e5f7de09	Make pulp size private	2017-08-09 10:16:31 +09:00
Dean Herbert	ff490cf44c	Add catching support	2017-08-08 12:58:43 +09:00
Dean Herbert	99a00ed319	Make fruit look a bit better (and buffer them to a texture)	2017-08-08 12:58:43 +09:00
Dean Herbert	4bdaa8ae68	Add basic miss support	2017-08-08 10:36:05 +09:00
Dean Herbert	e67379b6de	Use ScrollingHitRenderer	2017-08-08 10:35:56 +09:00
Dean Herbert	725a69d973	Begin conversion	2017-08-07 16:02:14 +09:00
Dean Herbert	c930085213	Add glow	2017-08-07 11:06:03 +09:00
Dean Herbert	51d2b9c35c	Tidy up visually	2017-08-07 11:05:58 +09:00