924 Commits

Author	SHA1	Message	Date
smoogipoo	9ab6d584d3	Merge branch 'master' into editor-new-beatmap	2020-09-07 14:30:41 +09:00
Dan Balasescu	e17ccdfe9f	Merge branch 'master' into combo-colors	2020-09-07 13:55:41 +09:00
Dean Herbert	fba253f131	Take user argument in CreateNew method parameters	2020-09-04 13:17:43 +09:00
Dean Herbert	1f2f21e07a	Merge branch 'master' into editor-new-beatmap	2020-09-04 13:11:59 +09:00
Dean Herbert	fe524ec491	Merge branch 'master' into update-framework	2020-09-03 14:58:32 +09:00
Dean Herbert	d849f7f2b5	Use the local user's username when saving a new beatmap	2020-09-03 13:20:23 +09:00
Dean Herbert	e032844570	Start with a fresh beatmap when entering editor from main menu	2020-09-03 13:20:23 +09:00
Dean Herbert	c964e4036e	Merge branch 'master' into update-framework	2020-09-02 15:49:19 +09:00
Dean Herbert	249ae5df1b	Merge branch 'master' into beatmap-track-rework	2020-09-02 15:24:46 +09:00
Craftplacer	c2ade44656	Change types back	2020-09-01 17:58:06 +02:00
Craftplacer	9835d98942	Merge remote-tracking branch 'upstream/master' into combo-colors	2020-09-01 17:39:35 +02:00
Dan Balasescu	f08e7828da	Merge branch 'master' into beatmap-track-rework	2020-09-01 16:06:38 +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	d45a1521a1	Update BindableList usages	2020-09-01 11:56:23 +09:00
Dean Herbert	bee01bdd38	Fix first scroll wheel in editor incorrectly advancing twice	2020-08-31 18:01:16 +09:00
Craftplacer	db413686bb	Add BeatmapSkin to EditorBeatmap	2020-08-30 21:12:45 +02:00
Craftplacer	b39ec74bb8	Scope down to IBeatmapSkin in EditorChangeHandler	2020-08-30 16:07:06 +02:00
Craftplacer	f5c82d41eb	Remove if-cast	2020-08-30 16:06:48 +02:00
Craftplacer	00b68b050c	Merge remote-tracking branch 'upstream/master' into combo-colors	2020-08-30 10:16:38 +02:00
Dean Herbert	f65991f31f	Revert some usages based on review feedback	2020-08-26 23:28:58 +09:00
Craftplacer	e6646b9877	Resolve review comments	2020-08-23 15:08:02 +02: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
Dean Herbert	5ade1e8259	Merge branch 'master' into beatmap-track-rework	2020-08-18 13:03:49 +09:00
Dean Herbert	b969bc03e0	Add loading spinner while editor screen loads	2020-08-18 00:47:32 +09:00
Dean Herbert	d9debef156	Add explicit LoadTrack method	2020-08-17 15:38:16 +09:00
Craftplacer	cfd82104db	Minor changes and improvements	2020-08-16 01:00:28 +02:00
Craftplacer	48bdbb0cfb	Use existing field in Editor	2020-08-15 23:46:10 +02:00
Craftplacer	c4a7fac760	Add required parameters and other various changes	2020-08-15 22:03:24 +02:00
Craftplacer	69590113d6	Temporary changes	2020-08-12 06:40:21 +02:00
smoogipoo	070d71ec27	More cleanups	2020-08-12 00:48:38 +09:00
smoogipoo	e87f50f74f	Rename method	2020-08-07 22:31:41 +09:00
smoogipoo	b08ebe6f81	More inspections (rider is broken)	2020-08-07 21:14:45 +09:00
smoogipoo	961c6dab54	Fix more inspections	2020-08-07 21:08:03 +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	c8ebbc8594	Remove MusicController from EditorClock	2020-08-06 18:19:55 +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
Dan Balasescu	96c12bdf61	Merge pull request #9591 from peppy/editor-fix-double-click ... Fix editor double-click incorrectly firing when clicks target different hitobjects	2020-07-17 17:58:15 +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
Dean Herbert	039790ce4f	Perform next timing point check before ensuring movement	2020-07-17 16:40:02 +09:00
Dean Herbert	e96e558728	Fix reversing scroll direction not always behaving as expected	2020-07-17 16:03:23 +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
smoogipoo	f3b5149648	Move some suggestions to warnings, resolve issues	2020-06-03 16:48:44 +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	12d65f305f	Simplify and fix incorrect seeking	2020-05-22 22:11:55 +09:00
Dean Herbert	1486a44b55	Merge branch 'editor-clock-cache' into editor-clock-transform	2020-05-22 19:51:02 +09:00
Dean Herbert	8b79e14225	Fix remaining test regressions	2020-05-22 19:49:49 +09:00
Dean Herbert	5ea33f4c04	Fix incorrect rounding in DragBar	2020-05-22 19:23:07 +09:00
Dean Herbert	866db629d6	Fix remaining test failures	2020-05-22 18:23:24 +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	dcfef6b443	Add clear method to EditorBeatmap	2020-05-08 18:46:37 +09:00
Dean Herbert	d470e092a3	Merge branch 'master' into fix-overlapping-object-undoredo	2020-05-01 10:45:29 +09:00
smoogipoo	c96bc5c51c	Fix undo/redo behaving poorly with simultaneous objects	2020-04-30 20:39:41 +09:00
smoogipoo	9bec42bc7e	Fix mania crashing on undo/redo	2020-04-30 20:03:46 +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	e1142b424d	Fix test failures	2020-04-22 18:14:21 +09:00
smoogipoo	9c22d2f1dd	Use platform bindings for editor actions	2020-04-22 17:41:24 +09:00
smoogipoo	9e2be6f2f4	Remove bindable to promote one-way access	2020-04-16 13:25:08 +09:00
smoogipoo	ce21cfbb03	Use bindables in menu items	2020-04-15 16:17:34 +09:00
smoogipoo	e8c955ed9b	Add CanUndo/CanRedo bindables	2020-04-15 16:17:17 +09:00
Dean Herbert	2388799acf	Limit upper number of editor beatmap states saved to 50	2020-04-13 20:37:46 +09:00
Dean Herbert	0e88c28060	Merge branch 'editor-undo-redo' into more-change-state-support	2020-04-13 18:07:00 +09:00
Dean Herbert	6aab19413c	Rename differ to patcher, add xmldoc	2020-04-13 17:20:20 +09:00
Dean Herbert	bb53f96c71	Store states as byte[] instead of Streams	2020-04-13 17:18:50 +09:00
Dean Herbert	0c60dbe796	Merge branch 'master' into editor-undo-redo	2020-04-13 16:03:53 +09:00
smoogipoo	4a87ac7840	Add support for sample changes	2020-04-10 13:53:09 +09:00
smoogipoo	ee7e2b0854	Fix editor beatmap potentially not updating hitobjects	2020-04-10 13:29:46 +09:00
smoogipoo	575b061dd7	Add change state support to more editor components	2020-04-09 22:02:42 +09:00
smoogipoo	2e33d38cd7	Merge branch 'master' into editor-undo-redo	2020-04-09 22:02:28 +09:00
Dean Herbert	cc0bcea6e5	Merge pull request #8693 from smoogipoo/editorbeatmap-update-cleanup ... Cleanup handling of hitobject updates	2020-04-09 21:32:58 +09:00
smoogipoo	14eca3655b	Add change state handling to the editor	2020-04-09 21:22:07 +09:00
smoogipoo	86243d463f	Add legacy beatmap diffing	2020-04-09 20:48:59 +09:00
smoogipoo	683302a77d	Fix crash when trying to edit long beatmaps	2020-04-09 20:25:26 +09:00
smoogipoo	ee6ea08cf8	Cleanup handling of hitobject updates	2020-04-09 20:16:44 +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	5e3668b2ea	Merge pull request #8260 from smoogipoo/add-workingbeatmap-timeout ... Add beatmap loading timeout to prevent runaway loading scenarios	2020-03-17 11:17:35 +09:00
Joehu	f7ea20a926	Limit font weight to bold	2020-03-16 16:32:25 -07:00
Dan Balasescu	f390c1995d	Apply comment suggestions ... Co-Authored-By: Dean Herbert <pe@ppy.sh> Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-03-16 11:29:28 +09:00
smoogipoo	c33ca6e99c	Decorate usages with exception management	2020-03-13 14:28:11 +09:00
Dean Herbert	ed837d3115	Use framework extension method for FromHex	2020-03-11 10:18:41 +09:00
smoogipoo	da89798765	Merge remote-tracking branch 'origin/master' into layout-rework	2020-02-26 15:06:40 +09:00
Dean Herbert	9557a2cd96	Use object initialiser	2020-02-25 20:52:33 +09:00
Dean Herbert	d6046abe70	Only expose save for now	2020-02-25 18:59:16 +09:00
smoogipoo	6c28fd21c7	osu-side changes	2020-02-24 20:52:15 +09:00
Dean Herbert	575946d923	Expose save and export options in editor to non-dekstop platforms	2020-02-23 20:47:14 +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	801e39a543	Improve xmldoc for PlacementObject	2020-02-08 11:35:27 +09:00
Dean Herbert	91203c2b12	Merge branch 'master' into placement-display-in-timeline	2020-02-08 01:50:24 +09:00
Dean Herbert	2082948f9a	Make editor screens display below timeline	2020-02-07 18:23:59 +09:00
Dean Herbert	56a091674b	Add placement display to timeline	2020-02-07 18:04:10 +09:00
Dean Herbert	e08437c5dc	Track placement object in EditorBeatmap	2020-02-07 18:03:14 +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	96986bf5fc	Remove beat divisor from ctor and use DI instead	2020-02-05 17:48:21 +09:00
Dean Herbert	63c595ed97	Make EditorBeatmap a component and move UpdateHitObject to it	2020-02-05 17:48:21 +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