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
4278 commits 30 branches 20 tags 6.8 GiB
Commit graph

1082 commits

Author SHA1 Message Date
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
Cameron Taylor ee584d780c Merge branch 'rewrite/master' into flooferland/new-settings-types 2024-07-29 13:44:01 -04:00
EliteMasterEric 41bd0246ac Custom coutndown, judgements, and combo count now use the note style file instead of hardcoded paths. 2024-07-28 17:10:32 -04:00
anysad d3209e57b7 goodbye scripts, hello notestyles! 2024-07-28 02:34:12 -04:00
anysad d5a53855d3 how the hell did I miss these? 2024-07-28 02:31:25 -04:00
anysad dc9dbe84fa cache textures at their new locations! 2024-07-28 02:31:25 -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
Cameron Taylor 4164329ca9 Merge branch 'rewrite/master' into lemz1/note-kind-scripts 2024-07-22 22:20:58 -04:00
EliteMasterEric 1515719a0f Implemented instrumental select (you need to beat the song as Pico first)! 2024-07-22 18:38:22 -04:00
Cameron Taylor b0a842c2c7
Merge pull request #664 from FunkinCrew/gamerbross/chart-reload-f5 
[PUBLIC PR] Pressing F5 in play state now reloads the chart data from your assets folder
 2024-07-18 15:07:52 -04:00
FabsTheFabs 73fc855f8e new stage names 2024-07-18 05:23:31 +01:00
EliteMasterEric 416d60000f Implement Nene Christmas, and fix Nene offsets on other stages. 2024-07-15 06:30:10 -04:00
EliteMasterEric ace762413e Fix an issue where display would break on invalid note styles. 2024-07-12 16:39:42 -04:00
EliteMasterEric f76309c91e Update rendering for custom note styles 2024-07-12 04:13:20 -04:00
lemz 1fe44fa368 add from 2024-07-12 02:13:23 -04:00
lemz f9bccb057a use suffixes instead of pixel boolean 2024-07-12 02:13:22 -04:00
lemz 492af8add4 String works now 2024-07-12 02:13:21 -04:00
lemz 44d9785317 editing them works now 
still need to implement String and do some testing
 2024-07-12 02:13:21 -04:00
lemz c41d846df5 store params in chart 
chart editor still doesnt fully work
 2024-07-12 02:13:20 -04:00
lemz 764cdee63d add more options 2024-07-12 02:13:20 -04:00
lemz 0fe726cefa fix min, max 2024-07-12 02:13:20 -04:00
lemz 437cc68ba7 adapt to minimize problem 2024-07-12 02:13:19 -04:00
lemz 93475ae8aa minimized check 2024-07-12 02:13:19 -04:00
lemz d9b9854d91 add params to toolbox 
not completely finished
 2024-07-12 02:13:18 -04:00
lemz fbcc73dcee unhardcode notestyledropdown 2024-07-12 02:13:17 -04:00
lemz 7a0c7ade35 Update ChartEditorDropdowns.hx 2024-07-12 02:13:16 -04:00
lemz 928de7b8eb check for pixel style if necessary 2024-07-12 02:13:16 -04:00
lemz c4855c0ca8 fix hold note 2024-07-12 02:13:15 -04:00
lemz 49d302be95 make code a bit simpler 2024-07-12 02:13:15 -04:00
lemz bb97549171 fixed a bit 2024-07-12 02:13:14 -04:00
lemz 040fc85a62 change note style on change 2024-07-12 02:13:14 -04:00
lemz ca2cbb44f5 display custom note style in chart editor 2024-07-12 02:13:14 -04:00
lemz 9d7846a0d5 loop through all note style entries 2024-07-12 02:13:13 -04:00
lemz ca69e7b850 custom note styles in chart editor 2024-07-12 02:13:13 -04:00
lemz a7482410b9 add note kind scripts 2024-07-12 02:13: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
gamerbross c3f8075b5f Few animation editor bugfixes 2024-07-11 23:11:58 -04:00
gamerbross 90155bcfbf ChartEditor Live Input Code Refactor + 6 key fix 2024-07-11 22:24:38 -04:00
Cameron Taylor 5a26ece9d6
Merge branch 'rewrite/master' into gamerbross/chart-reload-f5 2024-07-11 19:59:15 -04:00
Cameron Taylor d423753de0
Merge branch 'rewrite/master' into flooferland/new-settings-types 2024-07-11 19:48:51 -04:00
Eric 71947c581e
[PUBLIC PR] Fix a bug where the memory counter would overflow into the negatives (#662) 
* get Float instead of Int in cpp (Float is 64-bit in so it works easier than Int64)

* use Math.fround instead of Math.round

---------

Co-authored-by: Karim Akra <144803230+KarimAkra@users.noreply.github.com>
 2024-07-11 19:35:41 -04:00
gamerbross 7b9e4a0542 Fix F5 chart not reloading 2024-07-11 03:41:51 -04:00
AppleHair 34a19ef583 [BUGFIX] Fixed cancelMenu sound not playing after switching state. 2024-07-10 18:08:55 -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 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
FlooferLand! cd08116aed Added getWidth 2024-07-01 15:41:08 -04:00
FlooferLand! fbc78adb65 Added new settings items 2024-07-01 15:41:08 -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
EliteMasterEric b30faad7d9 Save high scores and high ranks separately. 2024-06-11 00:40:43 -04:00