1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-22 09:59:25 +00:00
Commit graph

2900 commits

Author SHA1 Message Date
Kolo a4b59d14bf
applySongRank fix
fixes the bug with the percent being overriden when the song has the same letter rank but lower percent (eg. E Rank with 99% being overriden by E Rank with 93%)
2024-09-18 13:40:02 +02:00
EliteMasterEric d59594ee45 Fix animations not looping on Char Select 2024-09-12 22:02:05 -04:00
Cameron Taylor af31be5436 makeship linky 2024-09-12 20:14:48 -04:00
Cameron Taylor 47f3c6f00a vid sizing 2024-09-12 19:56:04 -04:00
Cameron Taylor d826f2a7bc Merge branch 'rewrite/master' into char-unlock-tinkers 2024-09-12 19:55:35 -04:00
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
CheemsAndFriends 1e9c6f0c4c Add Char Select stuff 2024-09-13 00:31:52 +02: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
CheemsAndFriends 34d1c568ea locked fixin 2024-09-12 23:22:20 +02:00
CheemsAndFriends 6dca858fd7 Introbizz 2024-09-12 23:13:30 +02:00
CheemsAndFriends 2a9814e030 port SAVE from develop 2024-09-12 22:58:31 +02:00
CheemsAndFriends 395de4ee95 Char select subs stuff 2024-09-12 22:53:01 +02:00
Cameron Taylor 89f4703977 Merge branch 'framerate-pref' into rewrite/master 2024-09-12 16:47:13 -04: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
Cameron Taylor bfb19cc67e lastTime error fix 2024-09-12 14:46:29 -04:00
Cameron Taylor 3de7047d22 Merge branch 'master-bugs' into rewrite/master 2024-09-12 14:34:21 -04:00
CheemsAndFriends 3553d008cf tinkering shit 2024-09-12 01:37:32 +02: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 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
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 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
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 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
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
FabsTheFabs 03d9416ab1 texture swap shader 2024-09-10 07:26:15 +01:00
FabsTheFabs 34e93fa95a color util (with just one function lol) 2024-09-10 07:25:11 +01:00
EliteMasterEric f6bd203786 Fix an issue where base inst wouldn't be chosen properly on remixes 2024-09-10 01:33:15 -04:00
Cameron Taylor 06389cb5cd Merge branch 'rewrite/master' into bugfix/doppel-random 2024-09-09 23:50:00 -04:00