2286 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Cameron Taylor	622041b54b	Merge pull request #264 from FunkinCrew/feature/chart-editor-jenny-tweaks ... Chart Editor: Clean up difficulty label behavior	2024-01-03 10:35:52 -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	43872bb213	Merge pull request #259 from FunkinCrew/bugfix/chart-editor-monday-fixes ... Get bugfixin on a monday night yeah	2024-01-01 19:29: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	7afb862072	Merge pull request #262 from FunkinCrew/bugfix/another-haxeui-update ... Update HaxeUI and Flixel	2024-01-01 18:48:32 -05:00
EliteMasterEric	a4c993f733	Update HaxeUI and Flixel	2023-12-23 16:25:50 -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
Cameron Taylor	b308120ee2	Merge pull request #261 from FunkinCrew/bugfix/haxeui-update ... Update HaxeUI to latest (this fixes checkboxes)	2023-12-22 22:52:22 -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	f01535e431	Don't forget to update hmm!	2023-12-19 01:28:24 -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
EliteMasterEric	9e27095659	Update assets.	2023-12-19 01:21:26 -05:00
Cameron Taylor	f16f2b8f84	Merge pull request #258 from FunkinCrew/bugfix/selection-highlight ... Fix a bug where making one selection and then making a different one would leave the original highlighted	2023-12-19 01:19:08 -05:00
Cameron Taylor	41ad47db52	Merge branch 'rewrite/master' into bugfix/selection-highlight	2023-12-19 01:18:49 -05:00
Cameron Taylor	4629702634	Merge pull request #255 from FunkinCrew/bugfix/move-to-funkincrew ... Fixes for updated HaxeUI and Flixel.	2023-12-15 21:47:46 -05:00
Cameron Taylor	4fc56a2280	small fix to backups folder not existing	2023-12-15 21:46:09 -05:00
Cameron Taylor	efd85e0e14	Merge branch 'rewrite/master' into bugfix/move-to-funkincrew	2023-12-15 21:11:10 -05:00
EliteMasterEric	88ca58f9e2	Fixes for updated HaxeUI and Flixel.	2023-12-15 21:09:01 -05:00
Cameron Taylor	e0c4843ec6	Merge pull request #254 from FunkinCrew/bugfix/move-to-funkincrew ... Move all haxelib forks to the FunkinCrew organization.	2023-12-15 05:01:54 -05:00
EliteMasterEric	8dd6f29e26	Move all haxelib forks to the FunkinCrew organization.	2023-12-15 04:34:59 -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	ba3bf4e846	Update HaxeUI again	2023-12-14 17:05:48 -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	e5ceb1a5e3	asst update	2023-12-13 23:53:09 -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
Eric	18ffb9fc36	Merge pull request #240 from FunkinCrew/feature/chart-waveform ... Feature/chart waveform	2023-12-13 22:42:27 -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
Eric	9d9cda9ab1	Merge pull request #246 from FunkinCrew/icon-charswitcher ... Icon charswitcher	2023-12-13 22:33:43 -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	cd05761725	assets master merge	2023-12-13 17:18:39 -05:00
Cameron Taylor	b09ed369e8	f	2023-12-13 09:20:15 -05:00