134 Commits

Author	SHA1	Message	Date
Huo Yaoyuan	374ef6ff83	Merge branch 'master' into sharpen	2019-11-20 17:30:58 +08:00
Huo Yaoyuan	b1b234c6fb	Use paramref.	2019-11-17 20:49:36 +08:00
Huo Yaoyuan	8a1b70513c	No this. qualification.	2019-11-12 19:55:29 +08:00
Dean Herbert	5899bbd8a6	Fix merge regressions	2019-10-30 18:45:50 +09:00
Dean Herbert	93076ad6a1	Merge branch 'master' into editor-timing-screen	2019-10-30 18:42:20 +09:00
Dan Balasescu	514c9f1eef	Merge branch 'master' into bindable-control-points	2019-10-30 16:20:54 +09:00
Dean Herbert	090881cf6f	Add default bindable values	2019-10-28 16:23:43 +09:00
Dean Herbert	8f87957c70	Make all control point attributes bindable ... Properties are left intact for compatibility reasons.	2019-10-28 16:23:43 +09:00
Dean Herbert	43ad4a3a3c	Tidy up string output	2019-10-28 12:31:38 +09:00
Dean Herbert	45da22afe9	Add xmldoc and combine GroupAt / CreateGroup	2019-10-28 11:40:33 +09:00
Dean Herbert	2a6b3fd67c	Disallow inserting a group if one already exists with the current time value	2019-10-28 11:40:10 +09:00
Dean Herbert	59d983b66e	Allow binding to ControlPointInfo's Groups	2019-10-28 11:39:53 +09:00
Dean Herbert	10033239c7	Allow binding to ControlPointGroup's ControlPoints	2019-10-28 11:39:17 +09:00
Dean Herbert	29e20bc8d2	Add xmldoc and combine GroupAt / CreateGroup	2019-10-28 10:45:11 +09:00
Dean Herbert	0179586f78	Disallow inserting a group if one already exists with the current time value	2019-10-27 16:31:23 +09:00
Dean Herbert	73369ae613	Add the ability to add/remove groups	2019-10-27 16:13:24 +09:00
Dean Herbert	0fba272e78	Add the ability to add new ControlPoint types to existing groups	2019-10-27 15:19:36 +09:00
Dean Herbert	acc0251124	Merge branch 'no-auto-gen' into editor-timing-screen	2019-10-27 12:36:21 +09:00
Dean Herbert	4290a71f44	Add special case for timing points ... Timing points can't fallback to defaults and must be added at least once.	2019-10-26 11:38:05 +09:00
Dean Herbert	8ccff0e9cf	temp	2019-10-26 11:20:07 +09:00
Dean Herbert	7502b64541	Merge branch 'control-point-grouping' into no-auto-gen	2019-10-26 10:35:34 +09:00
Dean Herbert	d6a49b9e93	Add back autogeneration rules ... Will be removed in https://github.com/ppy/osu/pull/6604	2019-10-26 10:25:37 +09:00
Dean Herbert	7100319858	Fix incorrect control point retrieval in non-lookup cases	2019-10-26 08:31:41 +09:00
Dean Herbert	b52be3d639	Merge branch 'control-point-grouping' into no-auto-gen	2019-10-26 01:20:08 +09:00
Dean Herbert	d25f7f4c27	Correctly clear other lists	2019-10-26 01:19:23 +09:00
Dean Herbert	eefa411182	Merge branch 'control-point-grouping' into no-auto-gen	2019-10-25 23:15:25 +09:00
Dean Herbert	d4fed43be7	Merge branch 'equivalent-to' into control-point-grouping	2019-10-25 23:15:15 +09:00
Dean Herbert	e39016bf01	Fix known non-nulls	2019-10-25 20:04:27 +09:00
Dean Herbert	8baf569f59	Remove necessity of AutoGenerated flag	2019-10-25 19:58:42 +09:00
Dean Herbert	e987db37ec	Add grouping of ControlPoints	2019-10-25 19:52:02 +09:00
Dean Herbert	e2f2638212	Replace local Equatable implementations with abstract EquivalentTo	2019-10-25 19:44:28 +09:00
Dean Herbert	f6ad95018a	Centralise default beat length specification	2019-08-28 20:22:16 +09:00
Dean Herbert	60ea3d4e1a	Fix skinning support for combobreak	2019-06-30 21:58:30 +09:00
smoogipoo	7a56fe84f2	Remove ControlPoint.EquivalentTo	2019-05-21 14:27:57 +09:00
Dean Herbert	66ebdbbe4c	Fix control points with same timestamp potentially being parsed incorrectly	2019-05-08 18:13:07 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
smoogipoo	1bebceada7	Unroll loop for the last control point	2018-10-17 11:55:34 +09:00
smoogipoo	336b6fa38e	Perform a custom binary search to remove thread-unsafeness	2018-10-17 11:23:18 +09:00
smoogipoo	72aaaa4a74	PointSearch -> SearchPoint	2018-10-16 10:29:53 +09:00
smoogipoo	7b2a30f5b4	Reduce some high-profile enumerator allocations	2018-10-11 19:52:03 +09:00
smoogipoo	10fb1d20d1	Remove allocation of control point with every binarysearch	2018-10-11 19:08:00 +09:00
smoogipoo	b7499fa956	Allow TimingControlPoint to be overridden	2018-10-09 11:34:38 +09:00
smoogipoo	de8d05bb0c	Remove unnecessary setting of sample name to same value	2018-07-20 15:12:21 +09:00
Dean Herbert	44aecdc3a0	Rename method to EquivalentTo	2018-07-05 15:00:02 +09:00
smoogipoo	8b0c6a4c85	Make SampleControlPoint clone the existing SampleInfo	2018-07-02 14:17:19 +09:00
Dan Balasescu	37495c34fa	Fix possible nullreference	2018-07-02 13:51:47 +09:00
smoogipoo	b664d3ef81	Fix time being a part of controlpoint change comparisons	2018-07-02 13:34:25 +09:00
smoogipoo	aea50e770b	Use .Equals everywhere	2018-07-02 13:34:14 +09:00
smoogipoo	781095b96b	Encapsulate the method to apply SampleControlPoints to SampleInfos	2018-06-28 18:29:07 +09:00
smoogipoo	2882981f9c	Implement and use equality comparers for ControlPoint	2018-06-28 18:28:59 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Dean Herbert	b8ea4b11ab	Adjust range further ... This is not a great idea.	2018-03-01 00:39:59 +09:00
Dean Herbert	572d3b1316	Move bpm clamping to TimingControlPoint, adjust range to 1-10000bpm ... In line with stable editor restrictions	2018-02-28 22:53:28 +09:00
Dean Herbert	6f44db6de0	Clamp at DifficultyControlPoint ... This is what stable did.	2018-02-28 18:10:38 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	5eb2dc3d64	Cleanup some possible CI errors ... Not sure why these aren't being detected on master right now - they should be...	2018-01-05 01:20:24 +09:00
smoogipoo	b95d7fc2cd	Revert "Make ControlPointInfo return a set default control point" ... This reverts commit 3113a55a98.	2017-12-27 12:41:59 +09:00
smoogipoo	d479955e20	Fix spelling error	2017-12-26 20:01:02 +09:00
smoogipoo	3113a55a98	Make ControlPointInfo return a set default control point	2017-12-26 19:33:01 +09:00
smoogipoo	836d807f4f	Give SampleControlPoint a 100% volume by default	2017-12-26 19:32:20 +09:00
Dean Herbert	9ca03c0209	Simplify and tidy sample retrieval ... Less static weirdness	2017-12-23 16:46:02 +09:00
Dean Herbert	5026c7a95e	SoundControlPoint -> SampleControlPoint	2017-12-23 16:34:34 +09:00
smoogipoo	a3fcc0b60c	Back to using SortedLists	2017-12-21 19:40:41 +09:00
smoogipoo	cb7e192aff	Determine SampleInfo defaults in DrawableHitObject	2017-12-21 16:02:33 +09:00
smoogipoo	f9e34dfa3d	Assume that control points are already sequentially-ordered ... Fixes up deserializing.	2017-12-06 16:24:09 +09:00
smoogipoo	b584178e85	Make Beatmap ISerializable and add more JsonIgnores	2017-12-06 00:37:37 +09:00
Miterosan	840946d160	list can not be null in ControlPointInfo.cs	2017-11-07 23:08:24 +01:00
smoogipooo	6a7b410bc3	Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147	2017-08-21 11:58:54 +09:00
Dean Herbert	a01209cfe0	Simplify comparator	2017-07-19 18:09:59 +09:00
Dean Herbert	007b343854	Fix incorrect equality check when TimingPointAt returns a default T	2017-07-19 15:16:40 +09:00
Dean Herbert	de46f3ab07	Remove all unnecessary parenthesis where object initialisers are used ... Enforces at CI.	2017-07-13 15:11:33 +09:00
Dean Herbert	f439237bd7	Set a more sane default for TimingControlPoint's BeatLength	2017-06-15 14:19:06 +09:00
Dean Herbert	53f489b447	Remove using	2017-05-24 11:50:12 +09:00
smoogipooo	0a385055dc	Remove Func<T>'d-ness.	2017-05-24 02:53:08 +09:00
smoogipooo	41824e0179	Add comment.	2017-05-24 02:24:10 +09:00
smoogipooo	2d1df8fd8a	xmldoc fixes.	2017-05-24 02:22:28 +09:00
smoogipooo	9e7f384203	Fix returning incorrect control points for non-timing points.	2017-05-24 02:19:22 +09:00
smoogipooo	462bbd02ba	Simplify expression.	2017-05-24 01:38:28 +09:00
smoogipooo	7628cdf522	Return first control point in the list if the time is before it.	2017-05-24 01:38:04 +09:00
smoogipooo	836bf930a0	More cleanups.	2017-05-23 15:29:38 +09:00
smoogipooo	002a0e99a2	Use SortedList + BinarySearch to find control points at time values.	2017-05-23 15:20:32 +09:00
smoogipooo	6bfd7e0fb0	xmldocs.	2017-05-23 14:11:37 +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