64 Commits

Author	SHA1	Message	Date
smoogipooo	68c7226d12	Fix cherry pick issues.	2017-08-22 14:18:17 +09:00
Dean Herbert	8c84732a40	Merge branch 'master' into fix-taiko-drumroll-conversion	2017-08-21 16:35:31 +09:00
smoogipooo	0970439e34	Fix TaikoBeatmapConverter attempting to convert taiko-specific drum rolls to hits. Fixes #1149	2017-08-21 12:05:56 +09:00
smoogipooo	6a7b410bc3	Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147	2017-08-21 11:58:54 +09:00
Dean Herbert	fce580d717	Reshuffle namespaces	2017-07-26 13:22:46 +09:00
smoogipooo	3cdfd2eef5	Split ControlPoint into different types. ... # Conflicts: # osu.Game.Rulesets.Mania/UI/Column.cs	2017-05-23 14:03:40 +09:00
smoogipooo	67cf64062a	Add flag to determine whether the beatmap requested for conversion is for the current ruleset.	2017-05-19 16:02:40 +09:00
Huo Yaoyuan	e466380ee2	Generic infer for IJsonSerializable.DeepClone.	2017-05-08 19:33:37 +08:00
smoogipooo	28f7e0cdba	Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings.	2017-04-26 14:12:21 +09:00
smoogipooo	ac5f70b765	Fix drum roll conversion not generating strong hits.	2017-04-26 13:48:31 +09:00
smoogipooo	f750325aa1	Bring up to date.	2017-04-21 20:10:14 +09:00
smoogipooo	29fe0b471c	Fix drum rolls not taking into account nodal samples when converting from drum rolls to hit circles.	2017-04-21 18:52:08 +09:00
smoogipooo	8facf473d1	Fix drum rolls not being correctly converted to hitcircles.	2017-04-20 13:05:57 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00