Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-12-18 03:52:27 -05:00
Code Issues Projects Releases Packages Wiki Activity
1436 commits 30 branches 21 tags 3 GiB
Commit graph

304 commits

Author SHA1 Message Date
EliteMasterEric
b764656a4e Merge branch 'master' into feature/chart-editor-importer 2023-07-03 13:09:40 -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
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
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
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
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
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