708 Commits

Author	SHA1	Message	Date
Dean Herbert	084fa2f04a	Add timeline beat display	2020-01-27 17:38:50 +09:00
Dean Herbert	e24c4ab901	Adjust zoom defaults for timeline to be more useful	2020-01-27 17:34:40 +09:00
Dean Herbert	df665c3a3c	Move beat index colour retrieval to static function	2020-01-27 17:34:40 +09:00
Dean Herbert	508b92e611	Update beat divisor colours to be more distinguishable ... Close to osu-stable	2020-01-27 17:34:40 +09:00
Dan Balasescu	368587fc06	Merge branch 'master' into timeline-maybe	2020-01-24 18:08:29 +09:00
smoogipoo	811ddb02a4	General refactoring	2020-01-24 17:50:36 +09:00
smoogipoo	28727bbafd	Fix crash when deselecting via ctrl+click	2020-01-24 17:30:37 +09:00
Dean Herbert	e4702ffe9e	Fix editor rate adjustment polluting global beatmap rate	2020-01-24 13:10:02 +09:00
Dean Herbert	5646f7777e	Add comment about custom SelectionHandler	2020-01-23 16:23:42 +09:00
Dean Herbert	5cadbb1ffb	Move timeline blueprint to own class	2020-01-23 16:22:43 +09:00
Dean Herbert	9d90799447	Remove useless container	2020-01-23 16:20:42 +09:00
Dean Herbert	143d47ec93	Merge pull request #7538 from peppy/decouple-blueprint-container ... Decouple blueprint container to allow usage in timeline	2020-01-23 16:13:51 +09:00
Dean Herbert	02ae92418f	Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container	2020-01-23 15:54:46 +09:00
Dean Herbert	289be7a17b	Merge branch 'i-beat-snapping' into timeline-maybe	2020-01-23 15:45:33 +09:00
Dean Herbert	ccf911884b	Remove passed in BaetDivisor	2020-01-23 15:31:56 +09:00
Dean Herbert	098d643955	Move beat snapping to its own interface	2020-01-23 14:39:56 +09:00
Dean Herbert	56c044c44a	Move beat snapping to its own interface	2020-01-23 14:30:25 +09:00
Dean Herbert	cb09c2e144	Add support for dragging outside visible extents	2020-01-23 14:30:25 +09:00
Dean Herbert	477e1b7d27	Rename TimelineHitObjectDisplay to TimelineBlueprintContainer	2020-01-23 14:30:25 +09:00
Dean Herbert	9d2a46df89	Add beat snapping to timeline movement	2020-01-23 14:30:25 +09:00
Dean Herbert	c76f76e5aa	Fix being able to drag out of the blueprint intending to be moved	2020-01-23 14:30:25 +09:00
Dean Herbert	aa1a226ab7	Remove unused ScreenSpaceStartPosition field	2020-01-23 14:30:25 +09:00
Dean Herbert	53bdf72592	Allow basic timeline selection temporal movement	2020-01-23 14:30:25 +09:00
Dean Herbert	cb6e7425ae	Make dragbox stateful to fix blueprint movement	2020-01-23 14:30:25 +09:00
Dean Herbert	f0d810fe20	Follow start time and duration changes	2020-01-23 14:30:08 +09:00
Dean Herbert	63cef8b8b7	Rename nested classes to be more appropriate	2020-01-23 14:30:08 +09:00
Dean Herbert	89d90fdfa0	Fix drag not updating until mouse is moved while scrolling timeline	2020-01-23 14:30:07 +09:00
Dean Herbert	a8ec4907c4	Fix selections while scrolling timeline	2020-01-23 14:27:21 +09:00
Dean Herbert	c4395b1cea	Clean up nested class implementations	2020-01-23 14:27:20 +09:00
Dean Herbert	482409e776	Colour extension bars of long objects	2020-01-23 14:26:33 +09:00
Dean Herbert	a6775d1bd3	Implement custom drag box and allow drag seeking once again	2020-01-23 14:26:33 +09:00
Dean Herbert	8a7f7c5e46	Merge remote-tracking branch 'smoogipoo/void-key-up-returns' into update-framework	2020-01-22 22:57:56 +09:00
Dean Herbert	7c62cc3ac3	Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework	2020-01-22 22:57:52 +09:00
smoogipoo	7b2f58eb30	Apply OnRelease method signature refactorings	2020-01-22 13:22:34 +09:00
Dean Herbert	e3a2b20f63	Fix SelectionHandler visibility on remote selection	2020-01-22 01:32:11 +09:00
Dean Herbert	83fa4a9bb3	Move circle size to a constant	2020-01-21 22:24:04 +09:00
Dean Herbert	a963d652bc	Mark readonly	2020-01-21 20:54:50 +09:00
Dean Herbert	c88bdbd4a0	Share selected hitobjects across multiple blueprint containers	2020-01-21 20:46:39 +09:00
Dean Herbert	1ce78afa98	Disable y offset for now	2020-01-21 19:51:44 +09:00
Dean Herbert	f582c42bbd	Perform deletion directly via EditorBeatmap	2020-01-21 18:56:09 +09:00
Dean Herbert	a888d148b6	Remove remaining cast	2020-01-21 18:01:10 +09:00
Dean Herbert	6187b2e77c	Implement IDistanceSnapProvider in timeline for now	2020-01-21 18:00:36 +09:00
Dean Herbert	353b74b04a	Handle selection events in timeline	2020-01-21 17:37:35 +09:00
Dean Herbert	79351976d5	Allow timeline content to get more localised dependencies	2020-01-21 17:37:05 +09:00
Dean Herbert	8f16c1cb04	Add non-hiding selection state	2020-01-21 14:21:00 +09:00
Dean Herbert	53fe0ce790	Use AliveChildren	2020-01-21 14:20:52 +09:00
Dean Herbert	bd96cf94a6	Begin refactoring SelectionBlueprint to handle non-drawable HitObjects	2020-01-21 12:47:14 +09:00
smoogipoo	40f502c6d1	Apply input method signature refactorings	2020-01-20 19:35:37 +09:00
smoogipoo	1b1003bd73	Refactor	2020-01-20 18:31:25 +09:00
smoogipoo	bfb056c612	Apply input method signature refactorings	2020-01-20 18:17:21 +09:00
Dean Herbert	25aff5d96e	Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container	2020-01-20 17:08:59 +09:00
smoogipoo	9535b3eeba	Fix possible nullref on blueprint removal	2020-01-16 12:00:36 +09:00
smoogipoo	5f178b7755	General refactorings	2020-01-16 11:54:03 +09:00
Dean Herbert	d57f55f053	Apply remaining changes required to restore previous functionality	2020-01-15 19:09:49 +09:00
smoogipoo	e49701a215	Save before exporting	2020-01-15 13:48:28 +09:00
smoogipoo	c25fefa3ca	Add beatmap package export	2020-01-15 13:44:46 +09:00
smoogipoo	b51575b433	Add temporary keybind for saving	2020-01-14 19:24:53 +09:00
smoogipoo	ea7510d2f5	Rename menu option	2020-01-14 19:24:53 +09:00
smoogipoo	a255832195	Add beatmapmanager method for saving	2020-01-14 19:24:53 +09:00
smoogipoo	91735ff367	Update MathUtils namespace usages	2020-01-09 13:43:44 +09:00
Dean Herbert	d8d12cbbdd	wip: Move more functionality into ComposeBlueprintContainer	2020-01-02 19:09:37 +09:00
Dean Herbert	ee332e0d42	Split out BlueprintContainer functionality further	2020-01-02 18:21:16 +09:00
Dean Herbert	f09f9eb07d	Merge branch 'master' into general-editor-beatmap	2020-01-01 23:27:08 +09:00
Dean Herbert	4f2fa2626a	Centralise calls to mutable hitobjects list	2020-01-01 21:24:00 +09:00
smoogipoo	8c378dc625	Move EditorBeatmap construction/conversion to Editor	2019-12-30 14:51:14 +09:00
smoogipoo	6069d98ced	Remove generic editor beatmap	2019-12-27 19:39:30 +09:00
Dean Herbert	bf85f4affb	Fix editor crashing when loading a beatmap for an unsupported ruleset	2019-12-18 17:53:26 +09:00
smoogipoo	59345c97e4	Remove now unnecessary editor working beatmap	2019-12-12 15:58:31 +09:00
Dean Herbert	606bd33aa6	Use beatmap background in editor	2019-12-12 13:04:32 +09:00
smoogipoo	94a298a82d	Refactor distance snap grid to not require hitobjects	2019-12-10 16:00:09 +09:00
Dean Herbert	b1426d1b22	Full impossible nullref	2019-12-06 12:51:43 +09:00
Dean Herbert	9248fbe881	Remove extra checkboxes for now	2019-12-06 12:22:44 +09:00
Dean Herbert	28400aa865	Update test scene	2019-12-06 11:27:24 +09:00
Dean Herbert	12a9843835	Move thickness to a constant	2019-12-06 10:48:18 +09:00
Dean Herbert	e76f8bdd64	Fix warnings	2019-12-05 23:31:21 +09:00
Dean Herbert	d8620a70fb	Make work in editor	2019-12-05 20:12:25 +09:00
Dean Herbert	e225b0032a	Add basic hitobject display to timeline	2019-12-05 19:31:40 +09:00
Dean Herbert	709ec1404f	Centralise End/StartTime retrieval to extension method	2019-11-25 19:09:14 +09:00
Berkan Diler	fccdbffa93	Use MathF instead of Math- functions when possible ... MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.	2019-11-25 00:45:42 +01:00
Dean Herbert	c2e85a2057	Apply CornerExponent fixes	2019-11-22 19:49:20 +09:00
Dean Herbert	201f32859a	Merge branch 'master' into slider-control-point-removal	2019-11-21 22:10:52 +09:00
Berkan Diler	6cab517b2d	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:37:47 +01:00
smoogipoo	76ab0ecd3c	Disallow deselections with right clicks	2019-11-13 17:21:55 +09:00
Dean Herbert	4b66ce0c52	Merge branch 'master' into slider-controlpoint-addition	2019-11-12 18:13:27 +09:00
Dean Herbert	dd196385cb	Add Ctrl+A to select all and Escape to deselect all (#6803) ... Add Ctrl+A to select all and Escape to deselect all Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-12 18:10:45 +09:00
Dean Herbert	cdd87a6903	Merge branch 'master' into delete-selection	2019-11-12 17:59:43 +09:00
smoogipoo	10fd5ef5a7	Merge context menus	2019-11-12 15:02:27 +09:00
Dean Herbert	b4525c1f6e	Fix right clicking to select not showing context menu	2019-11-12 14:42:30 +09:00
smoogipoo	9f1d490ac9	Only handle selection input on blueprints	2019-11-12 12:18:24 +09:00
Dean Herbert	a43b0ee01b	Apply naming and styling changes	2019-11-12 10:45:46 +09:00
Dean Herbert	b37bf4ea01	Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition	2019-11-12 10:44:53 +09:00
smoogipoo	f3dc38e342	Add Ctrl+A to select all (esc to deselect all)	2019-11-11 13:41:10 +09:00
smoogipoo	97ea07db0e	Add delete option to the right-click menu	2019-11-08 19:44:47 +09:00
Dean Herbert	c70c05c896	Less sickening parallax (#6743) ... Less sickening parallax	2019-11-08 19:15:25 +09:00
Dean Herbert	5699f3e22b	Seek to the first hitobject when entering the editor (#6766) ... Seek to the first hitobject when entering the editor Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-08 19:15:08 +09:00
Dean Herbert	a849bc0746	Move implementation into resetTrack for safety	2019-11-08 18:51:01 +09:00
smoogipoo	e904928314	Seek to first hitobject when entering editor	2019-11-08 17:42:19 +09:00
smoogipoo	36cc79f04f	Softly handle invalid beat divisors instead of throwing	2019-11-08 17:28:11 +09:00
smoogipoo	998e1dfe47	Fix non-1/1 initial beat divisor control display	2019-11-08 17:23:47 +09:00
smoogipoo	eb9fff96ba	Read default beat divisor from beatmap	2019-11-08 17:22:58 +09:00