1307 commits

Author	SHA1	Message	Date
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	983466c0fe	Visual fixes for story menu	2023-06-27 15:21:09 -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
EliteMasterEric	6f676a5896	Added new "Mods" story menu section (hidden when no mods are installed)	2023-06-10 02:56:03 -04:00
EliteMasterEric	109676522a	Rewrite freeplay state to use correct week IDs.	2023-06-09 18:25:21 -04:00
EliteMasterEric	4dcdca51ae	Fix camera issue with stickers	2023-06-09 16:54:13 -04:00
Cameron Taylor	4daf644284	ree	2023-06-09 16:03:45 -04:00
Cameron Taylor	b95dc5604d	Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret	2023-06-09 16:03:36 -04:00
Cameron Taylor	4fae8bcad2	file renames...	2023-06-09 16:02:57 -04:00
EliteMasterEric	ba20e5c39c	Merge remote-tracking branch 'origin/recapitalizing' into bugfix/character-data	2023-06-09 15:46:40 -04:00
Cameron Taylor	a7eb91ce29	the SubState...	2023-06-09 15:44:29 -04:00
EliteMasterEric	2d04b1c5f1	Merge branch 'master' into bugfix/character-data	2023-06-09 15:34:56 -04:00
EliteMasterEric	6f846751c7	Typo fix	2023-06-09 15:32:44 -04:00
EliteMasterEric	038d258233	Chart editor changes (support for legacy import)	2023-06-09 15:28:14 -04:00
EliteMasterEric	2200b6a24a	File renames	2023-06-09 15:27:23 -04:00
Cameron Taylor	27a9ef211e	Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into bugfix/formatting-cleanup	2023-06-09 14:12:37 -04:00
EliteMasterEric	6f802f7658	Merge branch 'bugfix/formatting-cleanup' into feature/chart-editor-importer	2023-06-08 17:13:56 -04:00
EliteMasterEric	26998c9164	More chart editor changes	2023-06-08 17:07:35 -04:00
EliteMasterEric	c3577b32ef	Port changes to ChartEditorState	2023-06-08 16:53:52 -04:00
EliteMasterEric	f959cbd950	ACTUALLY move MusicBeatSubState	2023-06-08 16:52:44 -04:00
EliteMasterEric	3005aa1f3b	Added legacy importer	2023-06-08 16:48:34 -04:00
EliteMasterEric	ac876c2f59	Fixes to Character preview window	2023-06-08 16:48:13 -04:00
EliteMasterEric	91a9c385b3	WIP of note preview	2023-06-08 16:47:48 -04:00
EliteMasterEric	657d898090	Additional file read/write functions	2023-06-08 16:42:02 -04:00
EliteMasterEric	3f2558d26a	Validated formatting of 338 XML files.	2023-06-08 16:34:06 -04:00
EliteMasterEric	e68f9ca9a1	Validated formatting of 203 HX files.	2023-06-08 16:30:45 -04:00
EliteMasterEric	a2b08e3e34	Update hxCodec	2023-06-06 17:38:40 -04:00
EliteMasterEric	1d3c4d61a6	Syntax fixes to get the branch to build	2023-06-06 17:38:31 -04:00
Cameron Taylor	7a04a2d774	blueball check	2023-06-04 01:19:08 -04:00
Cameron Taylor	2d772a526b	no skipping easter egg!!	2023-06-02 15:56:40 -04:00
EliteMasterEric	9f8d1dbac2	Playstate fixes WIP (TODO: fix compile errors)	2023-06-02 15:35:01 -04:00
EliteMasterEric	a017fb2074	Remove old charting state	2023-06-02 15:25:36 -04:00
EliteMasterEric	123682dc69	Added new constants/defaults.	2023-06-02 15:25:28 -04:00
EliteMasterEric	c9fb6bc51f	Further typo fixes	2023-06-02 15:25:13 -04:00
EliteMasterEric	4851ff5c27	Internal rework to song events	2023-06-02 14:35:28 -04:00
EliteMasterEric	57caeef802	Work on re-enabling cutscenes	2023-06-02 14:35:08 -04:00
EliteMasterEric	b126ac28f4	state->State	2023-06-02 14:34:47 -04:00
EliteMasterEric	4d539fdda2	Substate -> SubState (capitalization fix)	2023-06-01 18:52:58 -04:00
EliteMasterEric	fd5c546005	Fixed a bug where assets from other weeks wouldn't load	2023-06-01 16:00:15 -04:00
EliteMasterEric	09318c258b	Remove old story menu state	2023-06-01 15:59:56 -04:00
Eric	b49a2857e5	Revert guaranteed fakeout	2023-06-01 00:33:30 -04:00
EliteMasterEric	374f03dae3	Fakeout death now uses HScript	2023-06-01 00:31:32 -04:00
Cameron Taylor	2d16aab488	snds effects	2023-05-31 03:28:53 -04:00
Cameron Taylor	dbab5a912d	death alt easter egg	2023-05-31 03:03:10 -04:00
EliteMasterEric	121fc13153	Added some utility functions	2023-05-30 16:21:24 -04:00
EliteMasterEric	6412cb3aee	Fix bug where story mode breaks after first playthrough	2023-05-30 16:21:12 -04:00
EliteMasterEric	a2ddeec5bb	Daddy Dearest animation fixes	2023-05-30 16:20:57 -04:00
EliteMasterEric	4efafe8a78	Health icon refactors/fixes	2023-05-26 17:10:35 -04:00
EliteMasterEric	872f7c93e8	Added onAdd event so GF character can fix position in Tutorial	2023-05-26 17:10:08 -04:00
Cameron Taylor	6ab391d57a	Merge pull request #99 from FunkinCrew/feature/split-vocals ... Ported chart format (fixing story menu) and split vocals	2023-05-26 14:13:14 -04:00
Cameron Taylor	503a0107c7	Merge pull request #98 from FunkinCrew/bugfix/character-crashes ... Bugfix/character crashes	2023-05-26 13:44:59 -04:00
EliteMasterEric	dc932eb8d7	A few bug fixes related to vocal tracks	2023-05-25 19:36:32 -04:00
EliteMasterEric	2af4a51b15	Merge branch 'master' into feature/split-vocals	2023-05-25 18:39:41 -04:00
EliteMasterEric	2f10de3594	New refactor to VoicesGroup to make multiple vocal tracks actually work	2023-05-25 18:34:26 -04:00
EliteMasterEric	317c127730	Deprecation warning fixes (no actual logic changes tho)	2023-05-25 18:33:39 -04:00
EliteMasterEric	010d5672bb	Fix for FlxSound error; fix typo in Spirit class	2023-05-24 16:11:29 -04:00
EliteMasterEric	482de2a122	Added Nightmare difficulty (stub)	2023-05-22 20:55:53 -04:00
EliteMasterEric	09654170ed	Erect mixes play properly when selected	2023-05-22 13:47:01 -04:00
EliteMasterEric	a599dbea11	Reworked Story Menu (data driven)	2023-05-17 16:42:58 -04:00
EliteMasterEric	021f7a0a1c	Work in progress on story menu data storage rework	2023-05-16 22:09:53 -04:00
Cameron Taylor	03cab4a326	Merge pull request #81 from FunkinCrew/results-anims ... different result screen in progress	2023-04-24 17:59:20 -04:00
Cameron Taylor	e802aa885b	gf shit fix	2023-04-21 17:39:27 -04:00
Cameron Taylor	03f48289e1	Merge pull request #84 from FunkinCrew/bugfix/songeventscriptevent ... Fixed an issue where SongEventScriptEvent would not be dispatched	2023-04-20 16:56:05 -04:00
EliteMasterEric	337802a6bf	Fixed an issue where SongEventScriptEvent would not be dispatched	2023-04-20 13:48:15 -04:00
Cameron Taylor	6fe747eac1	true perfect	2023-04-19 04:08:03 -04:00
Cameron Taylor	b4468a45c3	no more shit loops!	2023-04-19 03:00:52 -04:00
Cameron Taylor	2fefb657ec	excellent looping issue	2023-04-19 02:51:47 -04:00
Cameron Taylor	7c225bea18	no forced shit mode	2023-04-17 17:59:47 -04:00
Cameron Taylor	e872dddd15	looping fix	2023-04-17 17:59:22 -04:00
Cameron Taylor	b1dfbb2ef2	shit one	2023-04-17 11:02:45 -04:00
Cameron Taylor	c2e340ef19	variation and hmm fix	2023-04-16 18:57:18 -04:00
Cameron Taylor	f411cdac88	different result screen in progress	2023-04-16 15:33:20 -04:00
Cameron Taylor	2271025bc2	sticker loadin up nice!	2023-04-10 16:05:37 -04:00
Cameron Taylor	6fb517059d	proper load/deload on freeplay and story	2023-04-10 14:44:32 -04:00
Cameron Taylor	67a56f7416	loaded up teehee	2023-04-06 01:39:27 -04:00