813 commits

Author	SHA1	Message	Date
Cameron Taylor	e323f46569	conductor.instance fixes	2024-01-08 15:46:16 -05:00
Cameron Taylor	7058d9baa7	stuf in progres	2024-01-08 15:39:44 -05:00
Cameron Taylor	d62042a99a	skip transition into debug substate	2024-01-08 15:39:44 -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	cc7577a333	fix conductor instance stuf on watchPlugin	2024-01-05 20:25:54 -05:00
Cameron Taylor	97ea4b0891	re-add debug_refreshModules?	2024-01-05 20:23: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	ab316017f7	removed beatTime nullability?	2024-01-05 17:22:01 -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	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
Eric	7b219d1a38	Merge branch 'rewrite/master' into note-move-fix	2024-01-03 20:13:06 -05:00
EliteMasterEric	07bd2e44cd	Fix a funny bug when restarting after game over	2024-01-03 20:12:46 -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
Cameron Taylor	97dea7403d	Merge pull request #263 from FunkinCrew/bugfix/note-sustain-rendering ... Fix an issue where hold notes early in a song would not render properly.	2024-01-03 10:39:59 -05:00
Cameron Taylor	7932094042	Merge branch 'rewrite/master' into note-move-fix	2024-01-03 10:36:11 -05:00
Cameron Taylor	200f5702ef	disable note vwoosh, and fix gameover song not looping	2024-01-03 02:51:52 -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
EliteMasterEric	b1c9332830	Fix an issue where hold notes early in a song would not render properly.	2024-01-02 01:33:10 -05:00
Cameron Taylor	92e0022fed	derp comma!	2024-01-01 19:13:51 -05:00
Cameron Taylor	11d21c1369	Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes	2024-01-01 19:09:36 -05:00
Cameron Taylor	e6cee0079f	Merge pull request #260 from FunkinCrew/bugfix/pink-game-over-screen ... Fix a bug where the background of the game over screen is pink	2023-12-22 22:52:49 -05:00
Eric	edd8bdc014	Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes	2023-12-19 19:04:40 -05:00
EliteMasterEric	711253a202	Update HaxeUI to latest	2023-12-19 16:12:25 -05:00
EliteMasterEric	8fea7eb734	Fix a bug where the background of the game over screen is pink	2023-12-19 01:57:39 -05:00
EliteMasterEric	70b7de94aa	Fix to Metadata toolbox causing crash when no GF :(	2023-12-19 01:28:13 -05:00
EliteMasterEric	ad02bf2ee0	Fix to GameOverSubstate exiting to Freeplay instead of Chart Editor	2023-12-19 01:27:58 -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
EliteMasterEric	4ff5bd21df	Fixes to the FNF Legacy JSON parser	2023-12-19 01:23:42 -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	3f2d1b4c1b	Update haxelibs, add flixel-text-input to fix overlapping text	2023-12-14 17:34:02 -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