1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 07:27:12 +00:00
Commit graph

4402 commits

Author SHA1 Message Date
Cameron Taylor 3103768d91
Merge pull request #747 from FunkinCrew/charselect-fade-fix
Fix transition out of character select
2024-09-12 19:14:34 -04:00
Cameron Taylor 10dfc96cf4 Merge branch 'freeplay-charselect-hint' into rewrite/master 2024-09-12 19:11:42 -04:00
Cameron Taylor 2dc4e13b00 assets submod 2024-09-12 19:08:13 -04:00
FabsTheFabs bc86f1f459 character select hint text 2024-09-12 22:44:40 +01:00
FabsTheFabs 5f60be6d75 allow controls to get dialouge name from control + ignore brackets 2024-09-12 22:44:22 +01:00
FabsTheFabs 703e899288 apply shader filter 2024-09-12 22:43:12 +01:00
EliteMasterEric ae6f431b6a Update credits 2024-09-12 17:13:46 -04:00
EliteMasterEric a4bdeeaf5f Update polymod to fix a crash on missing imports 2024-09-12 17:13:40 -04:00
Cameron Taylor 89f4703977 Merge branch 'framerate-pref' into rewrite/master 2024-09-12 16:47:13 -04:00
Cameron Taylor dab41091af Merge branch 'update-final-charts' into rewrite/master 2024-09-12 16:45:28 -04:00
Cameron Taylor a4e977f60f assets submod 2024-09-12 16:45:20 -04:00
Cameron Taylor 1ee351c83d art submod 2024-09-12 16:42:57 -04:00
Cameron Taylor 33df8936b1 assets submod 2024-09-12 16:41:14 -04:00
FabsTheFabs f7f311d6f2 assets submod....... 2024-09-12 21:07:40 +01:00
EliteMasterEric a9667c54f3 Fix FlxAtlasSprite completion handling and music looping 2024-09-12 15:48:41 -04:00
EliteMasterEric 3970189fe9 Ensure save data gets flushed when you see a character 2024-09-12 15:43:40 -04:00
Cameron Taylor 721cecd271 add preference option for framerate capping 2024-09-12 15:38:44 -04:00
EliteMasterEric e5673549cf Fix issues with the difficulty selector showing non-existant difficulties in Freeplay 2024-09-12 15:38:20 -04:00
EliteMasterEric 386dc22d7b Debug hotkey properly resets char select cutscene 2024-09-12 15:34:16 -04:00
EliteMasterEric b2b16ff2d3 Update vocal delay again 2024-09-12 15:31:58 -04:00
EliteMasterEric cdd78818a7 Update assets submodule and changelog 2024-09-12 15:20:12 -04:00
Cameron Taylor bfb19cc67e lastTime error fix 2024-09-12 14:46:29 -04:00
Cameron Taylor 9eb56b4e76 Merge branch 'pico-bf-censor-anims' into rewrite/master 2024-09-12 14:38:55 -04:00
Cameron Taylor 07c5c5d5a7 assets submod 2024-09-12 14:38:29 -04:00
Cameron Taylor 7daedd19fc Merge branch 'tankman-pico-anims' into rewrite/master 2024-09-12 14:35:45 -04:00
Cameron Taylor 260946f44f assets submod 2024-09-12 14:35:19 -04:00
Cameron Taylor 3de7047d22 Merge branch 'master-bugs' into rewrite/master 2024-09-12 14:34:21 -04:00
Cameron Taylor 0b13e0fdd5 art submod (char select stuff) 2024-09-12 14:33:31 -04:00
Cameron Taylor 96f306471c assets submod 2024-09-12 14:31:56 -04:00
Cameron Taylor 9f6d29cf66 Merge branch 'feature/final-results-anims' into rewrite/master 2024-09-12 14:30:38 -04:00
Cameron Taylor 19f332ea7e assets submod 2024-09-12 14:30:14 -04:00
Cameron Taylor 8fdf04796c Merge branch 'bugfix/vocal-loop' into rewrite/master 2024-09-12 14:29:20 -04:00
Cameron Taylor d3e8938888 assets submod 2024-09-12 14:28:51 -04:00
Cameron Taylor 2c80701855 assets submod 2024-09-12 14:26:11 -04:00
FabsTheFabs b7fb6105a7 assets submod 2024-09-12 17:50:46 +01:00
FabsTheFabs e12ed47162 assets submod 2024-09-12 09:25:42 +01:00
EliteMasterEric bfcbc54ced Update assets submodule 2024-09-11 20:39:31 -04:00
CheemsAndFriends 3553d008cf tinkering shit 2024-09-12 01:37:32 +02:00
EliteMasterEric e32dd0e504 Update assets submodule 2024-09-11 17:09:45 -04:00
EliteMasterEric fded5892c5 Update audio compression (via Saru) 2024-09-11 15:55:38 -04:00
CheemsAndFriends 70ab000be4 Readd CharSelectSubState from char unlock 2024-09-11 21:16:02 +02:00
CheemsAndFriends cfcfc773da readd Save from char unlock 2024-09-11 20:53:05 +02:00
CheemsAndFriends 9f5c154b1d readd IntroSubState from char unlock 2024-09-11 20:49:55 +02:00
CheemsAndFriends bea23c37a8 readd FlxAtlasSprite from char unlock branch 2024-09-11 20:47:45 +02:00
CheemsAndFriends c81f041695 Tinkering with atlassprite 2024-09-11 20:05:39 +02:00
CheemsAndFriends 17a48bfc2b D'oh! 2024-09-11 19:26:38 +02:00
CheemsAndFriends 68d87a0837 Add one more conditional in atlas + add ignoreExclusions in Bopper/BaseCharacter 2024-09-11 19:24:21 +02:00
CheemsAndFriends 6349ba3a5a Fix GF not appearing on screen 2024-09-11 18:30:11 +02:00
CheemsAndFriends 5c1766a00f Fix char select substate crash 2024-09-11 18:29:47 +02:00
CheemsAndFriends 0dc286e1d3 Fix Eggnog santa not playing plus Ugh fix 2024-09-11 18:29:31 +02:00