9326 Commits

Author	SHA1	Message	Date
smoogipoo	92d570342c	Fix sample additions not falling back to non-addition bank	2018-11-05 17:35:24 +09:00
Dean Herbert	998a540cf8	Merge branch 'master' into force-sort-objects	2018-11-05 16:23:11 +09:00
smoogipoo	171700cb91	Debounce editor summary timeline seeks	2018-11-05 15:59:40 +09:00
smoogipoo	1fffa48aa0	Sort nested hitobjects post-creation	2018-11-05 12:15:45 +09:00
FreezyLemon	56ff2686ac	Update osu-resources and osu-framework to use binary fonts	2018-11-03 18:09:11 +01:00
Dean Herbert	63cbc8e0e8	Merge branch 'master' into slider-placement	2018-11-02 19:45:34 +09:00
Dean Herbert	e6ee3dc73e	Use framework helper functions for path approximation	2018-11-02 19:26:29 +09:00
Dan Balasescu	7b9afe9cf7	Merge branch 'master' into fix-path-control-point-drag	2018-11-02 13:04:04 +09:00
Dan Balasescu	173d2904b8	Merge branch 'master' into fix-disk-space-errors	2018-11-02 12:15:13 +09:00
Dean Herbert	0a0023920f	Fix not being able to drag control points mid-snake	2018-11-02 04:09:33 +09:00
smoogipoo	1aae123ff5	Make approximators share an interface	2018-11-01 19:16:44 +09:00
Dean Herbert	c1304eca1b	Merge remote-tracking branch 'upstream/master' into slider-placement	2018-11-01 17:59:37 +09:00
Dean Herbert	bb2f8deb18	ControlPoint -> PathControlPoint ... Also Curve -> Path.	2018-11-01 03:56:51 +09:00
Dean Herbert	9cb4374b51	Merge branch 'master' into slider-controlpoint-masks	2018-11-01 02:37:31 +09:00
Dean Herbert	85a7325911	Fix placement masks handling scroll events	2018-10-31 17:23:27 +09:00
Dean Herbert	9aa88293e2	Use HResult	2018-10-31 17:07:05 +09:00
Dean Herbert	29a1d092fa	Don't log disk space related IO errors	2018-10-31 16:43:35 +09:00
Dean Herbert	d38bf38606	Merge branch 'master' into slider-controlpoint-masks	2018-10-31 15:23:30 +09:00
Dean Herbert	d7f3e51050	Merge branch 'master' into editor-mask-placement	2018-10-31 15:00:38 +09:00
Kyle Chang	214ed43b81	Check if SongSelect is current screen before playing selected song	2018-10-30 23:47:54 -04:00
Dean Herbert	5eaf80ab76	Add missing newline	2018-10-31 12:07:06 +09:00
Dean Herbert	3207a585c6	Add missing xmldoc	2018-10-31 12:01:10 +09:00
Dean Herbert	b28c0cd128	Merge branch 'master' into editor-mask-placement	2018-10-31 06:46:48 +09:00
Dean Herbert	7e88b8b457	Merge branch 'master' into selection-mask-testcase	2018-10-31 06:14:33 +09:00
Dean Herbert	5f5e30c378	Merge branch 'master' into mask-separation	2018-10-31 05:59:07 +09:00
Dean Herbert	6f1ef3243d	Proportionally adjust width in line with change	2018-10-31 02:56:25 +09:00
Dean Herbert	4502fa39e9	Merge remote-tracking branch 'upstream/master' into reduce-handle-height	2018-10-31 02:55:38 +09:00
Paul Teng	4bc9161cd1	Leave bigger gap if replaying	2018-10-30 08:32:12 -04:00
smoogipoo	5712a52817	Merge remote-tracking branch 'origin/master' into mask-separation ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs	2018-10-30 16:46:13 +09:00
Dean Herbert	0b534885b8	Update framework	2018-10-30 00:10:34 -07:00
Dean Herbert	113f80570b	Merge remote-tracking branch 'upstream/master' into separate-slider-body	2018-10-30 00:07:29 -07:00
Kyle Chang	6d00aff9fd	Add type parameter to IApplicableToBeatmap	2018-10-30 00:13:33 -04:00
smoogipoo	08b16be3b8	Merge branch 'slider-controlpoint-masks' into slider-placement ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs	2018-10-29 15:55:38 +09:00
smoogipoo	acd703c27b	Make sliders respond to control point changes	2018-10-29 15:36:43 +09:00
smoogipoo	a9f1484e8b	Fix some post-rebase issues	2018-10-29 15:26:28 +09:00
smoogipoo	e964a555d0	Fix DummyWorkingBeatmap having unrealistic defaults	2018-10-29 15:26:28 +09:00
smoogipoo	8b36d9b482	Remove SliderCurve.Offset (unused)	2018-10-29 15:26:07 +09:00
smoogipoo	b3e105ba93	Make curve approximators implement common interface	2018-10-29 15:26:07 +09:00
smoogipoo	619a0dfd59	Merge branch 'separate-slider-body' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs	2018-10-29 15:24:15 +09:00
smoogipoo	dd5a3ad59c	Fix SliderMask not working	2018-10-29 15:17:45 +09:00
Kyle Chang	8f5e495585	Merge branch 'master' of https://github.com/ppy/osu into mania-dual-fix	2018-10-29 00:16:29 -04:00
Kyle Chang	c7e950af7f	Remove EditSelected in favor in inlining beatmapNoDebounce in Edit	2018-10-29 00:04:51 -04:00
Kyle Chang	886dd0f0d4	Remove unneeded using directive	2018-10-28 13:21:12 -04:00
Kyle Chang	2b736c3cd6	Make beatmap edit button reload beatmap without mods	2018-10-28 13:04:45 -04:00
Kyle Chang	f8a8c7cb6b	Stop transferring track when editing	2018-10-28 12:43:19 -04:00
Kyle Chang	8c4e08d280	Merge branch 'master' of https://github.com/qwewqa/osu into mania-dual-fix	2018-10-28 12:02:18 -04:00
Dean Herbert	4f65d67e2b	Merge branch 'master' into skinnable-spritetext	2018-10-28 08:35:25 -07:00
Kyle Chang	df6fc4013a	Add interface to adjust Beatmaps	2018-10-28 02:21:25 -04:00
HoLLy	cf3b4447eb	Fade only textContainer instead of entire MetadataSection	2018-10-26 13:35:51 +02:00
smoogipoo	951a309d04	Increase placement testcase circlesize	2018-10-26 15:36:09 +09:00