9360 Commits

Author	SHA1	Message	Date
Dean Herbert	a8b1e509e7	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-07 17:30:52 +09:00
smoogipoo	4277cb0d59	Adjust some missed renames	2018-11-07 15:04:48 +09:00
smoogipoo	e9e50f41fb	Use Name/NameScreen format	2018-11-07 13:04:17 +09:00
smoogipoo	52f4923c8e	Remove intermediate Screens namespace	2018-11-06 18:28:22 +09:00
smoogipoo	ac25718c5a	Renamespace compose-mode components	2018-11-06 18:14:46 +09:00
smoogipoo	27d82052f4	BorderLayer -> EditorPlayfieldBorder	2018-11-06 18:10:46 +09:00
smoogipoo	85f96ad62f	Fix a few missed renames	2018-11-06 18:07:53 +09:00
smoogipoo	b3fa7c111b	Rename testcases	2018-11-06 18:06:20 +09:00
smoogipoo	bd775af274	PlacementMask -> PlacementBlueprint	2018-11-06 18:04:03 +09:00
smoogipoo	11be820efe	CreateMaskFor -> CreateBlueprintFor	2018-11-06 18:03:21 +09:00
smoogipoo	90c813618a	Merge PlacementContainer into BlueprintContainer	2018-11-06 18:02:55 +09:00
smoogipoo	f2a5f28ea2	SelectionMask -> SelectionBlueprint	2018-11-06 17:56:04 +09:00
smoogipoo	ad2836a61e	MaskSelection -> SelectionBox	2018-11-06 17:52:47 +09:00
smoogipoo	65bb91dcf7	Merge MaskContainer into BlueprintContainer	2018-11-06 17:51:26 +09:00
smoogipoo	26c9390c16	HitObjectMaskLayer -> BlueprintContainer	2018-11-06 17:36:10 +09:00
smoogipoo	faab744cbd	DragLayer -> DragBox	2018-11-06 17:24:57 +09:00
Dean Herbert	9c5eddea54	Allow running tournament tools from main executable	2018-11-06 14:49:09 +09:00
Dean Herbert	43c70d354d	Merge tag '2018.1105.0' into tournament-tools	2018-11-06 00:35:21 +09:00
Dean Herbert	4554fc2c7b	Update framework and other dependencies	2018-11-05 18:22:16 +09:00
smoogipoo	ace1dce281	Merge remote-tracking branch 'origin/master' into fix-slider-samples ... # Conflicts: # osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs	2018-11-05 18:10:22 +09:00
smoogipoo	92d570342c	Fix sample additions not falling back to non-addition bank	2018-11-05 17:35:24 +09:00
smoogipoo	a4caaf56ef	Merge remote-tracking branch 'origin/master' into fix-slider-samples ... # Conflicts: # osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs	2018-11-05 16:38:28 +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
Dean Herbert	5006dc47a3	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-04 02:26:17 +09:00
FreezyLemon	56ff2686ac	Update osu-resources and osu-framework to use binary fonts	2018-11-03 18:09:11 +01:00
Dean Herbert	9f5546fd62	Fix API regression in direct	2018-11-02 21:13:46 +09: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	0f1ffe392f	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-01 17:52:24 +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