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
4494 commits 31 branches 21 tags 3 GiB
Commit graph

4494 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric 27f700dd98
Merge branch 'develop' into JVNPixels-story-menu-scrolling-fixed 2024-09-16 18:34:43 -04:00
Eric f015976521
Merge pull request #2712 from gamerbross/bugfix/freeplay-difficulty-stack-overflow 
[BUGFIX] Song with no "Normal" causes Stack Overflow
 2024-09-16 18:34:06 -04:00
Eric 265039b025
Merge branch 'develop' into bugfix/freeplay-difficulty-stack-overflow 2024-09-16 18:33:57 -04:00
Eric 8c6cb72d47
Merge pull request #2986 from AppleHair/bugfix/cancel-menu-sound 
[BUGFIX] Fixed `cancelMenu` sound not playing after switching state
 2024-09-16 18:30:02 -04:00
Eric b3221c0e3f
Merge branch 'develop' into bugfix/cancel-menu-sound 2024-09-16 18:29:51 -04:00
Eric c7cb03dd1d
Merge pull request #2990 from gamerbross/bugfix/f5-reload-chart 
[BUGFIX] F5 now reloads the chart in the PlayState
 2024-09-16 18:29:39 -04:00
Eric a7c0512503
Merge branch 'develop' into bugfix/f5-reload-chart 2024-09-16 18:29:33 -04:00
Eric d214ae1747
Merge pull request #3058 from Burgerballs/fix-sync 
Use chart inst offset for song resync + other resync fixes
 2024-09-16 18:27:35 -04:00
Eric 6ee1bddacb
Merge branch 'develop' into fix-sync 2024-09-16 18:27:27 -04:00
Eric 8b96d1bbac
Merge pull request #2863 from gamerbross/bugfix/stickers-f5-crash 
[BUGFIX] Crash after coming back from stickers and pressing F5
 2024-09-16 18:26:42 -04:00
Eric d4e11f786c
Merge branch 'develop' into bugfix/stickers-f5-crash 2024-09-16 18:26:31 -04:00
Eric 724c415016
Merge pull request #2739 from gamerbross/bugfix/chart-key 
[BUGFIX] When pressing chart key while charting, chart gets reset
 2024-09-16 18:25:42 -04:00
Eric 055ae5b932
Merge branch 'develop' into bugfix/chart-key 2024-09-16 18:25:35 -04:00
Eric 85e9dbb959
Merge pull request #2713 from KarimAkra-Stuff/memory-counter-fix 
[BUGFIX] Fixed memory counter displaying negative numbers
 2024-09-16 18:25:15 -04:00
Eric c5060b6eec
Merge pull request #2749 from NotHyper-474/path-trace-fix 
Fix small oversight in LoadingState
 2024-09-16 18:24:42 -04:00
Eric df77d11896
Merge branch 'develop' into path-trace-fix 2024-09-16 18:24:34 -04:00
Eric aa2d934f22
Merge pull request #3036 from AppleHair/bugfix/freeplay-infinite-recursion 
[BUGFIX] Prevented infinite recursion on freeplay when a song doesn't have the `normal` difficulty
 2024-09-16 18:24:22 -04:00
Eric 3f6ad6f8ad
Merge branch 'develop' into bugfix/freeplay-infinite-recursion 2024-09-16 18:24:15 -04:00
Eric 45efd78931
Merge pull request #3037 from AppleHair/bugfix/valid-vari-story-mode 
[BUGFIX] Ensure the variation used for the next song is valid.
 2024-09-16 18:23:50 -04:00
Eric b95e228322
Merge branch 'develop' into bugfix/valid-vari-story-mode 2024-09-16 18:23:39 -04:00
Eric c9e2e7bef5
Merge pull request #3005 from gamerbross/bugfix/default-face-icon 
[BUGFIX] Default health icon (face) not used
 2024-09-16 18:23:23 -04:00
Eric bab4ac4902
Merge branch 'develop' into bugfix/default-face-icon 2024-09-16 18:21:20 -04:00
Eric b8d1341a21
Merge pull request #2850 from MaybeMaru/constants 
Use constants pixels per ms
 2024-09-16 18:20:46 -04:00
Eric 55e0970e4c
Merge branch 'develop' into constants 2024-09-16 18:20:35 -04:00
Eric 82c2d54079
Merge pull request #2567 from gamerbross/bugfix/pause-sticker-zoom 
[BUGFIX] Pause Menu and Stickers have same zoom as HUD
 2024-09-16 18:20:20 -04:00
Eric c4b475e86a
Merge branch 'develop' into bugfix/pause-sticker-zoom 2024-09-16 18:20:11 -04:00
Eric 9fddb727b8
Merge pull request #2724 from KarimAkra-Stuff/FlxPartialSound-openfl/polymod-support 
[BUGFIX] Fixed Polymod and Mods Support in FlxPartialSound
 2024-09-16 18:19:20 -04:00
Eric 3b9d400f57
Merge pull request #3328 from FunkinCrew/docs/troubleshooting-update 
[DOCS] Update to troubleshooting guide
 2024-09-16 18:17:25 -04:00
EliteMasterEric f8d0ddef34 Update troubleshooting guide 2024-09-16 18:17:07 -04:00
Eric 8efcd1eae1
Merge pull request #2584 from FunkinCrew/docs/compiling-guide 
[DOCS] Update compiling guide with more troubleshooting
 2024-09-16 18:12:55 -04:00
Eric 06485518db
Merge branch 'develop' into docs/compiling-guide 2024-09-16 18:12:49 -04:00
Eric 57523c9439
Merge pull request #3035 from 7oltan/character-path-fix 
FIXES CHARACTER PATH ONLY CHECKING IN SHARED
 2024-09-16 18:10:25 -04:00
Eric 42544ee757
Merge branch 'develop' into character-path-fix 2024-09-16 18:10:09 -04:00
Eric a5ac717677
Merge branch 'develop' into bugfix/freeplay-difficulty-stack-overflow 2024-09-16 18:03:47 -04:00
Eric ea2e6506c8
Merge pull request #2494 from cyn0x8/flash_fix 
consistent flashing
 2024-09-16 18:03:18 -04:00
Eric 1e8d3c715b
Merge branch 'develop' into flash_fix 2024-09-16 18:03:05 -04:00
Cameron Taylor a27c4ae24f pub modules art 2024-09-16 17:14:45 -04:00
Cameron Taylor 1f21e1114b pub modules 2024-09-16 17:12:11 -04:00
EliteMasterEric d59594ee45 Fix animations not looping on Char Select 2024-09-12 22:02:05 -04:00
Cameron Taylor d3d998d994 saru fixies 2024-09-12 21:57:48 -04:00
Cameron Taylor 247b86ea1d Merge branch 'bugfix/blazin-offsets' into rewrite/master 2024-09-12 21:53:54 -04:00
Cameron Taylor 80868ccbba assets submod 2024-09-12 21:53:38 -04:00
EliteMasterEric 0e225c9bae Update eggnog vocals again 2024-09-12 20:51:02 -04:00
EliteMasterEric c9d6c19420 Update fresh audio 2024-09-12 20:35:13 -04:00
EliteMasterEric c6bdd36959 Fix blazin offsets 2024-09-12 20:32:19 -04:00
Cameron Taylor cae7db6254 Merge branch 'vp9-cutscene' into rewrite/master 2024-09-12 20:26:05 -04:00
Cameron Taylor af31be5436 makeship linky 2024-09-12 20:14:48 -04:00
Cameron Taylor 172c90b1bd assets submod 2024-09-12 20:12:20 -04:00
Cameron Taylor a4cd2eb169 Merge branch 'pico-christmas-offsets' into rewrite/master 2024-09-12 20:05:42 -04:00
Cameron Taylor 0aa2ccd1cd assets submod 2024-09-12 20:05:14 -04:00