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

4316 commits

Author SHA1 Message Date
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
Cameron Taylor 06389cb5cd Merge branch 'rewrite/master' into bugfix/doppel-random 2024-09-09 23:50:00 -04:00
Cameron Taylor 030afe1355 Merge branch 'bugfix/instrumental-selector' into rewrite/master 2024-09-09 23:49:02 -04:00
Cameron Taylor adb4bc96ca flxanimate version bump 2024-09-09 23:47:17 -04:00
EliteMasterEric 4c1b4859e7 Fix a bug where the random event in Week 3 would always trigger 2024-09-09 22:35:02 -04:00
EliteMasterEric 877d64c32b Fixed a bug where the instrumental selector would be ignored sometimes 2024-09-09 21:21:50 -04:00
Cameron Taylor e2c287e112 logarithmic volume control 2024-09-09 13:01:19 -04:00
Cameron Taylor 591d4a29f4 gameover positioning fixes 2024-09-09 12:34:55 -04:00
Cameron Taylor d9a3604880 Merge branch 'pico-doppleganger-cutscene' into rewrite/master 2024-09-09 11:45:57 -04:00
Cameron Taylor 7220fd7e95 assets submod 2024-09-09 11:45:37 -04:00
Cameron Taylor c2ebd4ead6 Merge branch 'weekend1-alt-bg-tweaks' into rewrite/master 2024-09-09 11:44:49 -04:00
Cameron Taylor 5a4795eea2 assets submod 2024-09-09 11:44:27 -04:00
Cameron Taylor e2d25b2721 Merge branch 'feature/pico-excellent-music' into rewrite/master 2024-09-09 11:43:27 -04:00
Cameron Taylor d61357b80d hmm flxanimate bump 2024-09-09 11:40:17 -04:00
FabsTheFabs b9b8490243 assets submod 2024-09-09 08:09:40 +01:00
FabsTheFabs 50d2a8fd9d assets submod 2024-09-09 08:06:11 +01:00
FabsTheFabs f8a2709482 assets submod 2024-09-09 08:03:06 +01:00
EliteMasterEric 4f1423870c Update assets submodule 2024-09-08 14:44:22 -04:00
Cameron Taylor 51e5eb929c add hxjsonast to hmm.json to fix builds? 2024-09-08 11:22:24 -04:00
Cameron Taylor fbcf553bd9 Merge branch 'rewrite/master' into week5-alt-bg 2024-09-06 20:23:21 -04:00
FabsTheFabs 40b5ad7c2a assets submod 2024-09-07 00:54:21 +01:00
FabsTheFabs e0a4818e5a registry updates 2024-09-07 00:52:38 +01:00
Cameron Taylor b1e68c27fd Merge branch 'rewrite/master' into feature/pico-results-perfect 2024-09-06 19:46:39 -04:00
Cameron Taylor a623ec77f7 Merge branch 'feature/char-unlock-notif' into rewrite/master 2024-09-06 19:44:58 -04:00
Cameron Taylor 89e1cb8258 small null fix for if we're not playing music 2024-09-06 19:44:33 -04:00
Cameron Taylor 55c5e01bd5 Merge branch 'camera-helpies' into rewrite/master 2024-09-06 19:12:59 -04:00
Cameron Taylor 4f666e4855 creds merge 2024-09-06 19:12:36 -04:00
Cameron Taylor e185eef7ea Merge branch 'feature/album-titles-and-results-themes' into rewrite/master 2024-09-06 19:11:50 -04:00
Cameron Taylor c45fa93786 update lime (ndlls) 2024-09-06 16:46:11 -04:00
EliteMasterEric 313dba6985 Update assets submodule 2024-09-06 00:24:07 -04:00
EliteMasterEric 34d13c61de Cleanup character unlock impl and queue it for after Story Mode is completed. 2024-09-05 17:54:03 -04:00
EliteMasterEric 239b9b0419 Update assets submodule 2024-09-05 02:10:51 -04:00
Cameron Taylor 33aaabe190 lil console command helper for camera zoom 2024-09-05 01:22:45 -04:00
Cameron Taylor 0e37cb9540 Merge branch 'rewrite/master' into bugfix/blazin-flxanimate-fixes 2024-09-05 00:31:47 -04:00
Cameron Taylor 5c44e61ce1 assets submod 2024-09-05 00:20:55 -04:00
EliteMasterEric 24096bd319 Fixed positioning in Blazin'. 2024-09-04 10:58:18 -04:00
EliteMasterEric 3a2ca6b525 Code changes to fix Blazin' 2024-09-04 09:58:04 -04:00
EliteMasterEric 0a6350113e Fix some issues with Blazin 2024-09-04 09:58:00 -04:00
Cameron Taylor b37ebf1aac assets submod 2024-09-03 23:57:01 -04:00
Cameron Taylor 788f0ee026 Merge branch 'bugfix/labor-daybor' into rewrite/master 2024-09-03 23:56:45 -04:00
Cameron Taylor bd144d6adb Merge branch 'rewrite/master' into bugfix/friday-fixes 2024-09-03 23:42:51 -04:00
EliteMasterEric 36505f75c1 The actual code for custom freeplay music LOL 2024-09-03 21:14:57 -04:00
FabsTheFabs f16bffb3fc assets submod..................... 2024-09-03 19:19:25 +01:00
FabsTheFabs b58bd07fd2 rain shader recolor support 2024-09-03 19:16:58 +01:00
FabsTheFabs d049478c65 registry updates 2024-09-03 19:16:46 +01:00
Cameron Taylor 930f5ff5a6 Merge branch 'feature/instrumental-select-hud' into rewrite/master 2024-09-03 11:25:34 -04:00
EliteMasterEric 2f59363432 Merge branch 'bugfix/assets-cleanup' into develop-2 2024-09-03 00:21:25 -04:00
Cameron Taylor 498cd4a830 Merge branch 'cards-and-char-select' into rewrite/master 2024-09-01 17:56:12 -04:00
Cameron Taylor 33d1112095 Merge branch 'bugfix/assets-cleanup' into rewrite/master 2024-09-01 17:20:03 -04:00