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

4750 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor 7a3d983bba Merge branch 'feature/discord-rpc-resurrected' into rewrite/master 2024-09-27 17:47:59 -04:00
Cameron Taylor ac3e2b2560 discord api mac 2024-09-27 17:45:54 -04:00
Cameron Taylor db0944712d Merge branch 'rewrite/master' into bugfix/mod-dev-fixes 2024-09-27 17:27:59 -04:00
Cameron Taylor fb1b3cc1cd Merge branch 'bugfix/week-7-pico-stress' into rewrite/master 2024-09-27 17:00:54 -04:00
Cameron Taylor 007a32dc9c assets submod 2024-09-27 17:00:31 -04:00
Cameron Taylor 9a57762a9c Merge remote-tracking branch 'origin/bugfix/web-screenshots' into rewrite/master 2024-09-27 16:56:12 -04:00
Cameron Taylor 06fee5599c
Merge pull request #796 from FunkinCrew/lemz1/completion-fix 
[PUBLIC PR] Fix an issue where getting the same rank (but a different clear %) will override the rating
 2024-09-27 16:50:53 -04:00
EliteMasterEric 8a8160dfe7 Update assets submodule 2024-09-27 14:26:46 -04:00
EliteMasterEric 5630e74584 Rework Freeplay variation handling... again. 2024-09-27 14:26:08 -04:00
EliteMasterEric 067f52ca91 Kill intro music when leaving Results state. 2024-09-27 14:25:32 -04:00
EliteMasterEric 2eb5208c46 Hide the pixel icon in the Results screen when there's no matching character 2024-09-27 14:25:17 -04:00
EliteMasterEric b5f3996236 Properly sort difficulties/variations. Validate variation IDs (alphanumeric only) 2024-09-27 12:21:17 -04:00
EliteMasterEric 378179d1f7 Change crash keybind to Ctrl-Alt-Shift-L 2024-09-27 12:20:36 -04:00
EliteMasterEric f1c1e63375 Use more dynamic API version rules for checking mod versions. 2024-09-27 12:19:41 -04:00
EliteMasterEric e321861b9f Fix an issue where animations wouldn't loop properly on AnimateAtlasCharacters. 2024-09-27 03:09:59 -04:00
EliteMasterEric c4ed31b246 Fix a bug where force-ending a song could occasionally try to draw destroyed sprites. 2024-09-27 02:52:01 -04:00
EliteMasterEric 2053f0d691 Fix a missing import in Pico (Blazin) 2024-09-27 02:51:31 -04:00
Cameron Taylor 4669ac03a9
Merge pull request #795 from FunkinCrew/nebulazorua/classic-camera-fix 
[PUBLIC PR] Fix an issue where the Classic FocusCamera event would cause the camera to snap in place
 2024-09-25 19:25:45 -04:00
Cameron Taylor cb16a8d55e
Merge pull request #793 from FunkinCrew/cyn0x8/module-ondestroy-fix 
[PUBLIC PR] Fix an issue when interacting with modules during onDestroy()
 2024-09-25 19:24:48 -04:00
Cameron Taylor e1aa25a249
Merge pull request #791 from FunkinCrew/actions-manual-output 
Allow for manual configuration + artifact saving for Github Actions
 2024-09-25 19:24:14 -04:00
EliteMasterEric 67126b33fa Suppress some spammy log calls 2024-09-25 10:02:18 -04:00
EliteMasterEric a84ae6069e Fix an issue where Pico wouldn't shoot in Stress 2024-09-25 10:02:11 -04:00
EliteMasterEric 998bbb213a Merge branch 'rewrite/master' into nebulazorua/classic-camera-fix 2024-09-25 08:48:20 -04:00
EliteMasterEric 8d02a3f984 A bunch of controls fixes 2024-09-25 08:39:57 -04:00
Eric 85763813ae
Merge branch 'develop' into patch-2 2024-09-25 07:38:14 -04:00
Eric b29296288e
Merge pull request #3438 from TechnikTil/fix-develop-branch 
[BUGFIX] Fix develop branch
 2024-09-25 06:55:39 -04:00
EliteMasterEric 5693d626b5 Update so that album art works. 2024-09-25 03:58:43 -04:00
EliteMasterEric 84d8c02920 Update art repo 2024-09-25 00:39:37 -04:00
EliteMasterEric ec9b5db210 Create shader for Week 5 once and reuse it rather than recreating it every frame. 2024-09-23 21:41:48 -04:00
Cameron Taylor 7e75308423 capitalization hxCodec 2024-09-23 18:51:48 -04:00
Cameron Taylor 073dbaa023 Merge remote-tracking branch 'origin/bugfix/input-offsets-crash' into rewrite/master 2024-09-23 18:48:22 -04:00
Cameron Taylor f6697f8ddc Merge branch 'bugfix/html5-video-error' into rewrite/master 2024-09-23 18:47:48 -04:00
Cameron Taylor 78d0ad9956 Merge remote-tracking branch 'origin/feature/tracy' into rewrite/master 2024-09-23 17:41:01 -04:00
EliteMasterEric 52f5c24f96 Add frame market support, and enable on demand tracing. 2024-09-23 16:09:34 -04:00
Cameron Taylor 252b87c451
Merge pull request #763 from FunkinCrew/feature/tracy 
Add Tracy support for performance profiling
 2024-09-23 15:03:33 -04:00
EliteMasterEric 0389cd6760 Fix a compile issue on HTML5 with video sprites 2024-09-23 14:45:12 -04:00
Cameron Taylor 29c860ed43 Merge branch 'pico-burp-fix' into rewrite/master 2024-09-23 13:12:00 -04:00
Cameron Taylor a86cfded2a assets submod 2024-09-23 13:11:36 -04:00
Cameron Taylor 3d5482660c Merge branch 'week2-death-fix' into rewrite/master 2024-09-23 13:10:52 -04:00
Cameron Taylor 299f4840cf assets submod 2024-09-23 13:10:44 -04:00
Cameron Taylor 8749372725 Merge remote-tracking branch 'origin/docs/updated-changelog' into rewrite/master 2024-09-23 13:09:52 -04:00
Cameron Taylor 50f65177cb Merge branch 'rewrite/master' into spirit-trail 2024-09-23 13:09:03 -04:00
Cameron Taylor 1c2a403dea Merge branch 'rewrite/master' into kadedev/fix-audio-offsets 2024-09-23 13:07:32 -04:00
FabsTheFabs 84ce43eff7 assets submod 2024-09-23 03:46:14 +01:00
Til Tjardes cca997b724 fix develop branch cuz git is on crack 2024-09-22 17:59:18 -06:00
FabsTheFabs 2edb318901 assets submod 2024-09-22 20:11:37 +01:00
Cameron Taylor 15bce04a50
Merge pull request #783 from FunkinCrew/nothyper474/chart-selection 
[PUBLIC PR] Chart Editor: Fi bug where selecting area left of the chart would select the player's left notes
 2024-09-22 13:30:32 -04:00
Cameron Taylor 5c6d72d8d5
Merge pull request #782 from FunkinCrew/cyn0x8/funkinsound-persist 
[PUBLIC PR] If FunkinSound.persist is true, don't destroy it when switching states
 2024-09-22 13:30:17 -04:00
Cameron Taylor 1937529c1f
Merge pull request #779 from FunkinCrew/cutscene-volume-math-fix 
proper audio scaling for hxcodec / desktop
 2024-09-22 13:29:59 -04:00
EliteMasterEric 0bf1bead03 Fix some issues causing the Input Offsets view to crash on web. 2024-09-22 12:14:15 -04:00