381 Commits

Author	SHA1	Message	Date
Dean Herbert	249ae5df1b	Merge branch 'master' into beatmap-track-rework	2020-09-02 15:24:46 +09:00
Dean Herbert	d1f79a6a48	Fix potentially incorrect zoom level getting set on very short audio ... track	2020-09-01 15:41:36 +09:00
Dean Herbert	f65991f31f	Revert some usages based on review feedback	2020-08-26 23:28:58 +09:00
Dean Herbert	122265ff0e	Revert non-track usage	2020-08-22 19:47:08 +09:00
Dean Herbert	70697cf1a0	Restore remaining editor components to use Beatmap.Track	2020-08-21 17:11:29 +09:00
Dean Herbert	0b0ff62647	Switch timeline to use track directly from beatmap again	2020-08-21 14:49:34 +09:00
smoogipoo	070d71ec27	More cleanups	2020-08-12 00:48:38 +09:00
smoogipoo	5002d69f69	Update inspections	2020-08-07 20:51:56 +09:00
smoogipoo	61b632516e	Ensure CurrentTrack is never null	2020-08-07 19:43:16 +09:00
smoogipoo	5c05fe3988	Expose track from MusicController	2020-08-06 16:24:14 +09:00
smoogipoo	6e42b8219c	Move track to MusicController, compiles	2020-08-06 16:24:14 +09:00
Dan Balasescu	288c0402ee	Merge branch 'master' into editor-show-selected-count	2020-07-17 18:00:35 +09:00
Dean Herbert	b4b230288b	Shift hue of selection handler box to not collide with blueprints	2020-07-17 17:51:39 +09:00
Dean Herbert	ea6f257dc2	Add a display of count of selected objects in editor	2020-07-17 17:48:27 +09:00
Dean Herbert	222a22182e	Fix double-click incorrectly firing across disparate targets	2020-07-17 17:03:57 +09:00
Dan Balasescu	fd9ac3503f	Merge branch 'master' into fix-editor-drag-selection-while-playing	2020-06-23 21:56:31 +09:00
smoogipoo	e7238e25f9	Fix exception when dragging after deleting object	2020-06-23 20:36:09 +09:00
Dean Herbert	a5eac716ec	Make work for all editors based on track running state	2020-06-23 18:42:56 +09:00
Dean Herbert	53d542546e	Fix editor drag selection not continuing to select unless the mouse is moved	2020-06-23 18:04:50 +09:00
Dean Herbert	abe07b742e	Fix drag scroll in editor timeline no longer working correctly	2020-06-14 13:20:58 +09:00
Dean Herbert	dd7dbfd548	Rename to IHasDuration	2020-05-29 16:45:47 +09:00
Dean Herbert	534dccc0c3	Move sett from EndTime to Duration	2020-05-29 16:45:47 +09:00
Dean Herbert	a2eec5d963	Fix strong bindable changes for DrumRolls	2020-05-29 16:45:47 +09:00
Dean Herbert	9a060cfb3a	Allow drag selections to occur from outside the playfield	2020-05-27 20:44:15 +09:00
Dean Herbert	7e1e26de2a	Allow HandleMovement by default	2020-05-26 17:04:31 +09:00
Dean Herbert	d041de63ce	Allow SelectionHandler to provide custom context menu items without local hover check	2020-05-26 13:53:09 +09:00
Dean Herbert	decdc58de5	Merge branch 'editor-clock-cache' into editor-clock-transform	2020-05-24 12:55:47 +09:00
Dean Herbert	a3a9810344	Merge branch 'master' into editor-clock-cache	2020-05-23 00:44:04 +09:00
Dean Herbert	5ea33f4c04	Fix incorrect rounding in DragBar	2020-05-22 19:23:07 +09:00
Dean Herbert	d18eb663b1	Add tweening seek support to EditorClock	2020-05-22 16:47:52 +09:00
Dean Herbert	dd09d7830d	Cache and resolve editor clock as EditorClock in all cases	2020-05-22 16:44:06 +09:00
Dean Herbert	8a47e2431b	Move distance snap grid implementation to OsuHitObjectComposer	2020-05-21 17:13:22 +09:00
Dean Herbert	82d6549161	Pass down snap result and remove local TimeAt usage	2020-05-20 21:01:29 +09:00
Dean Herbert	23bf0d000e	Implement mania beat snapping support	2020-05-20 21:01:19 +09:00
Dean Herbert	ffb8d48fc3	Fix osu!mania editor placement regressions	2020-05-20 21:01:03 +09:00
Dean Herbert	c46bfc2532	Create SnapResult class to hold various snapping results	2020-05-20 21:00:47 +09:00
Dean Herbert	3354d48a38	Change snapping to be screen space coordinate based	2020-05-20 21:00:29 +09:00
smoogipoo	cebc0fc046	Attempt to fix multiple selection movements	2020-04-27 20:35:24 +09:00
smoogipoo	7f5a1d7f44	Merge branch 'master' into fix-mania-selection	2020-04-27 17:09:40 +09:00
smoogipoo	104c61d622	Remove unnecessary scale	2020-04-27 11:06:23 +09:00
Dean Herbert	48168dddce	Adjust editor timeline current marker to promote tick visibility	2020-04-27 10:54:32 +09:00
Dean Herbert	1c13fa6c61	Fix editor crashing when entering with no beatmap selected	2020-04-24 10:27:32 +09:00
smoogipoo	4ebb28d3e7	wip	2020-04-23 17:52:54 +09:00
smoogipoo	4a87ac7840	Add support for sample changes	2020-04-10 13:53:09 +09:00
smoogipoo	575b061dd7	Add change state support to more editor components	2020-04-09 22:02:42 +09:00
smoogipoo	683302a77d	Fix crash when trying to edit long beatmaps	2020-04-09 20:25:26 +09:00
smoogipoo	1f797207f7	Rework lookups to not require total playfield columns	2020-04-03 12:31:05 +09:00
Fuewburvpoa	6c825eb744	Update osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-03-18 00:04:03 +02:00
Fuewburvpoa	bee8e22d18	Fix BeatDivisorControl allow to select value outside of VALID_DIVISORS	2020-03-17 22:27:11 +02:00
Dean Herbert	ed837d3115	Use framework extension method for FromHex	2020-03-11 10:18:41 +09:00
smoogipoo	6c28fd21c7	osu-side changes	2020-02-24 20:52:15 +09:00
smoogipoo	958c891d15	Update with framework-side bindable list changes	2020-02-17 15:06:14 +09:00
recapitalverb	c753cb46c5	Use [Resolved] wherever possible	2020-02-14 20:14:00 +07:00
Dean Herbert	0e439e3a70	Fix missing dependency in ZoomableScrollContainer test	2020-02-14 14:41:55 +09:00
Dan Balasescu	60d796ae3f	Merge branch 'master' into fix-timeline-seek-while-playing	2020-02-14 13:04:38 +09:00
Dan Balasescu	4b7a053544	Merge branch 'master' into update-placement-more-often	2020-02-13 18:43:27 +09:00
Dan Balasescu	c384e3cfc2	Merge branch 'master' into timeline-zoom-button-repeat	2020-02-13 18:04:36 +09:00
Dean Herbert	118f862342	Fix not being able to seek using scroll wheel in timeline while playing track	2020-02-13 12:03:50 +09:00
Dean Herbert	03bf10f9a2	Remove unused using statement	2020-02-13 11:15:00 +09:00
Dean Herbert	487dd47c9e	Add mouse down repeat support to timeline zoom buttons	2020-02-13 11:14:09 +09:00
Dean Herbert	e34a24a063	Update placement blueprint more often for better display	2020-02-13 10:45:16 +09:00
Dean Herbert	2b6f99d404	Standardise placement blueprint creation and destruction	2020-02-13 10:12:56 +09:00
Dean Herbert	b65e839bd2	Simplify blueprints by removing visible state	2020-02-13 10:00:09 +09:00
Dean Herbert	0fe41fd50a	Fix blueprint showing even when mouse outside of container	2020-02-13 09:03:48 +09:00
Dan Balasescu	28cf5c7a59	Add accessor	2020-02-10 14:28:43 +09:00
Dean Herbert	56a091674b	Add placement display to timeline	2020-02-07 18:04:10 +09:00
Dean Herbert	e31d69c749	Add commit status to EndPlacement; call BeginPlacement on initial movement	2020-02-07 18:02:48 +09:00
smoogipoo	6ae0efa40d	Fix adjustment not working when dragged before object	2020-02-06 14:47:43 +09:00
smoogipoo	c138e3907e	Move methods below ctor	2020-02-06 14:35:45 +09:00
Dean Herbert	f5edad16e6	Improve visuals	2020-02-05 19:43:13 +09:00
Dean Herbert	98ab1f9862	Fix negative spinners	2020-02-05 18:35:31 +09:00
Dean Herbert	3d42973764	Allow scrolling via drag while dragging a hold note handle	2020-02-05 18:35:31 +09:00
Dean Herbert	cef45afbc8	Add a simple hover state	2020-02-05 18:35:31 +09:00
Dean Herbert	d56accaef1	Disallow negative / zero repeat counts (and fix off-by-one)	2020-02-05 18:35:31 +09:00
Dean Herbert	d04cc0123d	Initial implementation of timeline blueprint dragbars	2020-02-05 18:35:31 +09:00
Dean Herbert	90caa61245	Reverse comparison for readability ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-02-01 02:05:26 +09:00
Dean Herbert	f51cfa2220	Fix too many ticks being displayed on beatmaps with multiple timing sections ... Closes https://github.com/ppy/osu/issues/7681.	2020-01-31 00:24:00 +09:00
Dan Balasescu	66b8d38d42	Merge branch 'master' into selection-composition-conformity	2020-01-29 16:52:45 +09:00
Dan Balasescu	e553a9b9e0	Merge branch 'master' into distance-snap-grid-correct-colouring	2020-01-29 16:09:35 +09:00
Dan Balasescu	63501c188a	Merge pull request #7644 from peppy/standardise-zoom-levels ... Standardise editor timeline zoom across maps of all lengths	2020-01-29 16:04:25 +09:00
Dan Balasescu	0d6fd0a54a	Merge branch 'master' into standardise-zoom-levels	2020-01-29 15:32:57 +09:00
Dan Balasescu	65ac412ff8	Merge branch 'master' into fix-beat-snap	2020-01-29 15:32:27 +09:00
smoogipoo	391681b7af	Separate calculation to follow other examples	2020-01-29 15:16:48 +09:00
Dean Herbert	8e2159e4eb	Ensure selection tool correctly matches selection state ... - When a selection is made (via the timeline) the selection tool should become the select tool. - When the selection tool is changed to anything *but* the select tool, the selection should be cleared.	2020-01-28 15:13:12 +09:00
Dean Herbert	4bb33046ca	Standardise editor timeline zoom across maps of all lengths	2020-01-28 13:03:06 +09:00
Dean Herbert	58654f28b6	Fix beat snap implementation being incorrect	2020-01-28 12:48:24 +09:00
Dean Herbert	29daabb40a	Fix distance snap grid showing incorrect colouring ... Now matches timeline colours (based on timing point).	2020-01-28 11:59:21 +09:00
Dean Herbert	d5fda053f4	Use centre origin/anchors	2020-01-27 18:09:54 +09:00
Dean Herbert	493390b750	Rename class to TimelineTickDisplay	2020-01-27 18:08:01 +09:00
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
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	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	289be7a17b	Merge branch 'i-beat-snapping' into timeline-maybe	2020-01-23 15:45:33 +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	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	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	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
smoogipoo	8c378dc625	Move EditorBeatmap construction/conversion to Editor	2019-12-30 14:51:14 +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	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	201f32859a	Merge branch 'master' into slider-control-point-removal	2019-11-21 22:10:52 +09:00