cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-22 01:49:21 +00:00
Code Issues Releases Wiki Activity
4349 commits 31 branches 21 tags 3 GiB
Commit graph

1109 commits

Author SHA1 Message Date
CheemsAndFriends 5c1766a00f Fix char select substate crash 2024-09-11 18:29:47 +02:00
CheemsAndFriends 2aa9e58f67 Fix titlestate reentering crash 2024-09-11 18:29:00 +02:00
Cameron Taylor 22b1a5d9c0 Merge branch 'rewrite/master' into feature/char-unlock-merging 2024-09-10 23:52:52 -04:00
EliteMasterEric 9a242c5d00 Fix an issue where New labels wouldn't show on character mixes 2024-09-10 19:32:10 -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
EliteMasterEric f6bd203786 Fix an issue where base inst wouldn't be chosen properly on remixes 2024-09-10 01:33:15 -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
CheemsAndFriends 35af057f88 Fix scaleY not parsing 2024-09-09 17:41:25 +02:00
CheemsAndFriends 6961e6cc63 Add a buncho Gizmos 2024-09-09 08:23:46 +02:00
Cameron Taylor fbcf553bd9 Merge branch 'rewrite/master' into week5-alt-bg 2024-09-06 20:23:21 -04:00
CheemsAndFriends f3722e5da2 Add hmm flxanimate, new conditional for Cheems' PC sake and more wip char select animation 2024-09-07 02:07:00 +02:00
FabsTheFabs e0a4818e5a registry updates 2024-09-07 00:52:38 +01: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
CheemsAndFriends a901677853 Merge branch 'feature/char-unlock' of https://github.com/FunkinCrew/Funkin-secret into feature/char-unlock 2024-09-06 06:33:01 +02:00
CheemsAndFriends a61f40571d add wip bizz 2024-09-06 06:28:08 +02:00
CheemsAndFriends 1021f5c2ee wip sequence 2024-09-05 22:44:05 -04:00
CheemsAndFriends 4cad56705a Add lock bizz 2024-09-05 22:40:27 -04:00
CheemsAndFriends 677357ba37 wip sequence 2024-09-06 02:55:47 +02:00
EliteMasterEric 34d13c61de Cleanup character unlock impl and queue it for after Story Mode is completed. 2024-09-05 17:54:03 -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
CheemsAndFriends def2b64a41 Add lock bizz 2024-09-04 20:08:38 +02:00
EliteMasterEric 24096bd319 Fixed positioning in Blazin'. 2024-09-04 10:58:18 -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 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
Cameron Taylor 498cd4a830 Merge branch 'cards-and-char-select' into rewrite/master 2024-09-01 17:56:12 -04:00
EliteMasterEric 7511de1e7a A bunch of Freeplay visual fixes 2024-09-01 03:28:56 -04:00
FabsTheFabs 71da847158 forgot to change these back 2024-08-30 01:12:26 +01:00
FabsTheFabs 60c10aae99 char select to freeplay transition, backing card implementation, beatHit for backing cards 2024-08-30 01:04:30 +01:00
FabsTheFabs de03da7e6f backing card classes 2024-08-30 01:02:32 +01:00
FabsTheFabs e7448cb8f7 style support 2024-08-30 00:58:19 +01:00
FabsTheFabs a4f3c2cb84 freeplay style code 2024-08-30 00:55:24 +01:00
Cameron Taylor 78fb6e1188
Merge pull request #712 from FunkinCrew/menu-music-fix 
FUNK-525 stop main menu music from playing when entering freeplay from pausemenu
 2024-08-29 18:28:00 -04:00
Cameron Taylor 737a679196 merge conflict fixins 2024-08-29 15:26:35 -04:00
Cameron Taylor 825327e1c8 Merge branch 'rewrite/master' into feature/charSelect 2024-08-29 15:13:58 -04:00
Cameron Taylor 0392eddba6 gf/nene char select mini optimization 2024-08-29 14:32:10 -04:00
Cameron Taylor b27aa4c94d Merge branch 'rewrite/master' into feature/pico-playable-christmas 2024-08-29 13:40:56 -04:00
Cameron Taylor 0a316c815f stop main menu music from playing when entering freeplay from pausemenu 2024-08-29 13:22:56 -04:00
Cameron Taylor 1fbca9ab6a Merge branch 'bugfix/various-develop-fixes' into rewrite/master 2024-08-28 16:32:50 -04:00
EliteMasterEric 6cff1efc72 Fix several compile errors, and update assets submodule. 2024-08-28 06:45:18 -04:00
EliteMasterEric e7fca119f8 Logic + animations for new unlocks 2024-08-28 06:11:01 -04:00
EliteMasterEric 7e39687994 Data driven char select grid positions 2024-08-28 06:09:14 -04:00