1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-17 15:38:52 +00:00
Commit graph

3294 commits

Author SHA1 Message Date
Cameron Taylor 8c02503932 Merge branch 'rewrite/master' into attract-screen-final 2024-04-30 19:20:51 -04:00
Cameron Taylor d70540757a assets submod 2024-04-30 19:20:34 -04:00
Cameron Taylor bf8fafda8f Merge pull request #536 from FunkinCrew/mp3-laughs
i forgot the mp3s
2024-04-30 19:19:35 -04:00
FabsTheFabs 62783f47a5 assets submod 2024-05-01 00:12:16 +01:00
EliteMasterEric 02dbfa8f8b IT'S HAPPENING 2024-04-30 19:01:56 -04:00
EliteMasterEric 9030b165df Final attract screen 2024-04-30 19:01:39 -04:00
Cameron Taylor 9049c995dc assets submod 2024-04-30 18:49:18 -04:00
Cameron Taylor f1988a08fe Merge pull request #534 from FunkinCrew/phillystreets-final-tweaks
final phillystreets tweaks + pico offsets
2024-04-30 18:48:02 -04:00
Cameron Taylor 7a6df99479 timescale fix 2024-04-30 18:45:47 -04:00
FabsTheFabs 154231e30c assets submod 2024-04-30 23:17:46 +01:00
Cameron Taylor ffe1c213f6 Merge pull request #532 from FunkinCrew/readd-erect-charts
Erect charts got removed lol
2024-04-30 16:30:45 -04:00
Cameron Taylor 7986dbe2a0 revert mainmenu persistentUpdate chagne 2024-04-30 16:30:22 -04:00
Cameron Taylor db9ba26133 assets submod 2024-04-30 16:25:47 -04:00
Cameron Taylor 8a3735a484 assets submod 2024-04-30 16:18:29 -04:00
Cameron Taylor 7133aabcd6 Merge pull request #518 from FunkinCrew/blazin-rain
blazin rain fx
2024-04-30 16:17:08 -04:00
Cameron Taylor 3b28a74cfd art submod 2024-04-30 16:16:15 -04:00
EliteMasterEric 85a6b8bc5b Readd volume box sprite 2024-04-30 16:15:07 -04:00
EliteMasterEric 2e0f880908 Assets submod 2024-04-30 16:10:03 -04:00
Cameron Taylor 7afa5ef7ba assets submod 2024-04-30 15:57:27 -04:00
Cameron Taylor e8721a0c9e assets submod 2024-04-30 15:25:22 -04:00
Cameron Taylor ab74cc2d5a Merge branch 'rewrite/master' into blazin-rain 2024-04-30 15:25:03 -04:00
Cameron Taylor 0a64d42c09 assets submod 2024-04-30 15:24:46 -04:00
EliteMasterEric eb8840ba76 Readd parallax 2024-04-30 15:11:31 -04:00
EliteMasterEric a645b67921 Fix can events on easy and normal 2024-04-30 15:07:41 -04:00
EliteMasterEric 11c0249f42 Fix an issue with Freeplay sorting when leaving an Erect song. 2024-04-30 14:36:57 -04:00
EliteMasterEric 2e1cd7024c Updated changelog. 2024-04-30 14:19:36 -04:00
EliteMasterEric 70f086f18a Add missing cutscene audio on web 2024-04-30 14:03:16 -04:00
EliteMasterEric e7a09fcee2 Fix an issue where returning to Freeplay from gameplay would let you interact with the menu underneath 2024-04-30 13:58:39 -04:00
EliteMasterEric dae7d71b17 Better (but not perfect) results screen text alignment 2024-04-30 13:34:34 -04:00
EliteMasterEric 2051f60991 Update pico erect 2024-04-30 12:12:45 -04:00
EliteMasterEric 1c1e5c976f Erect charts got removed lol 2024-04-30 11:31:20 -04:00
Cameron Taylor 80a881a5ce autoPause save fix 2024-04-30 08:13:39 -04:00
Cameron Taylor aff9ee5312 volume preference fix 2024-04-30 07:54:42 -04:00
Cameron Taylor 23dd9937ec black camera bg 2024-04-30 07:21:45 -04:00
Cameron Taylor ce93a82b53 pixel death sound fix 2024-04-30 07:14:21 -04:00
Cameron Taylor 9731b2acd7 Merge pull request #531 from FunkinCrew/freeplay-objects-tweens
Freeplay objects tweens
2024-04-30 04:15:30 -04:00
Cameron Taylor 45941af161 Merge branch 'rewrite/master' into freeplay-objects-tweens 2024-04-30 04:15:22 -04:00
Cameron Taylor 0af54faa9e Merge pull request #530 from FunkinCrew/preloader-fnf-spacing
fix spacing on the fnf text on the preloader
2024-04-30 04:15:12 -04:00
Cameron Taylor c0ae253c40 Merge branch 'rewrite/master' into preloader-fnf-spacing 2024-04-30 04:15:00 -04:00
Cameron Taylor 4bad30a395 Merge pull request #529 from FunkinCrew/fullscreen-binding
add fullscreen rebindable keybind across whole game
2024-04-30 04:14:43 -04:00
Cameron Taylor 61012fab68 dad art tween and shader on ost text 2024-04-30 03:22:30 -04:00
Cameron Taylor 84668432ba better tween in for bg dad art 2024-04-30 01:38:00 -04:00
Cameron Taylor b12d86c959 completion number and box fadeout 2024-04-30 01:33:29 -04:00
Cameron Taylor 0c72f0f5a2 fix spacing on the fnf text on the preloader 2024-04-30 01:09:40 -04:00
Cameron Taylor ce24ad1a8a add fullscreen rebindable keybind across whole game 2024-04-30 00:40:42 -04:00
Cameron Taylor 7610fb4205 Merge pull request #528 from FunkinCrew/main-menu-cam
persistentUpdate true main menu
2024-04-30 00:19:28 -04:00
Cameron Taylor de8a75a94b Merge pull request #526 from FunkinCrew/no-shader-touchplay
remove filter from touch here to play, and make it more responsive to input
2024-04-30 00:19:12 -04:00
Cameron Taylor bd551092dc persistentUpdate true main menu 2024-04-29 23:31:55 -04:00
Eric dd3bc4ae21 Merge pull request #527 from FunkinCrew/bugfix/blazin-typo
fix blazin sky typo
2024-04-29 23:10:10 -04:00
FabsTheFabs 9f95c86850 assets submod 2024-04-30 04:03:42 +01:00