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

233 commits

Author SHA1 Message Date
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
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 825327e1c8 Merge branch 'rewrite/master' into feature/charSelect 2024-08-29 15:13:58 -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
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
EliteMasterEric 16a6dba9df Pico Fist Pump animation (with loss animation) 2024-08-28 06:08:30 -04:00
EliteMasterEric 2e7eabc494 Remember character ID between visits to Freeplay, plus some fixes to prevent spamming keys 2024-08-28 06:05:28 -04:00
CheemsAndFriends 353aa42f5b Fixes for the atlasSprite bizz 2024-08-28 02:48:56 +02:00
EliteMasterEric 200b3c963b Updated compile defines to use feature flag system 2024-08-26 18:01:36 -04:00
FabsTheFabs 55dd1857c9 freeplay transition + wip card classes 2024-08-23 13:36:35 +01:00
Cameron Taylor cee5d53deb
Merge pull request #686 from FunkinCrew/applehair/freeplay-stack-overflow 
[PUBLIC PR] Fix a stack overflow for songs with no "Normal" difficulty
 2024-08-20 15:09:36 -04:00
Cameron Taylor 6e3fba4d3d Merge branch 'rewrite/master' into gamerbross/animation-editor 2024-08-20 14:29:43 -04:00
Cameron Taylor 0e46f91a60 Merge branch 'rewrite/master' into feature/album-art-swap 2024-08-16 20:21:51 -04:00
AppleHair cb02ea7da5 Updated to extend #2712 2024-07-29 19:03:54 -04:00
AppleHair c8322c479c Added a comment 2024-07-29 19:03:52 -04:00
AppleHair 4f46a8e4d0 [BUGFIX] Prevented infinite recursion on freeplay when a song doesn't have the normal difficulty 
Any attempt to create a song without the `normal` difficulty will result in a silent crash when opening freeplay. After some debugging, I discovered that the issue is caused by infinite recursion, which gets triggered at the start of `FreeplaySongData`'s `updateValues`.
 2024-07-29 19:03:37 -04:00
EliteMasterEric 68b7610225 Update OpenFL to latest (requires a few fixes) 2024-07-29 17:26:49 -04:00
EliteMasterEric f3624f7e76 Fixes for scripted song events, define vocal tracks per variation, display suffixed difficulties properly. 2024-07-28 01:42:09 -04:00
EliteMasterEric 1515719a0f Implemented instrumental select (you need to beat the song as Pico first)! 2024-07-22 18:38:22 -04:00
EliteMasterEric 416d60000f Implement Nene Christmas, and fix Nene offsets on other stages. 2024-07-15 06:30:10 -04:00
EliteMasterEric 03d1f858ec Remove flixel-ui and add a new dropdown to the animation offset editor 2024-07-12 00:57:08 -04:00
EliteMasterEric 2ae6882241 Swappable album art and updated FlxAnimate 2024-07-10 17:25:52 -04:00
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 6e5c6a8f6d assets submod 2024-07-08 21:51:44 -04:00
Cameron Taylor 3a37b79a55 add TAB to controls stuff 2024-07-08 16:40:10 -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
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