cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-14 19:05:15 +00:00
Code Issues Releases Wiki Activity
1103 commits 30 branches 20 tags 6.8 GiB
Commit graph

1103 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor c72a238782 drag and drop (commented out, for use later) 2021-04-05 16:42:04 -04:00
Cameron Taylor f474459ef9 Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-04 22:33:37 -04:00
Cameron Taylor 6205470907 autopause bullshit 2021-04-04 20:37:23 -04:00
Cameron Taylor 08074f56a5 camera bullshit for menus a lil cooler 2021-04-04 10:17:46 -07:00
Cameron Taylor 6cd6f9b0f7 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-04-03 21:38:00 -07:00
Cameron Taylor 3451be5943 bf holding GF dead offset shit in progress 2021-04-03 21:37:57 -07:00
Cameron Taylor e45446bbe4 Merge pull request #3 from ninjamuffin99/mac_fixes 
fix errors on mac
 2021-04-03 09:43:40 -07:00
MtH 001794591f sort notes on countdown, fixes layering issue on thorns 2021-04-03 02:03:53 +02:00
MtH bbe773d68c Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into testtrack 2021-04-03 01:42:23 +02:00
MtH 427ce7bd7f remove test from freeplay 2021-04-03 01:42:11 +02:00
Cameron Taylor 72e2fcada9 Merge pull request #691 from actuallyasmartname/master 
Make link for downloads the latest version, not the Ludum Dare prototype
 2021-04-02 15:27:14 -07:00
Cameron Taylor 91c591f026 Merge pull request #695 from KadeDev/patch-1 
Discord RPC fix
 2021-04-02 14:39:42 -07:00
Kade M c07533c0c3 add the fucntioln 2021-04-02 14:37:58 -07:00
Kade M 76ebfef571 close the thing on the dead 2021-04-02 14:35:14 -07:00
Cameron Taylor e25f528e24 dumbass sort maybe lol! 2021-04-01 19:28:20 -07:00
Cameron Taylor 7e17d2a673 gf speaker placement tanky 2021-04-01 18:43:53 -07:00
Cameron Taylor d4abfcda6a placement shit for tnakstage again 2021-04-01 18:35:10 -07:00
Cameron Taylor e3c473f65b tank assets placements 2021-04-01 16:39:03 -07:00
actuallyasmartname 0ad4ad3906 Make link for downloads the latest version, not the Ludum Dare prototype 2021-03-31 18:52:07 -04:00
Cameron Taylor 1cde68cc91 smoke effects on tankstage 2021-03-31 12:41:45 -07:00
MtH 5e74a0ea44 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret 2021-03-31 19:11:42 +02:00
MtH 2d48435b3b downscroll susnotes positioning 2021-03-31 19:11:05 +02:00
Cameron Taylor eae5b1888c Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-03-31 10:09:01 -07:00
Cameron Taylor 643ce8a350 bullshit for working mac build? lol 2021-03-31 10:08:55 -07:00
MtH c6cc9a73de Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret 2021-03-31 14:43:43 +02:00
MtH d2cd5e82ad clip rotated sus 2021-03-31 14:43:37 +02:00
Cameron Taylor bd771261e1 pico note sort 2021-03-30 21:25:41 -07:00
Cameron Taylor 60e3facc22 lil options cleaning 2021-03-30 21:01:18 -07:00
Cameron Taylor fb7ad03083 FPS counter toggle 2021-03-30 20:51:17 -07:00
MtH 6b979e50cb susnote clip for downscroll still looks like shit tho 2021-03-31 03:02:12 +02:00
Cameron Taylor 95e53ebc38 basically down scroll 2021-03-30 15:10:15 -07:00
MtH 5f8a3241ca Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-31 00:02:59 +02:00
MtH 01288631ff have notes show up properly on scroll speeds below 1 2021-03-31 00:02:09 +02:00
Cameron Taylor fe91708b9b tankman/picospeaker better syncs 2021-03-30 13:58:05 -07:00
MtH 5b62681654 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 21:04:21 +02:00
MtH 9085eed598 tighten main menu security to prevent weird crashes during transitions 2021-03-30 20:52:24 +02:00
Cameron Taylor 32f1b509f4 moved animate bullshit into CoolUtil and gave up 2021-03-30 11:15:34 -07:00
MtH b7a76bdc8e skip to end of dialogue if not finished 2021-03-30 18:59:14 +02:00
MtH 0370f77dfe fixed bugs where game would crash if pressing R during cutscene or state transition 2021-03-30 18:43:07 +02:00
MtH 720ae5d3cc resolve merge conflict with ActualMandM/pause 2021-03-30 16:47:50 +02:00
MtH 364b74c1c8 Merge branch 'scoreoutline' of https://github.com/ActualMandM/Funkin into nitpix 2021-03-30 16:39:10 +02:00
MtH 0b5809424f offset txts for all chars, move all chars to shared 2021-03-30 15:45:57 +02:00
MtH 65256b77fd Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into testtrack 2021-03-30 14:10:04 +02:00
MtH 6b1cb1c541 Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:07:38 +02:00
MtH 51db0d3d24 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:06:56 +02:00
MtH d63e132d71 week score lerp fix INSPIRED BY PR #447 BY @jvc2 
https://github.com/ninjamuffin99/Funkin/pull/447
 2021-03-30 14:06:03 +02:00
Cameron Taylor b686bc73e1 Merge pull request #668 from VoltrexMaster/patch-2 
feat(extra): Remove extra imports
 2021-03-29 21:23:51 -07:00
George FunBook 70409443d1 fix errors on mac 2021-03-29 23:05:21 -05:00
MtH dd137dd0cc Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into testtrack 2021-03-30 05:45:15 +02:00
MtH 9f1b18d8dc test song and added to freeplay (JUST FOR TESTING) 2021-03-30 05:45:04 +02:00