4604 Commits

Author	SHA1	Message	Date
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
MrTheMake	21ced32297	Formatted and commented the GetAllMods() function	2017-08-15 12:03:43 +02:00
MrTheMake	e908a3675e	Formatted the GetAllMods() function	2017-08-14 18:24:54 +02:00
MrTheMake	5ed717ef86	Shortened GetAllMods() using LINQ	2017-08-14 15:16:22 +02:00
MrTheMake	920710e7d0	Assign a score's beatmap and cleanup to the Score class	2017-08-14 13:30:54 +02:00
Dean Herbert	7c9d6c9c83	Initial refactoring of key binding logic	2017-08-14 20:19:25 +09:00
MrTheMake	e54f659916	Suggested changes	2017-08-13 22:37:39 +02:00
MrTheMake	2f89fc432b	Removed unused function	2017-08-13 20:28:30 +02:00
MrTheMake	81289db33b	CI fix, fixed nullref and removed abstraction of GetAutoplayMod	2017-08-13 20:12:01 +02:00
MrTheMake	d9c26f98c7	Suggested changes	2017-08-13 19:54:07 +02:00
MrTheMake	997d0c9053	CI fix	2017-08-13 17:45:46 +02:00
MrTheMake	4c2d7bf343	Parse the mods of a leaderboard's score	2017-08-13 17:41:13 +02:00
Shane Woolcock	d19c8f56be	Make RulesetInfo implement IEquatable since EqualityComparer was sometimes giving false negatives and causing Bindable observers to fire	2017-08-13 15:03:01 +09:30
MillhioreF	e42c279229	More generic catching for broken hitobject strings	2017-08-10 01:50:20 -05:00
MillhioreF	c16dbc05aa	Add new error for malformed (too many variables) hit objects during import	2017-08-09 23:41:22 -05:00
jorolf	934c2a1dc8	Merge branch 'master' into ranks-section	2017-08-09 18:47:25 +02:00