Commit graph

4041 commits

Author SHA1 Message Date
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
Cameron Taylor
89535cb5cd simple lime update... lol! 2023-06-09 14:02:45 -04:00
Cameron Taylor
8671846a73 updated hxcodec in hmm 2023-06-09 13:37:38 -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
52ef71b7ad Validated formatting of 338 XML files. 2023-06-08 16:33:29 -04:00
EliteMasterEric
e68f9ca9a1 Validated formatting of 203 HX files. 2023-06-08 16:30:45 -04:00
EliteMasterEric
9a04678399 Validated JSON formatting on 287 files. 2023-06-08 16:28:58 -04:00
EliteMasterEric
f5046cece6 Modified UI layouts, and performed XML formatting cleanup. 2023-06-08 16:25:32 -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
74c5027f62 Merge pull request #100 from FunkinCrew/bugfix/dad-anim-fix
Bugfix/dad anim fix
2023-06-04 01:25:02 -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
7ba150cda8 Enabled pretty error message reporting 2023-05-30 16:21:37 -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
Cameron Taylor
a671fd1428 Merge pull request #96 from FunkinCrew/haxe-4.3.1
update setup-haxe for haxe 4.3.1
2023-05-26 12:44:07 -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
Cameron Taylor
91af9ba613 update setup-haxe for haxe 4.3.1 2023-05-24 18:55:42 -04:00
Cameron Taylor
572c547ac7 Merge pull request #92 from FunkinCrew/feature/new-story-menu
Reworked Story Menu internals
2023-05-24 17:17:11 -04:00