1279 commits

Author	SHA1	Message	Date
EliteMasterEric	29466af4b7	Fix issue where strumline would stay pressed when resetting.	2023-08-03 12:19:36 -04:00
EliteMasterEric	050086fb36	Fixed camera focus on game over.	2023-08-03 11:40:19 -04:00
Cameron Taylor	5bbf279208	gameover fix	2023-08-03 11:22:52 -04:00
EliteMasterEric	3a31c9731c	Fixed several bugs with Play State (mostly restarting the song)	2023-08-02 18:08:49 -04:00
EliteMasterEric	b54c335886	Fix for Menu->Freeplay and Play->Pause transitions	2023-08-02 11:00:23 -04:00
EliteMasterEric	0136202c36	Janky fix	2023-08-02 10:15:54 -04:00
EliteMasterEric	005ffafe23	Merge remote-tracking branch 'origin/master' into feature/chart-editor-song-preview	2023-08-01 16:03:34 -04:00
Cameron Taylor	20658e0590	Merge branch 'feature/chart-editor-bpm' of https://github.com/ninjamuffin99/Funkin-secret into feature/chart-editor-bpm	2023-08-01 15:34:24 -04:00
EliteMasterEric	639a36a9c7	Fix some weird issues with constants	2023-08-01 15:29:17 -04:00
EliteMasterEric	9b66bc186a	alphabetical -> alphabetically	2023-08-01 15:25:46 -04:00
Cameron Taylor	da465ff46d	Merge branch 'feature/chart-editor-bpm' of https://github.com/ninjamuffin99/Funkin-secret into feature/chart-editor-bpm	2023-08-01 14:25:34 -04:00
EliteMasterEric	979a5ad493	Merge branch 'master' into feature/chart-editor-bpm	2023-08-01 14:08:41 -04:00
EliteMasterEric	68ccc3bceb	Fixed UI scaling issue (thanks Ian!!!)	2023-08-01 13:07:16 -04:00
Cameron Taylor	d750af4396	directory fix and hmm lock	2023-07-31 15:40:47 -04:00
EliteMasterEric	624d4f5111	Fix asset redirection	2023-07-31 15:04:18 -04:00
EliteMasterEric	c0745d4ad7	Hide warning	2023-07-31 14:08:48 -04:00
EliteMasterEric	4e67791249	Vwoosh notes on reset	2023-07-31 13:42:13 -04:00
EliteMasterEric	92a0c367b7	Typo fixes	2023-07-31 13:31:17 -04:00
EliteMasterEric	d0ef34ced6	Merge branch 'master' into feature/new-input-system-yay	2023-07-26 22:00:14 -04:00
EliteMasterEric	b974e6d6d7	Fix issues with playtest and backwards time travel	2023-07-26 21:34:38 -04:00
EliteMasterEric	03444161e8	Merge branch 'feature/new-input-system-yay' into feature/chart-editor-song-preview	2023-07-26 20:03:37 -04:00
EliteMasterEric	2048e65bf2	Added ability to start song at a specific timestamp	2023-07-26 20:03:31 -04:00
EliteMasterEric	5ff546bacc	First iteration of song playtesting from editor!	2023-07-26 16:52:58 -04:00
EliteMasterEric	a6daf3b0d6	Resolved lag issues caused by creating too many notes in the pool.	2023-07-25 23:11:12 -04:00
EliteMasterEric	6af5259a10	Fix an issue where sustain sprites were not killed when the song was reset.	2023-07-25 21:39:19 -04:00
Cameron Taylor	211ccc2e47	Merge pull request #107 from FunkinCrew/feature/offset-editor-tweaks ... Tweaks and improvements to the animation editor	2023-07-24 16:26:04 -04:00
Cameron Taylor	e21511bc13	Merge pull request #108 from FunkinCrew/feature/chart-editor-importer ... Chart editor legacy importer	2023-07-22 22:48:43 -04:00
Cameron Taylor	cd2f0d840d	Merge pull request #115 from FunkinCrew/feature/asset-redirect-2 ... Asset redirecting	2023-07-22 22:48:09 -04:00
EliteMasterEric	3c218ec01c	Done with BPM change fixes, currently working on rendering efficiency	2023-07-22 20:16:43 -04:00
Cameron Taylor	f634a099c3	actual songdata git merge proper lol	2023-07-22 14:43:28 -04:00
Cameron Taylor	85af96d654	Merge branch 'master' into feature/chart-editor-importer	2023-07-22 14:43:05 -04:00
EliteMasterEric	aaad06c97d	Merge branch 'feature/new-input-system-yay' into feature/chart-editor-bpm	2023-07-19 21:19:21 -04:00
EliteMasterEric	16e3bfe85e	Fix for BPM changes, plus working on hold note rendering	2023-07-19 21:16:39 -04:00
EliteMasterEric	c56517f94f	Sort the template view	2023-07-19 01:30:43 -04:00
EliteMasterEric	140afd3c31	Redo note positioning	2023-07-19 01:30:36 -04:00
EliteMasterEric	ae76b24a65	New time calculation functions	2023-07-19 01:30:23 -04:00
EliteMasterEric	adda3020a9	Alphabetical sort	2023-07-19 01:29:43 -04:00
EliteMasterEric	ce0be2374d	Event notes have different sprites for each type.	2023-07-19 01:29:13 -04:00
EliteMasterEric	d251d71daa	Asset redirect	2023-07-17 21:54:58 -04:00
EliteMasterEric	16bcf2c767	Rework note sprites to pull note style data	2023-07-13 20:27:45 -04:00
EliteMasterEric	ba53957191	Fixed an issue where dialogue scripts were not being reloaded	2023-07-13 20:26:56 -04:00
EliteMasterEric	00cfeeff72	Created the Note Style class and data registry	2023-07-13 20:25:44 -04:00
EliteMasterEric	883ab87931	Moved AnimationData into the data package	2023-07-13 20:25:01 -04:00
EliteMasterEric	70584c6e88	Make funkin.util.Constants auto-imported	2023-07-13 01:13:26 -04:00
EliteMasterEric	736eecfd9a	Fixed some random crash bug?	2023-07-13 00:37:54 -04:00
EliteMasterEric	b0b8b4fba0	Shut up StickerState	2023-07-10 23:23:18 -04:00
EliteMasterEric	24c9786166	Merge branch 'master' into feature/new-input-system-yay	2023-07-10 18:16:16 -04:00
EliteMasterEric	17a8610640	Added colors to hold note covers	2023-07-10 18:14:34 -04:00
EliteMasterEric	796a51325f	Hold note covers are in and properly positioned	2023-07-08 01:03:46 -04:00
EliteMasterEric	54a9b09155	Merge branch 'master' into bugfix/conductor-monster	2023-07-06 12:35:49 -04:00
EliteMasterEric	a3929db7a8	Merge branch 'master' into feature/offset-editor-tweaks	2023-07-06 01:00:32 -04:00
EliteMasterEric	8e071221ff	Work in progress on hold covers	2023-07-05 22:11:58 -04:00
EliteMasterEric	b615fbf82a	WIP on hold covers	2023-07-04 16:38:10 -04:00
EliteMasterEric	f932422d74	Merge branch 'master' into feature/week-6-dialogue	2023-07-03 13:18:53 -04:00
EliteMasterEric	3bf7955ffa	Conductor fix	2023-07-03 13:16:02 -04:00
EliteMasterEric	b764656a4e	Merge branch 'master' into feature/chart-editor-importer	2023-07-03 13:09:40 -04:00
EliteMasterEric	39cd304ef2	Expanded shortcut list, fixed build errors	2023-07-03 12:51:27 -04:00
EliteMasterEric	90bd5af376	Merge branch 'master' into feature/offset-editor-tweaks	2023-07-03 12:22:33 -04:00
EliteMasterEric	36898a8c04	Few more conductor tweaks	2023-07-02 16:46:49 -04:00
EliteMasterEric	bb8b0b59b1	Video cutscenes in Week 7 no longer broken	2023-07-02 16:46:40 -04:00
EliteMasterEric	49ce962e34	Make metadata file loading actually work	2023-07-02 16:17:25 -04:00
EliteMasterEric	cddc50bbe5	Rework quickWatch	2023-07-02 16:17:04 -04:00
EliteMasterEric	1ef17770e9	crochet->lengthMs	2023-07-02 16:16:49 -04:00
EliteMasterEric	8685054696	Freaky Menu uses metadata.json for BPM data.	2023-07-02 15:34:34 -04:00
EliteMasterEric	66f56dbf2c	system->sound	2023-07-02 15:34:07 -04:00
EliteMasterEric	956277ff4e	Updates and fixes to Conductor for use with changing BPMs.	2023-07-02 15:33:34 -04:00
EliteMasterEric	93f653969a	Added new set of constants	2023-07-02 15:33:12 -04:00
EliteMasterEric	100565f9fc	Messing with transitions.	2023-06-27 21:29:58 -04:00
EliteMasterEric	085d7aaa9d	Fix for note splashes	2023-06-27 21:29:50 -04:00
EliteMasterEric	d91c341bd2	Fixed a bug where you could hold notes forever	2023-06-27 18:06:33 -04:00
EliteMasterEric	2f7708c106	Hold notes pretty much done! yay!	2023-06-27 17:22:51 -04:00
Cameron Taylor	740c547293	Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret into feature/week-7-cutscenes	2023-06-27 17:07:35 -04:00
EliteMasterEric	a672db7b0e	Messing around with logic for hold note misses/health gain	2023-06-27 13:43:42 -04:00
Cameron Taylor	6bf6cbbccc	Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret into feature/modded-story	2023-06-27 13:11:20 -04:00
EliteMasterEric	47d8d9e4db	Work in progress on redoing hold note rendering	2023-06-26 20:40:26 -04:00
EliteMasterEric	6d5c5f5acb	Refactor InitState plus fix a couple crash bugs	2023-06-26 20:39:47 -04:00
EliteMasterEric	4c85e59037	Rewrote documentation for InitState	2023-06-25 12:36:21 -04:00
EliteMasterEric	0fac918428	Reworked anti-aliasing code (sprites now default to true)	2023-06-25 12:36:00 -04:00
EliteMasterEric	2cae781984	Sustains are kinda working?	2023-06-22 19:28:39 -04:00
EliteMasterEric	25c70564bd	WIP on new note rendering, inputs.	2023-06-22 01:41:01 -04:00
EliteMasterEric	28ddadffff	Week 6 dialogue support + bug fixes	2023-06-16 17:37:56 -04:00
Cameron Taylor	092dcb5a35	counter fix thing	2023-06-15 14:31:49 -04:00
EliteMasterEric	9a541c5769	Merge branch 'death-alt' of https://github.com/FunkinCrew/Funkin-secret into death-alt	2023-06-15 03:49:24 -04:00
EliteMasterEric	02632a623c	Disable fakeout happening 100% of the time.	2023-06-15 03:48:52 -04:00
Cameron Taylor	aabf36a788	Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into death-alt	2023-06-15 03:27:03 -04:00
EliteMasterEric	594cec62ad	Results screen now moves to Story menu if we are in story mode	2023-06-15 00:30:20 -04:00
EliteMasterEric	7a47221250	Fixes for FlxVideo	2023-06-15 00:30:01 -04:00
EliteMasterEric	dddd050268	Move debug menu to main menu only	2023-06-15 00:29:54 -04:00
EliteMasterEric	3d8dd8d604	More conductor rework changes	2023-06-15 00:29:40 -04:00
EliteMasterEric	3c558ce192	Pixel fixes	2023-06-15 00:29:18 -04:00
EliteMasterEric	5729eb0413	Fix reloading song events	2023-06-15 00:28:52 -04:00
EliteMasterEric	1191fff913	Additional controls (volume, cutscene skip)	2023-06-15 00:28:40 -04:00
EliteMasterEric	506e4bf680	Propagate Conductor rework to dependent classes.	2023-06-15 00:15:57 -04:00
EliteMasterEric	f6c38f9bdd	Refactor conductor (crochet->lengthMs)	2023-06-15 00:13:18 -04:00
EliteMasterEric	6ac4db48d9	Rename combo milestone	2023-06-15 00:12:35 -04:00
EliteMasterEric	b783271451	ComboCounter->ComboMilestone	2023-06-15 00:11:20 -04:00
EliteMasterEric	338342ad5e	Tweaks and improvements to the animation editor	2023-06-13 17:13:14 -04:00
Cameron Taylor	a42daecdc1	Delete ScriptedMusicBeatSubstate.hx	2023-06-13 01:31:41 -04:00
Cameron Taylor	b564ad087b	vocals fix... lol!	2023-06-13 01:04:29 -04:00
EliteMasterEric	b847212375	Migrator fixes	2023-06-10 03:59:25 -04:00