2257 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
EliteMasterEric	2140158786	Debug controls, plus a chart loading fix	2023-11-16 00:02:42 -05:00
Cameron Taylor	6a58e38077	Merge pull request #213 from FunkinCrew/bugfix/chart-editor-preview-inst ... Chart Editor: Song Preview Bug Fix	2023-11-15 21:47:39 -05:00
Cameron Taylor	4335e5a4dc	Merge branch 'rewrite/master' into bugfix/chart-editor-preview-inst	2023-11-15 21:32:11 -05:00
Cameron Taylor	ad345fd834	Merge branch 'rewrite/master' into bugfix/senpai-naughty	2023-11-15 19:52:14 -05:00
Cameron Taylor	d769098b83	Merge pull request #209 from FunkinCrew/bugfix/week-5-scripts ... Week 5 Script error fix	2023-11-15 19:51:34 -05:00
Cameron Taylor	add4036911	assets update	2023-11-15 19:51:20 -05:00
Cameron Taylor	38ffc37bb2	Merge branch 'rewrite/master' into bugfix/week-5-scripts	2023-11-15 19:44:45 -05:00
Cameron Taylor	2a7c8587af	Merge pull request #214 from FunkinCrew/bugfix/remove-spectrogram ... [BUGFIX] Chart Editor: Remove wonky spectrogram code	2023-11-15 17:31:38 -05:00
EliteMasterEric	398b2e386e	Remove wonky Spectrogram code	2023-11-15 11:30:38 -05:00
Cameron Taylor	16eda2a717	Merge branch 'rewrite/master' into bugfix/chart-editor-preview-inst	2023-11-15 01:14:19 -05:00
Cameron Taylor	a32bebb009	Merge pull request #200 from FunkinCrew/feature/chart-editor-open-recent ... Chart Editor: Open Recent and Save Preferences	2023-11-15 01:13:58 -05:00
Cameron Taylor	aecd587ef0	Merge branch 'rewrite/master' into feature/chart-editor-open-recent	2023-11-15 01:10:26 -05:00
EliteMasterEric	2c9b8a115f	Update assets commit	2023-11-15 00:49:23 -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	60e607890c	Merge pull request #205 from FunkinCrew/rewrite/bugfix/input-issues ... Refactor controls to fix some bugs	2023-11-14 23:22:15 -05:00
Cameron Taylor	6b52a4b56b	Merge branch 'rewrite/master' into rewrite/bugfix/input-issues	2023-11-14 23:21:35 -05:00
Cameron Taylor	3770223cb7	Merge pull request #199 from FunkinCrew/feature/chart-editor-haxeui-update ... Chart Editor: Switch to single-file FNF format	2023-11-14 17:10:50 -05:00
Cameron Taylor	e4c248896a	Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update	2023-11-14 17:08:38 -05:00
Cameron Taylor	284400f036	Merge pull request #202 from FunkinCrew/rewrite/bugfix/chart-editor-event-placement ... Chart Editor: Resolve several bugs related to event note placement.	2023-11-14 17:07:20 -05:00
Cameron Taylor	124a400e8b	Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-event-placement	2023-11-14 17:05:07 -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	0ad443b8f9	Merge pull request #207 from FunkinCrew/bugfix/cleanup ... Reorganize a whole bunch of classes and perform syntax cleanup.	2023-11-14 15:34:40 -05:00
Cameron Taylor	dbeb2a1a1e	Merge branch 'rewrite/master' into bugfix/cleanup	2023-11-14 15:31:54 -05:00
Cameron Taylor	70049765ee	assets push / update	2023-11-14 15:30:49 -05:00
Cameron Taylor	e55b5b23bd	Merge pull request #212 from FunkinCrew/bugfix/revert-asset-changes ... Revert asset changes (temporarily)	2023-11-14 13:31:33 -05:00
EliteMasterEric	c7f35bed5d	Fix a bug where completing a song in Preview would mute music.	2023-11-13 18:56:07 -05:00
EliteMasterEric	01be0293e3	Revert asset changes (temporarily)	2023-11-13 18:03:24 -05:00
EliteMasterEric	ca3e00c1cd	Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update	2023-11-10 16:37:55 -05:00
EliteMasterEric	74e36d00a3	Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into rewrite/master	2023-11-10 16:14:08 -05:00
Cameron Taylor	ba5fa6b45e	Merge pull request #211 from FunkinCrew/bugfix/overlapping-vocals ... Fix a bug where multiple vocal tracks would play at once	2023-11-10 14:23:14 -05:00
EliteMasterEric	6956144df7	Update haxeui-flixel	2023-11-09 17:03:13 -05:00
EliteMasterEric	a9dfd4adcf	Fix a bug where multiple vocal tracks would play at once	2023-11-09 17:00:46 -05:00
Cameron Taylor	f8ec09b7c2	update modules + assets merge	2023-11-09 06:28:50 -05:00
Cameron Taylor	da08e0fa39	assets update	2023-11-08 23:22:55 -05:00
Cameron Taylor	d9a31d8ab8	Merge pull request #210 from FunkinCrew/bugfix/freeplay-random-fix ... Fix bug where Freeplay random would crash the game	2023-11-08 21:59:28 -05:00
EliteMasterEric	2728f34512	Fix bug where Freeplay random would crash the game	2023-11-07 18:53:50 -05:00
EliteMasterEric	3e1146aadf	Fix bug where getDirection didn't work in scripts.	2023-11-07 18:32:00 -05:00
EliteMasterEric	ce97a002cb	Reorganize a whole bunch of classes and perform syntax cleanup.	2023-11-07 04:04:22 -05:00
EliteMasterEric	d78c36f27e	Revise dialogue	2023-11-06 19:37:12 -05:00
EliteMasterEric	7db5489a95	Update local assets.	2023-11-06 17:52:03 -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	4833c9bd2e	Fix a bug where F5 would crash in Week 6.	2023-11-06 17:51:27 -05:00
EliteMasterEric	071114b6b4	Merge remote-tracking branch 'origin/rewrite/master' into rewrite/bugfix/input-issues	2023-11-06 17:08:25 -05:00
Cameron Taylor	618231954b	Merge pull request #203 from FunkinCrew/feature/chart-editor-new-font ... Chart Editor: New Shortcut Strings	2023-11-05 23:13:50 -05:00
EliteMasterEric	d4fedfb99e	Update assets	2023-11-05 01:31:57 -04:00
EliteMasterEric	66ae60e9e4	Updated syntax after merge	2023-11-05 01:19:47 -04:00
EliteMasterEric	bdb3fe28bb	Update assets	2023-11-05 00:35:23 -04:00
EliteMasterEric	4f34484689	Use correct location for js.html.Navigator.	2023-11-05 00:26:03 -04:00
EliteMasterEric	a0ae4c418d	Merge remote-tracking branch 'origin/rewrite/master' into rewrite/bugfix/chart-editor-event-placement	2023-11-05 00:14:44 -04:00
EliteMasterEric	de5edb3cc2	Fix variation metadata and error message in ... ChartEditorImportExportHandler	2023-11-05 00:08:18 -04:00