312 commits

Author	SHA1	Message	Date
Cameron Taylor	99b7a8a75d	Merge branch 'rewrite/master' into bugfix/chart-editor-positioning-fixes	2024-01-12 08:19:26 -05:00
Cameron Taylor	e87c895131	Merge branch 'rewrite/master' into feature/chart-editor-drag-edit-holds	2024-01-12 08:13:30 -05:00
EliteMasterEric	25c10d205d	Some positioning fixes	2024-01-12 06:35:41 -05:00
Cameron Taylor	fad569519d	Merge branch 'rewrite/master' into bugfix/freeplay-icon-offsets	2024-01-12 06:15:15 -05:00
EliteMasterEric	025fd326bd	Click and drag on a sustain to edit it.	2024-01-12 06:13:34 -05:00
Cameron Taylor	2539b90ab8	Merge branch 'rewrite/master' into feature/chart-editor-selection-tweak	2024-01-12 04:43:17 -05:00
EliteMasterEric	06964ce1e3	Fix HTML5 build issue	2024-01-10 20:58:06 -05:00
Cameron Taylor	ac902c19c5	beats per measure conductor instance fix	2024-01-05 20:38:46 -05:00
Cameron Taylor	ff88c53f7c	steps per measure instance conductor fix	2024-01-05 20:38:20 -05:00
Cameron Taylor	350ce19783	conductor instnace small fix lol!	2024-01-05 20:37:13 -05:00
Cameron Taylor	8f7c449194	Merge branch 'rewrite/master' into feature/chart-editor-measure-numbers	2024-01-05 20:35:15 -05:00
Cameron Taylor	da4e77bf44	Merge branch 'rewrite/master' into feature/chart-editor-context-menus	2024-01-05 20:11:38 -05:00
Cameron Taylor	1e07b6ae22	Merge branch 'rewrite/master' into bugfix/chart-editor-modifies-freeplay	2024-01-05 17:41:07 -05:00
Cameron Taylor	65aee1dd13	Merge branch 'rewrite/master' into bugfix/conductor-rewrite	2024-01-05 15:32:42 -05:00
EliteMasterEric	a3123cd64c	Measure numbers next to ticks and support for initial time signature.	2024-01-05 02:35:41 -05:00
EliteMasterEric	4a0a330eb4	Redo logic around note selection, add new buttons for selecting individual sides.	2024-01-04 08:20:34 -05:00
EliteMasterEric	4c353101ae	Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-context-menus	2024-01-04 01:55:00 -05:00
EliteMasterEric	edc6f85e21	Finish up event editing (selecting an existing event now shows its data in the event data toolbox)	2024-01-03 21:10:14 -05:00
EliteMasterEric	7684757dbb	Merge remote-tracking branch 'origin/rewrite/master' into no-debugger	2024-01-03 19:54:41 -05:00
EliteMasterEric	bbaa9aa4af	Work in progress on context menus and song event editing.	2024-01-03 19:53:17 -05:00
EliteMasterEric	a1002c4756	Merge remote-tracking branch 'origin/rewrite/master' into bugfix/conductor-rewrite	2024-01-02 14:14:26 -05:00
EliteMasterEric	ddfecf2cfc	Clean up difficulty label behavior	2024-01-02 14:07:07 -05:00
Eric	edd8bdc014	Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes	2023-12-19 19:04:40 -05:00
EliteMasterEric	70b7de94aa	Fix to Metadata toolbox causing crash when no GF :(	2023-12-19 01:28:13 -05:00
EliteMasterEric	bb0fb02813	Fix to launching directly into Chart Editor	2023-12-19 01:26:43 -05:00
EliteMasterEric	3e65e7ecc5	Fix for vocals not loading properly and not getting cleared properly.	2023-12-19 01:26:26 -05:00
EliteMasterEric	328bb7b938	Fixes to Erect/Nightmare only	2023-12-19 01:25:15 -05:00
Cameron Taylor	41ad47db52	Merge branch 'rewrite/master' into bugfix/selection-highlight	2023-12-19 01:18:49 -05:00
Cameron Taylor	4fc56a2280	small fix to backups folder not existing	2023-12-15 21:46:09 -05:00
EliteMasterEric	88ca58f9e2	Fixes for updated HaxeUI and Flixel.	2023-12-15 21:09:01 -05:00
Cameron Taylor	e9ed7223b6	no debugger	2023-12-15 02:29:32 -05:00
Cameron Taylor	15f72adeed	Merge branch 'rewrite/master' into bugfix/selection-highlight	2023-12-14 18:41:23 -05:00
EliteMasterEric	ca489b5609	Rewrite the Conductor to be a singleton instance.	2023-12-14 16:56:20 -05:00
EliteMasterEric	b3236e6134	Fix a bug where modifying a copied template song's BPM in the chart editor would modify BPM in Freeplay.	2023-12-14 00:47:04 -05:00
Cameron Taylor	4ea04a9a2e	Merge branch 'icon-charswitcher' into rewrite/master	2023-12-13 23:11:51 -05:00
EliteMasterEric	e2b0ed98dd	Fix a bug where making one selection and then making a different one would leave the original highlighted	2023-12-13 23:11:19 -05:00
Cameron Taylor	0a47689eaa	ease	2023-12-13 23:11:12 -05:00
EliteMasterEric	aeb2cf24ad	Fix a rebase issue	2023-12-13 22:42:09 -05:00
EliteMasterEric	b740fbf028	Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-waveform	2023-12-13 22:36:08 -05:00
Cameron Taylor	4193cd4ee2	proper dialog fading	2023-12-13 18:24:55 -05:00
Cameron Taylor	028e90474c	Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher	2023-12-13 17:26:46 -05:00
Cameron Taylor	db76a0dd1d	Merge pull request #244 from FunkinCrew/chart-edit-playtest ... Enabling / Disabling "playtest" mode from chart editor	2023-12-13 17:19:02 -05:00
Cameron Taylor	b09ed369e8	f	2023-12-13 09:20:15 -05:00
Cameron Taylor	6ca0e32391	Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher	2023-12-13 09:20:11 -05:00
Eric	34673c3f6c	Merge branch 'rewrite/master' into mac-delete	2023-12-12 19:44:04 -05:00
EliteMasterEric	42d070922b	Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-waveform	2023-12-12 19:34:58 -05:00
Eric	f36cb84797	Merge pull request #242 from FunkinCrew/copy-flash ... chart editor: copy notes polish	2023-12-12 19:29:17 -05:00
Eric	a6e7fc6d2c	Merge pull request #241 from FunkinCrew/copy-preview ... note highlight preview	2023-12-12 19:29:06 -05:00
Eric	50d015c449	Merge branch 'rewrite/master' into chart-edit-playtest	2023-12-12 17:09:26 -05:00
EliteMasterEric	43038d0a06	Move the "Start at current time" checkbox	2023-12-12 17:07:28 -05:00