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

2824 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor 1211dbb6e8 Merge branch 'rewrite/master' into feature/chart-editor-song-scripts 2024-03-13 21:26:50 -07:00
Cameron Taylor a6fecd05e0 assets submod 2024-03-13 18:58:18 -07:00
Cameron Taylor 59752f0d9a Merge pull request #385 from FunkinCrew/feature/debugger-popup-fixes 
Debugger popup fixes
 2024-03-13 21:54:54 -04:00
Cameron Taylor c8b74ccce2 Merge branch 'rewrite/master' into feature/debugger-popup-fixes 2024-03-13 18:54:24 -07:00
Cameron Taylor b3b397f810 Merge pull request #384 from FunkinCrew/bugfix/precache-library-assets 
Fix 2hot stuttering issues
 2024-03-13 21:48:28 -04:00
Cameron Taylor b9ab38e0b9 timertools -> timerutil fix 2024-03-13 18:47:15 -07:00
Cameron Taylor 1a224423f9 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into bugfix/precache-library-assets 2024-03-13 18:41:45 -07:00
Jenny Crowe 8562c11c94 Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening 2024-03-13 18:27:16 -07:00
EliteMasterEric d22cb1a96f Fix some issues resulting in release builds breaking! 2024-03-13 17:38:00 -04:00
Hazel 238a11debd retrigger ci 2024-03-13 21:15:22 +01:00
EliteMasterEric 9328ac84cc New lightning graphic 2024-03-13 12:57:46 -04:00
EliteMasterEric c67e64a8f5 Update Flixel and assets submodule 2024-03-13 12:07:19 -04:00
EliteMasterEric a13dc6e585 Remove deprecated imports. 2024-03-13 12:07:06 -04:00
EliteMasterEric 541c7b4041 Update assets submodule 2024-03-12 21:36:32 -04:00
EliteMasterEric 43cf1e71e2 Disable camera events in the minimal playtest. 2024-03-12 21:35:55 -04:00
EliteMasterEric 66085ff867 Song scripts can now be (optionally) enabled in the Chart Editor playtest 2024-03-12 21:34:50 -04:00
EliteMasterEric 09e52e47ae Commit an unsaved file 2024-03-12 18:01:09 -04:00
EliteMasterEric bbaf8dfb3e Debugger popup fixes 2024-03-12 17:57:52 -04:00
EliteMasterEric be8f5699b5 2hot stutter actually fixed! 2024-03-11 23:42:32 -04:00
Cameron Taylor ee35bf3044 bugfix/darnell-can-sfx-sync assets merge 2024-03-11 00:47:56 -04:00
Jenny Crowe 6b8fb7dc77 Standardized camera zoom tweening to match camera follow tweening. Implemented methods to cancel tweens in necessary places. Start of pausing tweens when pausing the game (WIP). (CHANGES NOT TESTED EXPECT SOMETHING TO BREAK) 2024-03-10 16:35:41 -07:00
Jenny Crowe f9291d6458 Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening 2024-03-10 14:51:24 -07:00
Cameron Taylor d495420938 fixes capitalization in checkstyle settings 2024-03-10 15:24:43 -04:00
Cameron Taylor b97094675f Merge pull request #373 from FunkinCrew/bugfix/html5-array-clone 
Fix an issue with array.clone() on HTML5
 2024-03-10 13:48:43 -04:00
Cameron Taylor 25cb73316c Merge branch 'rewrite/master' into bugfix/html5-array-clone 2024-03-10 13:46:49 -04:00
Cameron Taylor a6061d8b35 Merge pull request #379 from FunkinCrew/bugfix/chart-editor-blazin-dropdown 
Chart Editor: Blazin' dropdown fixes, plus more Blazin animation fixes
 2024-03-10 13:35:23 -04:00
Cameron Taylor 528b01d739 assets submod 2024-03-10 13:34:40 -04:00
Cameron Taylor f1c13f7796 assets submod 2024-03-10 13:34:06 -04:00
Cameron Taylor fbc5d9955d Merge pull request #380 from FunkinCrew/bugfix/weekend-1-sing-time 
Weekend 1: Fix default value for singTime to use correct unit.
 2024-03-10 13:28:34 -04:00
Cameron Taylor dab80f4f60 Merge pull request #381 from FunkinCrew/bugfix/story-menu-fast-bop 
Fix an issue where story menu characters bop too fast
 2024-03-10 13:28:01 -04:00
EliteMasterEric 09029718aa Fix an issue where story menu characters bop too fast 2024-03-08 21:33:06 -05:00
EliteMasterEric 9284f1495b Fix default value for singTime to use correct unit. 2024-03-08 20:56:34 -05:00
Eric 7c99905312 Merge pull request #370 from FunkinCrew/rain 
raindrop assets
 2024-03-08 20:00:32 -05:00
Cameron Taylor 0cd7956b4f asset submod 2024-03-08 17:42:34 -05:00
Cameron Taylor 219e494ffb assets submod 2024-03-08 17:22:30 -05:00
Cameron Taylor 5ece2936aa assets submod, and gitignore for my lil vim todo lists i make lol 2024-03-08 17:03:29 -05:00
Jenny Crowe 21b895ab97 Assets submod update 2024-03-08 14:50:26 -07:00
Cameron Taylor 6bf3d1b3e1 Merge pull request #378 from FunkinCrew/feature/pico-bonk-sfx 
Implement pico bonk sfx
 2024-03-08 16:49:35 -05:00
Cameron Taylor 3982747e97 Merge branch 'rewrite/master' into feature/pico-bonk-sfx 2024-03-08 16:48:31 -05:00
Cameron Taylor b209e20fb4 asset submod 2024-03-08 16:47:33 -05:00
Cameron Taylor 22f5e68d02 Merge pull request #377 from FunkinCrew/feature/blazin-touchups 
Blazin' stage rework
 2024-03-08 16:46:05 -05:00
Cameron Taylor 7a5d48b290 Merge branch 'rewrite/master' into feature/blazin-touchups 2024-03-08 16:43:56 -05:00
EliteMasterEric 083d66f879 Some animation fixes for Blazin 2024-03-08 15:29:02 -05:00
EliteMasterEric a7b531e57f Fix swapped entries in Blazin' dropdown. 2024-03-08 15:07:10 -05:00
EliteMasterEric d02ccf9abf Implement pico bonk sfx 2024-03-08 15:05:58 -05:00
Eric c40919f53f Merge pull request #375 from FunkinCrew/bugfix/html5-video 
Use correct resource URL when loading videos
 2024-03-08 00:31:10 -05:00
Eric b3521b3c9d Merge pull request #372 from FunkinCrew/result-screen-pitch 
fun lil pitch effect on result scren
 2024-03-08 00:30:31 -05:00
Eric bf6ec0421c Merge branch 'rewrite/master' into result-screen-pitch 2024-03-08 00:30:08 -05:00
Eric 677f4b1b4f Merge pull request #376 from FunkinCrew/ninjamuffin99-patch-1 
faster bf processing...
 2024-03-07 23:33:47 -05:00
EliteMasterEric ab50b7b78e Lightning and rain SFX 2024-03-07 23:22:31 -05:00