1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-14 01:15:06 +00:00
Commit graph

1718 commits

Author SHA1 Message Date
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 c969a53396 Merge pull request #102 from FunkinCrew/bugfix/character-data
Play State refactor and character data fixes
2023-06-13 19:39:46 -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 29e563b11f Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into bugfix/character-data 2023-06-13 01:21:19 -04:00
Cameron Taylor b564ad087b vocals fix... lol! 2023-06-13 01:04:29 -04:00
Hazel c17d48f39e fix ci builds (#106) (common ravy W)
* maybe fix html5 builds?

* sudo apt -y

i need to use debian based distros more dont i

* also needs randr extensions

* fuck it lets install all the x extensions and hope this is enough

* libmesa is now libgl1-mesa

* also needs alsa lib for sound

man i love undocumented dependencies
2023-06-12 11:20:51 -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
Cameron Taylor aa5a5c5cc1 Merge pull request #104 from FunkinCrew/recapitalizing
the SubState...
2023-06-09 15:54:50 -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 6c65a9ea78 Merge pull request #103 from FunkinCrew/bugfix/formatting-cleanup
Formatting cleanup (whitespace only)
2023-06-09 14:22:31 -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
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