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

4430 commits

Author SHA1 Message Date
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
CheemsAndFriends 2aa9e58f67 Fix titlestate reentering crash 2024-09-11 18:29:00 +02:00
CheemsAndFriends 07d9ce2d5a Submodule thing 2024-09-11 17:15:31 +02:00
EliteMasterEric c3fcc707f1 Update compilation guide 2024-09-11 06:52:46 -04:00
EliteMasterEric 94856a6c32 Fix a bug where you could select Pico inst on erect difficulty 2024-09-11 06:18:31 -04:00
EliteMasterEric 0956b692d7 Add a debug hotkey to set characters as not seen. 2024-09-11 06:18:16 -04:00
EliteMasterEric c63feaafbd BF force plays the unlock animation even when he would fist pump 2024-09-11 06:00:06 -04:00
EliteMasterEric d1622040b6 Fix a bug where vocals would restart after a song ends 2024-09-11 04:22:33 -04:00
Cameron Taylor 4cbea7d486 get rid of submodules that appeared for some reason 2024-09-11 00:07:52 -04:00
Cameron Taylor 22b1a5d9c0 Merge branch 'rewrite/master' into feature/char-unlock-merging 2024-09-10 23:52:52 -04:00
Cameron Taylor 9891dc7309 Merge branch 'rewrite/master' into bugfix/web-fixes 2024-09-10 23:43:26 -04:00
Cameron Taylor e5a788de7d change xargs input 2024-09-10 20:22:44 -04:00
EliteMasterEric 59fac5a809 Enable New labels for character mixes 2024-09-10 19:32:19 -04:00
EliteMasterEric 9a242c5d00 Fix an issue where New labels wouldn't show on character mixes 2024-09-10 19:32:10 -04:00
EliteMasterEric a530d91a76 Fix a bug where StickerSubState was being loaded as a state and not a substate, breaking some transitions 2024-09-10 19:16:48 -04:00
CheemsAndFriends f74365f230 Add Changes 2024-09-11 00:55:14 +02:00
EliteMasterEric 0ec22bcc85 Update assets submodule 2024-09-10 17:40:27 -04:00
EliteMasterEric 7aa20223b9 Update art submodule 2024-09-10 17:35:52 -04:00
EliteMasterEric c678cabbf2 Fix issue where difficulty names wouldn't show up properly sometimes. 2024-09-10 17:30:33 -04:00
EliteMasterEric 5021b49915 Enable the New Character backing card 2024-09-10 17:27:04 -04:00
EliteMasterEric 7063fafd33 Fix web builds using disgusting amounts of bandwidth 2024-09-10 17:26:33 -04:00
Cameron Taylor 9c8142b769 Merge branch 'html5-fps' into rewrite/master 2024-09-10 15:40:30 -04:00
Cameron Taylor 96657e9e41 Merge branch 'rewrite/master' into week2-erect-bg-fixes 2024-09-10 07:38:38 -04:00