cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 23:46:45 +00:00
Code Issues Releases Wiki Activity
3919 commits 31 branches 21 tags 3 GiB
Commit graph

983 commits

Author SHA1 Message Date
Cameron Taylor fdf52efdd1 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master 2024-07-08 22:10:52 -04:00
Cameron Taylor 51a156eec9 Merge branch 'char-select-cherrypick' into rewrite/master 2024-07-08 22:10:17 -04:00
Cameron Taylor d9d0facfca
Merge pull request #653 from FunkinCrew/feature/playable-pico-results 
Feature/playable pico results
 2024-07-08 21:52:23 -04:00
Cameron Taylor 6e5c6a8f6d assets submod 2024-07-08 21:51:44 -04:00
Cameron Taylor b338dfe8f0
Merge pull request #649 from FunkinCrew/jvnpixels/story-menu-scrolling 
[PUBLIC PR] Scroll wheel in Story Menu
 2024-07-08 17:39:30 -04:00
Cameron Taylor 3a37b79a55 add TAB to controls stuff 2024-07-08 16:40:10 -04:00
Cameron Taylor 57c995e19d char select screen controls stuff 2024-07-08 16:30:17 -04:00
Cameron Taylor a92334d5ae Merge branch 'rewrite/master' into char-select-cherrypick 2024-07-08 16:23:32 -04:00
Cameron Taylor d7105e8b8e change debug menu and add key for freeplay 2024-07-08 16:22:38 -04:00
Cameron Taylor a7cfae8545 mer 2024-07-04 14:48:24 -04:00
EliteMasterEric e32fcee77c Migrate results animations to JSON data so we can implement them per-character 2024-07-03 22:50:39 -04:00
AppleHair bd17d965f5 [BUGFIX] Fixed Ranks not appearing in freeplay for custom variations 
Freeplay tries to access a song's rank using the current difficulty name alone, but custom variation ranks are being saved with a variation prefix. This PR makes freeplay look for the variation prefix when necessary.
 2024-07-03 18:03:46 -04:00
EliteMasterEric ad57e64994 Working Pico DJ 2024-07-03 18:03:31 -04:00
EliteMasterEric 5c2bad888d Make Boyfriend DJ animations data driven 2024-07-03 18:02:16 -04:00
EliteMasterEric 72a00b9ae2 Implemented playable character registry, added Freeplay character filtering, added alt instrumental support 2024-07-03 18:01:49 -04:00
AppleHair b1021530d8 now using getVariationsByCharId instead 2024-07-03 18:00:59 -04:00
AppleHair 837efcea36 [BUGFIX] Made freeplay use the metadata to get the instrumental suffix 
Song previews in freeplay will now use the instrumental suffix from the current difficulty's corresponding song variation metadata instead of using the variation id as an instrumental suffix and checking only the "erect" variation.
 2024-07-03 18:00:58 -04:00
Cameron Taylor 105e3dccba spritesheet fixins for char select 2024-07-02 21:26:16 -04:00
FabsTheFabs 3fa9b2a635 new music 2024-07-01 22:18:04 -04:00
Cameron Taylor 8dfd36d227 menu spam fixie 2024-07-01 22:18:03 -04:00
FabsTheFabs b1b7a032be music updates 2024-07-01 22:17:55 -04:00
FabsTheFabs 28068b1a86 updating more stuff 2024-07-01 22:17:55 -04:00
FabsTheFabs d686890f76 most of the old code 2024-07-01 22:16:56 -04:00
Cameron Taylor 043c8e8ade
Merge pull request #638 from FunkinCrew/cyn0x8/flash-fix 
[PUBLIC PR] Make flashing effects look more consistent
 2024-07-01 20:23:16 -04:00
Cameron Taylor 5134547071
Merge pull request #648 from FunkinCrew/gamerbross/freeplay-stack-overflow 
[PUBLIC PR] Fix Stack Overflow if song doesn't have "normal" difficulty
 2024-07-01 20:20:38 -04:00
Cameron Taylor bb1fc64754
Merge pull request #647 from FunkinCrew/gamerbross/stickers-f5-screen 
[PUBLIC PR] Fix crash after pressing F5 and coming back from stickers
 2024-07-01 20:19:09 -04:00
Cameron Taylor 88263b9ffd
Merge pull request #640 from FunkinCrew/nothyper-474/loading-state-trace 
[PUBLIC PR] Fix broken trace call in LoadingState
 2024-07-01 16:53:07 -04:00
EliteMasterEric 432c709075 Animated pixel icons for freeplay 
mend
 2024-07-01 16:51:54 -04:00
Pixel a9c6b9ff8a Extra newline removal. 
Removes the extra line in code.
 2024-06-29 01:15:48 -04:00
Pixel 90f3a8f285 Update source/funkin/ui/story/StoryMenuState.hx 
Co-authored-by: gamerbross <55158797+gamerbross@users.noreply.github.com>
 2024-06-29 01:15:48 -04:00
Pixel 55d02d49c2 Update StoryMenuState.hx 2024-06-29 01:15:47 -04:00
gamerbross 7e6ef61169 Fix Stack Overflow if song doesn't have "normal" difficulty 2024-06-29 00:35:01 -04:00
gamerbross 32deb8d190 Fix crash after pressing F5 and coming back from stickers 2024-06-29 00:29:23 -04:00
EliteMasterEric fbfd8259a6 Merge branch 'applehair/ranks-for-custom-variations' into feature/playable-pico-mode 2024-06-27 04:06:10 -04:00
NotHyper-474 6f26fbba5f Fix trace 2024-06-26 20:57:01 -04:00
cyn dad8b0815d flash fix 2024-06-26 20:36:53 -04:00
Cameron Taylor ab2f949d7e fix for heart icons being on the wrong frames 2024-06-25 13:56:31 -04:00
Cameron Taylor 5751430261 fix the camera not panning when opening then closing the debug menu during transition 2024-06-25 13:56:31 -04:00
EliteMasterEric 4e65c49e0e Get rid of a warning about missing BPM info 2024-06-24 14:40:55 -04:00
EliteMasterEric 9b3a748f37 Working Pico DJ 2024-06-20 16:17:53 -04:00
EliteMasterEric 263039f52c Make Boyfriend DJ animations data driven 2024-06-18 20:07:27 -04:00
EliteMasterEric 60e741434c Implemented playable character registry, added Freeplay character filtering, added alt instrumental support 2024-06-18 17:56:24 -04:00
EliteMasterEric 6f2f2a9aa4 Merge branch 'applehair/preview-inst-suffix' into feature/playable-pico-mode 2024-06-18 15:40:51 -04:00
AppleHair 1f1fe62a06
[BUGFIX] Fixed Ranks not appearing in freeplay for custom variations 
Freeplay tries to access a song's rank using the current difficulty name alone, but custom variation ranks are being saved with a variation prefix. This PR makes freeplay look for the variation prefix when necessary.
 2024-06-14 16:53:33 +03:00
AppleHair c4d6e18885
now using getVariationsByCharId instead 2024-06-12 11:23:45 +03:00
Cameron Taylor 47d5c4d141
Merge pull request #619 from FunkinCrew/freeplay-dad-smoother 
freeplay bg nicer AA and proper sizing
 2024-06-11 16:16:13 -04:00
Cameron Taylor c05f053fe3 Merge branch 'rewrite/master' into bugfix/instrumental-id 2024-06-11 16:12:39 -04:00
Cameron Taylor 1e3ef61fc9 freeplay bg nicer AA and proper sizing 2024-06-11 15:57:45 -04:00
Cameron Taylor 817c216d06
Merge pull request #617 from FunkinCrew/bugfix/save-highest-rank 
[FUNK-387] Save high scores and high ranks separately.
 2024-06-11 12:04:38 -04:00
Cameron Taylor 381e0104e9
Merge pull request #616 from FunkinCrew/feature/freeplay-keybinds 
[FUNK-391] Rebindable controls for the Freeplay menu
 2024-06-11 11:49:24 -04:00