1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 11:22:55 +00:00
Commit graph

4728 commits

Author SHA1 Message Date
Til Tjardes 4be4570c94 Merge branch 'main' of https://github.com/FunkinCrew/Funkin into playsound-typo 2024-09-16 16:08:58 -06:00
lemz 8252b2a6b3
Merge branch 'develop' into substate-dispatch-event-fix 2024-09-17 00:07:25 +02:00
Eric a5ac717677
Merge branch 'develop' into bugfix/freeplay-difficulty-stack-overflow 2024-09-16 18:03:47 -04:00
Eric ea2e6506c8
Merge pull request #2494 from cyn0x8/flash_fix
consistent flashing
2024-09-16 18:03:18 -04:00
Eric 1e8d3c715b
Merge branch 'develop' into flash_fix 2024-09-16 18:03:05 -04:00
Cameron Taylor 4bc2510d3c Merge remote-tracking branch 'origin/bugfix/pixel-shit-aliasing' into rewrite/master 2024-09-16 17:40:44 -04:00
Cameron Taylor 0574f8b07b Merge remote-tracking branch 'origin/dadbattle-pico-chart-fix' into rewrite/master 2024-09-16 17:31:05 -04:00
Cameron Taylor 11224c5999 Merge remote-tracking branch 'origin/bugfix/song-credits-fixes' into rewrite/master 2024-09-16 17:24:56 -04:00
Cameron Taylor 367e3e9008 priv modules 2024-09-16 17:18:42 -04:00
Cameron Taylor a27c4ae24f pub modules art 2024-09-16 17:14:45 -04:00
Cameron Taylor 1f21e1114b pub modules 2024-09-16 17:12:11 -04:00
EliteMasterEric 16aff6e7c3 Fix bugs with highscore display in Freeplay 2024-09-14 21:37:02 -04:00
EliteMasterEric 9f3af1ab94 Add a separate Gold Perfect animation for modders 2024-09-14 20:56:21 -04:00
EliteMasterEric e23a85682a Update some script files. 2024-09-14 20:26:39 -04:00
EliteMasterEric fd6ca6e267 Remove some spammy log traces. 2024-09-14 20:26:33 -04:00
EliteMasterEric d5c7e4ffdb Fix bug where Pico would become locked on every game restart. 2024-09-14 20:26:19 -04:00
EliteMasterEric 688abb5571 Update example mod's API version so it actually loads. 2024-09-14 20:25:45 -04:00
Til Tjardes 0a8719088d techniktil coming back with another typo lets go 2024-09-14 15:06:03 -06:00
EliteMasterEric df87d677e1 Typo lol 2024-09-14 17:00:41 -04:00
EliteMasterEric 517984d120 Fix a bug where Shit judgement would always display with anti-aliasing. 2024-09-13 18:46:49 -04:00
FabsTheFabs 3fba55a422 assets submod 2024-09-13 21:36:20 +01:00
EliteMasterEric 178389ea0b Fix two song credits 2024-09-12 23:28:43 -04:00
EliteMasterEric d59594ee45 Fix animations not looping on Char Select 2024-09-12 22:02:05 -04:00
Cameron Taylor d3d998d994 saru fixies 2024-09-12 21:57:48 -04:00
Cameron Taylor 247b86ea1d Merge branch 'bugfix/blazin-offsets' into rewrite/master 2024-09-12 21:53:54 -04:00
Cameron Taylor 80868ccbba assets submod 2024-09-12 21:53:38 -04:00
EliteMasterEric 0e225c9bae Update eggnog vocals again 2024-09-12 20:51:02 -04:00
EliteMasterEric c9d6c19420 Update fresh audio 2024-09-12 20:35:13 -04:00
EliteMasterEric c6bdd36959 Fix blazin offsets 2024-09-12 20:32:19 -04:00
Cameron Taylor cae7db6254 Merge branch 'vp9-cutscene' into rewrite/master 2024-09-12 20:26:05 -04:00
Cameron Taylor af31be5436 makeship linky 2024-09-12 20:14:48 -04:00
Cameron Taylor 172c90b1bd assets submod 2024-09-12 20:12:20 -04:00
Cameron Taylor a4cd2eb169 Merge branch 'pico-christmas-offsets' into rewrite/master 2024-09-12 20:05:42 -04:00
Cameron Taylor 0aa2ccd1cd assets submod 2024-09-12 20:05:14 -04:00
Cameron Taylor e2a51def65 Merge branch 'rewrite/master' into pico-cutscene-tweaks 2024-09-12 20:04:02 -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
FabsTheFabs fdc5bc6b79 assets submod... 2024-09-13 00:37:47 +01: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
Cameron Taylor 2dc4e13b00 assets submod 2024-09-12 19:08:13 -04:00
CheemsAndFriends 1e9c6f0c4c Add Char Select stuff 2024-09-13 00:31:52 +02:00
FabsTheFabs f96532f104 assets submod 2024-09-12 22:47:58 +01: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
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
CheemsAndFriends 6dca858fd7 Introbizz 2024-09-12 23:13:30 +02:00