369 Commits

Author	SHA1	Message	Date
Dean Herbert	28a25c201f	Merge remote-tracking branch 'upstream/master' into ranks-section	2017-09-12 19:50:58 +09:00
smoogipooo	195c2d7a31	Keep track of maximum hits + combo at base ScoreProcessor level	2017-09-12 19:48:17 +09:00
smoogipooo	cba642f781	Reduce nesting, because we don't have partial judgements any more	2017-09-12 19:45:14 +09:00
smoogipooo	c07e831b17	Move HasFailed override to base ScoreProcessor	2017-09-12 19:39:54 +09:00
smoogipooo	3af8345068	Add AffectsAccuracy to Judgement	2017-09-12 19:39:44 +09:00
smoogipooo	112429051e	Fix XMLDoc CI errors	2017-09-12 19:05:37 +09:00
Dan Balasescu	ee8ec31c6e	Merge branch 'master' into judgement-revamp	2017-09-12 18:57:37 +09:00
smoogipooo	d5bd005c01	Remove unused code for now ... I don't think we'll ever be using this anyway.	2017-09-12 18:52:15 +09:00
smoogipooo	92b3e203e8	judgementOccurred should be passed upwards ... So only one hit object is ever judged in a single frame.	2017-09-12 18:50:30 +09:00
smoogipooo	a38e0062a4	Fix checking judgements even if we don't provide a judgement, if we have a result, or if a nested hit object handled a judgement.	2017-09-12 18:49:50 +09:00
Dean Herbert	86de4fa2e2	Apply CI fixes	2017-09-12 18:36:19 +09:00
Dean Herbert	f32d444d68	Remove generics from Playfield (fixes catch)	2017-09-12 18:19:28 +09:00
Dean Herbert	d7ac02d090	Ensure judgements aren't updated when ArmedState is not idle	2017-09-12 18:00:41 +09:00
Dean Herbert	1194e46ef1	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-12 17:46:21 +09:00
Dean Herbert	20dae5ee11	Minor refactors	2017-09-12 17:36:46 +09:00
Dan Balasescu	3be9d3c747	Merge branch 'master' into mania-autoplay	2017-09-12 16:44:05 +09:00
smoogipooo	8737a1b1a5	Implement osu!mania auto replay generation.	2017-09-12 15:52:32 +09:00
smoogipooo	d6bf5c38b7	Move Kiai bool to HitObject.	2017-09-12 10:01:07 +09:00
Dean Herbert	7b92bbfa86	Merge branch 'master' into mania-hit-explosions	2017-09-11 17:34:14 +09:00
smoogipooo	f3c6f6f959	Merge branch 'blending-equations' into mania-holdnote-niceness	2017-09-11 15:09:01 +09:00
smoogipooo	4683319156	Merge remote-tracking branch 'origin/master' into mania-hit-explosions	2017-09-11 14:48:40 +09:00
Dean Herbert	5ce76d8023	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-11 14:36:51 +09:00
Dean Herbert	512232c1c8	Fix regression causing autoplay to fail	2017-09-11 14:25:01 +09:00
smoogipooo	0cadee998c	Set default AccentColour for hit objects	2017-09-11 13:44:05 +09:00
smoogipooo	2086ed209d	Fix hold note tick input.	2017-09-11 04:51:44 +09:00
MrTheMake	0b1403683b	Moved OnlineScore inside GetScoresRequest.cs	2017-09-08 12:21:35 +02:00
MrTheMake	526ee107b8	Use a method to apply a beatmap, its ruleset and the mods.	2017-09-08 12:17:16 +02:00
MrTheMake	01553fc9ef	Moved all online related score parsing to its class	2017-09-08 02:46:54 +02:00
MrTheMake	e71f907f89	CI fix	2017-09-07 18:36:16 +02:00
MrTheMake	a7f874e5b6	Merge branch 'master' into leaderboard-scores	2017-09-07 18:25:33 +02:00
MrTheMake	709aa1ed3d	Moved all online score related parsing to its own class	2017-09-07 18:20:14 +02:00
Dean Herbert	5822a6cc96	Merge branch 'master' into ranks-section	2017-09-07 15:11:07 +09:00
Dean Herbert	e834e0e958	Fix incorrect initialisation order causing mania key bindings to not work	2017-09-06 21:07:57 +09:00
smoogipooo	0cc443e618	Remove all generic judgements.	2017-09-06 18:05:51 +09:00
smoogipooo	e85d511645	No more partial judgements.	2017-09-06 17:48:01 +09:00
smoogipooo	63b61ce669	Make TimeOffset internal set.	2017-09-06 17:20:51 +09:00
smoogipooo	f158ce814c	Fix state never getting set.	2017-09-06 17:20:41 +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	d7d0e96e6b	Merge branch 'master' into ranks-section	2017-09-01 18:46:53 +09:00
Dean Herbert	2b667cf789	Fix typos	2017-08-24 20:32:55 +09:00
Dean Herbert	c9f90efb8a	Add more checks and remove direct cast	2017-08-24 20:31:57 +09:00
Dean Herbert	f0635af40d	Add documentation and regions to RulesetInputManager	2017-08-24 15:51:31 +09:00
Dean Herbert	a7a7e0323f	Update autoplay and replay handling to result in actions, not keys	2017-08-24 15:36:42 +09:00
Dean Herbert	189988236b	Move PlayerInputManager logic inside RulesetInputManager	2017-08-24 15:23:17 +09:00
smoogipooo	115e5c95af	Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'.	2017-08-23 20:50:03 +09:00
Dean Herbert	1f04995a73	Merge branch 'master' into hardrock-flipping	2017-08-23 17:00:41 +09:00
smoogipooo	8ddc13e394	Fix replays not loading.	2017-08-23 16:48:13 +09:00
smoogipooo	7639e096d8	No longer flip legacy replay mouse positions.	2017-08-23 15:30:17 +09:00
smoogipooo	68e7cf854f	Add variant names.	2017-08-23 14:19:14 +09:00
smoogipooo	84dd1283de	Fix nullref.	2017-08-23 13:39:51 +09:00
smoogipooo	be96fb32b3	Make RulesetContainer load KeyBindingInputManager in load()	2017-08-23 12:47:47 +09:00
Dean Herbert	ef2d9ffede	Fix redundant initialiser	2017-08-22 23:43:10 +09:00
Dean Herbert	6f8e85c2e1	Merge branch 'master' into fix_taiko_sizing	2017-08-22 23:19:41 +09:00
Dean Herbert	83bd430f89	Merge branch 'master' into fix-speed-adjustments	2017-08-22 23:07:42 +09:00
smoogipooo	f8576d44b1	Add some more xmldoc.	2017-08-22 21:08:27 +09:00
smoogipooo	d080a7e970	Determine size of ScrollingContainer a bit better to avoid taiko weirdness	2017-08-22 20:53:19 +09:00
smoogipooo	db27551709	Make hit objects put in ScrollingContainers strictly ordered by start time ... This won't change anything as is since all hit objects are given a depth at the moment.	2017-08-22 20:51:20 +09:00
jorolf	3025fcdb25	Merge branch 'master' into ranks-section	2017-08-22 13:19:03 +02:00
Dean Herbert	9f52ecbb8a	Merge branch 'master' into mania-key-conversion	2017-08-22 20:08:39 +09:00
smoogipooo	322dfe0250	Fix ScrollingContainer possibly not getting the correct size to cover hit objects.	2017-08-22 19:17:26 +09:00
smoogipooo	ad63cbf455	Fix default comparator being inverted.	2017-08-22 18:54:41 +09:00
smoogipooo	1964bc72e5	Should be FirstOrDefault for hit objects occuriung before the first control point.	2017-08-22 18:39:09 +09:00
smoogipooo	e5d985838f	Set ScrollingAxes and RelativeChildOffset a bit more safely.	2017-08-22 18:37:49 +09:00
smoogipooo	137964b792	Fix hit objects not getting added to the correct speed adjustment container.	2017-08-22 18:37:10 +09:00
smoogipooo	b46a51fd8b	Make the speed adjustment containers ordered decreasingly by their control point start time.	2017-08-22 18:36:32 +09:00
smoogipooo	0189f01402	Explicitly store defaultSpeedAdjustment, and make it un-removable	2017-08-22 16:15:50 +09:00
smoogipooo	5a3c0de7ad	Fix further incorrect comparison.	2017-08-22 16:10:58 +09:00
smoogipooo	a737f5fe0d	CI fixes.	2017-08-22 16:06:25 +09:00
smoogipooo	d20ea97e7f	Add NUnit test for ScrollingHitObjectContainer ... Tests ordering of SpeedAdjustmentContainers and DrawableHitObjects added to the ScrollingHitObjectContainer.	2017-08-22 16:06:19 +09:00
smoogipooo	c3cfad4eb5	Add RemoveSpeedAdjustment	2017-08-22 16:06:14 +09:00
smoogipooo	4fc77be624	Fix incorrect sorting of hit objects into SpeedAdjustmentContainers	2017-08-22 16:06:09 +09:00
smoogipooo	6f662d721c	Fix possible CollectionModifiedException while adding new SpeedAdjustmentContainers	2017-08-22 16:06:04 +09:00
smoogipooo	b7b8d8b764	Let's not construct scrolling containers in load() for now ... This isn't utilized at the moment, and we should be avoiding this here in the first place.	2017-08-22 16:05:59 +09:00
smoogipooo	5fcd94880d	Fix incorrect inequality with multiple speed adjustments at the same start time.	2017-08-22 16:05:53 +09:00
smoogipooo	68c7226d12	Fix cherry pick issues.	2017-08-22 14:18:17 +09:00
smoogipooo	88151eff3f	Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps.	2017-08-22 14:07:39 +09:00
smoogipooo	4eec59f669	Only set the number of availableColumns once, at ManiaRulesetContainer level. ... # Conflicts: # osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs	2017-08-22 14:07:37 +09:00
smoogipooo	964982e2e6	Remove now unneeded ApplyBeatmap.	2017-08-22 14:05:28 +09:00
Dean Herbert	250fb33fbc	Merge branch 'master' into ranks-section	2017-08-22 12:46:28 +09:00
Dean Herbert	881eecb528	Merge branch 'master' into master	2017-08-22 12:35:36 +09:00
Dean Herbert	7903f49d27	Merge branch 'master' into action-key-counter	2017-08-21 17:47:19 +09:00
Dean Herbert	52dadad1e1	Merge branch 'master' into fix-taiko-barlines	2017-08-21 16:46:25 +09:00
Dean Herbert	ea450fecf5	Merge branch 'master' into action-key-counter	2017-08-21 16:25:44 +09:00
smoogipooo	6e0d2182cb	CI.	2017-08-21 16:24:16 +09:00
smoogipooo	5d13efa76d	Remove the concept of "queued hit objects", add a default speed adjustment.	2017-08-21 16:17:00 +09:00
smoogipooo	7a5708ce92	Further support for null judgements.	2017-08-21 15:35:16 +09:00
Dean Herbert	a63923a497	Remove type check for now	2017-08-21 12:50:48 +09:00
Dean Herbert	16e96888ab	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
smoogipooo	6a7b410bc3	Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147	2017-08-21 11:58:54 +09:00
MrTheMake	f831832c59	CI fix	2017-08-19 00:13:06 +02:00
MrTheMake	6d401b5f21	Merge branch 'master' into leaderboard-scores	2017-08-19 00:00:40 +02:00
Dean Herbert	bc7621607a	Merge upstream/master in.	2017-08-18 22:20:45 +09:00
smoogipooo	90885a31ae	Round 2 of CI fixes.	2017-08-18 15:09:54 +09:00
smoogipooo	a47b6526a2	Fix CI issues.	2017-08-18 14:40:36 +09:00
Dan Balasescu	68303accef	Merge branch 'master' into make-rulesetinfo-iequatable	2017-08-18 14:28:42 +09:00
tgi74000	dc31a0f0ac	Merged ppy/master	2017-08-17 13:01:42 +02:00
MrTheMake	586a652b08	Changed Mods to be a property	2017-08-17 12:24:22 +02:00
MrTheMake	105048500a	Made modString private and moved the beatmap assignment inside GetScoresRequest	2017-08-15 15:30:53 +02:00
MrTheMake	2c287e1348	CI and comment fix	2017-08-15 12:27:51 +02:00