209 commits

Author	SHA1	Message	Date
Cameron Taylor	41e94f951e	Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/freeplay-pico-character	2024-02-13 00:48:26 -05:00
Cameron Taylor	8c54a62ed6	Merge branch 'rewrite/master' into feature/freeplay-pico-character	2024-02-13 00:41:03 -05:00
Cameron Taylor	6e0f577d54	debugger fixes	2024-02-13 00:29:46 -05:00
EliteMasterEric	fa556dc1f2	Rewrite conversation JSON parsing code.	2024-02-07 09:21:44 -05:00
EliteMasterEric	82b63c02e1	Reworks to make Pico mode actually work.	2024-02-05 21:35:58 -05:00
EliteMasterEric	e5fb1de4ba	Fix a boatload of deprecation warnings and upgrade a few libraries.	2024-02-05 19:46:11 -05:00
EliteMasterEric	167976c8ba	Work in progress	2024-02-05 13:35:30 -05:00
EliteMasterEric	a0c4499b03	Fix a bug where replaying a level makes a pink screen	2024-01-17 23:12:59 -05:00
Cameron Taylor	96d02261c5	Merge branch 'rewrite/master' into feature/stage-solids	2024-01-17 21:40:26 -05:00
EliteMasterEric	80c7bcdfdf	Rewrite Stage data handling to use the Registry pattern, and add support for solid colors.	2024-01-16 17:08:25 -05:00
EliteMasterEric	3d2e50906f	I was in fact a dumbass.	2024-01-15 22:13:01 -05:00
EliteMasterEric	e391c02015	Polish note display visuals, and scrap Killer judgement.	2024-01-15 22:10:42 -05:00
EliteMasterEric	313fd55e98	WIP	2024-01-15 14:20:44 -05:00
EliteMasterEric	043fb553f6	Fix an issue causing an overflow error when using gamepad (WINDOWS ONLY)	2024-01-10 00:20:00 -05:00
Cameron Taylor	da4e77bf44	Merge branch 'rewrite/master' into feature/chart-editor-context-menus	2024-01-05 20:11:38 -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	a1002c4756	Merge remote-tracking branch 'origin/rewrite/master' into bugfix/conductor-rewrite	2024-01-02 14:14:26 -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
EliteMasterEric	8fea7eb734	Fix a bug where the background of the game over screen is pink	2023-12-19 01:57:39 -05:00
EliteMasterEric	ad02bf2ee0	Fix to GameOverSubstate exiting to Freeplay instead of Chart Editor	2023-12-19 01:27:58 -05:00
EliteMasterEric	88ca58f9e2	Fixes for updated HaxeUI and Flixel.	2023-12-15 21:09:01 -05:00
EliteMasterEric	ca489b5609	Rewrite the Conductor to be a singleton instance.	2023-12-14 16:56:20 -05:00
EliteMasterEric	6060282f20	Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2	2023-12-08 16:12:56 -05:00
Cameron Taylor	8f30532ed4	offsets null fix quick	2023-12-08 01:57:46 -05:00
EliteMasterEric	7f0caeb026	Work in progress on offsets in Chart Editor state.	2023-12-08 01:15:22 -05:00
Cameron Taylor	3652550b1a	Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-editor-offsets-part-1	2023-12-07 18:14:10 -05:00
EliteMasterEric	e23c1464f6	Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-1	2023-12-07 16:32:12 -05:00
EliteMasterEric	66611c5d2f	Fixes to FlxSound when pausing before starting	2023-12-06 22:03:36 -05:00
EliteMasterEric	1716ffc57f	Implement instrumental and vocal offsets into the PlayState.	2023-12-05 02:44:57 -05:00
EliteMasterEric	eebb2e874f	Merge branch 'rewrite/master' into bugfix/chart-editor-notif-in-bg	2023-11-29 16:42:40 -05:00
EliteMasterEric	ed10d2c5d0	Multiple chart editor bug fixes +tweaks	2023-11-28 20:36:59 -05:00
EliteMasterEric	47f39b072a	Convert chart editor to macro-based UIState	2023-11-24 00:42:07 -05:00
Cameron Taylor	0e21220e24	Merge pull request #215 from FunkinCrew/feature/rebind-debug-keys ... Debug Controls, plus a chart loading fix	2023-11-16 02:20:53 -05:00
EliteMasterEric	2140158786	Debug controls, plus a chart loading fix	2023-11-16 00:02:42 -05:00
EliteMasterEric	b8504c8e3a	Merge remote-tracking branch 'origin/rewrite/master' into bugfix/senpai-naughty	2023-11-15 00:47:47 -05:00
Cameron Taylor	12d5cf796b	Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update	2023-11-14 16:10:35 -05:00
Cameron Taylor	dbeb2a1a1e	Merge branch 'rewrite/master' into bugfix/cleanup	2023-11-14 15:31:54 -05:00
EliteMasterEric	ca3e00c1cd	Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update	2023-11-10 16:37:55 -05:00
EliteMasterEric	a9dfd4adcf	Fix a bug where multiple vocal tracks would play at once	2023-11-09 17:00:46 -05:00
EliteMasterEric	ce97a002cb	Reorganize a whole bunch of classes and perform syntax cleanup.	2023-11-07 04:04:22 -05:00
EliteMasterEric	21ba81c799	Fix a bug where returning to a week in Story Mode would not play dialog	2023-11-06 17:51:56 -05:00
EliteMasterEric	efd29dafbf	Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-haxeui-update	2023-11-04 23:51:15 -04:00
EliteMasterEric	eec3ac3ced	Clean up several messy chunks of code, and add support for dragging notes and events.	2023-10-26 05:46:22 -04:00
EliteMasterEric	e14e6448ac	More event type refactors	2023-10-25 01:13:06 -04:00
EliteMasterEric	ffd0a98393	FNFC file rework (includes command line quicklaunch)	2023-10-21 01:04:50 -04:00
Cameron Taylor	902ad4be3a	Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-more-fixes	2023-10-18 19:47:50 -04:00
EliteMasterEric	cdab8753ea	Lots of reported bugs fixed.	2023-10-18 01:02:10 -04:00
Cameron Taylor	d4e6befc28	submodule merge fix	2023-10-17 21:40:20 -04:00
Cameron Taylor	08845915ea	fixed cutscene skipping too fast from disabling inputs	2023-10-17 21:26:32 -04:00