Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-12-11 16:51:21 -05:00
Code Issues Projects Releases Packages Wiki Activity
1811 commits 30 branches 20 tags 3 GiB
Commit graph

577 commits

Author SHA1 Message Date
Cameron Taylor
865f771c4a Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/preferences-rewrite 2023-10-15 20:54:22 -04:00
Cameron Taylor
cb0bddcb34 Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/save-data-rewrite 2023-10-15 20:19:31 -04:00
EliteMasterEric
d350ba3bdc Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/save-data-rewrite 2023-10-15 19:36:36 -04:00
Cameron Taylor
937082fecf Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/snapped-paste 2023-10-15 19:23:06 -04:00
EliteMasterEric
022b93bc43 Merge branch 'rewrite/master' into rewrite/feature/chart-editor-erect-template 2023-10-15 18:42:38 -04:00
EliteMasterEric
9f293d3be8 Merge branch 'rewrite/master' into rewrite/feature/save-data-rewrite 2023-10-15 01:15:49 -04:00
EliteMasterEric
88f9584fd9 Fix an issue where the game would crash when loading a song in Freeplay 2023-10-15 01:06:06 -04:00
EliteMasterEric
ccefa972a0 Fixes an issue where Freeplay Menu wasn't properly flagging the Week 6 assets to load. 2023-10-15 00:59:35 -04:00
EliteMasterEric
ccedd82210 Move FunkinDropdown to FunkinDropDown 2023-10-15 00:34:37 -04:00
EliteMasterEric
098dedd41e Fix "Could not locate metadataDialog" 2023-10-15 00:22:25 -04:00
EliteMasterEric
dd38dbbadf Tweaked the numbers on scrolling 2023-10-14 23:57:40 -04:00
Cameron Taylor
eb95f105d7 Merge pull request #187 from FunkinCrew/rewrite/bugfix/menu-spam 
Fix spamming buttons on Pause/Freeplay breaking shit
 2023-10-14 20:33:36 -04:00
EliteMasterEric
c1684b218e More fixes to github actions 2023-10-12 20:17:41 -04:00
EliteMasterEric
9ec3f7aaac Fix to FORCE_DEBUG_VERSION flag 2023-10-12 19:57:16 -04:00
EliteMasterEric
dd3d1116c0 Add a flag to make Git hash display on launcher builds. 2023-10-12 13:22:59 -04:00
EliteMasterEric
f3737601f8 Can't spam enter on pause menu or freeplay menu anymore 2023-10-11 18:54:58 -04:00
Cameron Taylor
0c0829b2d0 sound effects for stickersubstate 2023-10-11 07:43:44 -04:00
Cameron Taylor
6e2441b540 Merge pull request #184 from FunkinCrew/rewrite/bugfix/glowup-autosave 
Fix exit button in Chart Editor menu
 2023-10-11 06:32:00 -04:00
EliteMasterEric
05044d9af3 Override F4 behavior 2023-10-11 00:39:16 -04:00
EliteMasterEric
d7a15dc713 Fix exit button in Chart Editor menu 2023-10-11 00:30:41 -04:00
EliteMasterEric
1ccb84bbf2 Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-erect-template 2023-10-10 23:46:54 -04:00
EliteMasterEric
cdac9aec9a Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-wasd 2023-10-10 23:42:38 -04:00
EliteMasterEric
299a3a1a25 Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd 2023-10-10 23:38:38 -04:00
EliteMasterEric
989d1c3175 Merge rewrite/master, fix high score retrieval 2023-10-10 23:32:01 -04:00
Cameron Taylor
e5fbf5d99f Merge pull request #180 from FunkinCrew/rewrite/bugfix/difficulty-switch-crash 
[CRASH FIX] Safely handle difficulty switching to avoid null object reference in Play State
 2023-10-10 21:33:57 -04:00
Cameron Taylor
e26a82275c Merge branch 'rewrite/master' into rewrite/bugfix/alt-animation-fixes 2023-10-10 20:32:12 -04:00
EliteMasterEric
f652beb382 Fix several merge errors. 2023-10-09 20:04:21 -04:00
Cameron Taylor
8009045e76 fix to song selection 2023-10-09 18:38:52 -04:00
Cameron Taylor
9446f268e0 diff stars pop in nicer 2023-10-09 18:38:10 -04:00
Cameron Taylor
9926706e6e litty fix 2023-10-09 18:38:05 -04:00
Cameron Taylor
4b1af216d4 capsule alpha stuff in progress 2023-10-09 18:38:02 -04:00
Cameron Taylor
387acd211e icon scaling fix + removed temp lighting 2023-10-09 18:37:20 -04:00
Cameron Taylor
ba896508cc cartoons and stuff 2023-10-09 18:35:43 -04:00
Cameron Taylor
546e15dcac click polish 2023-10-09 18:34:54 -04:00
Cameron Taylor
8c74fcd73a playingCartoon bool woops 2023-10-09 18:34:38 -04:00
Cameron Taylor
8f9206f639 python file to generate shitty audio 2023-10-09 18:34:29 -04:00
Cameron Taylor
ab5d6d2f48 sounds in progress 2023-10-09 18:33:50 -04:00
Cameron Taylor
66f77a985f boyfriend blink code 2023-10-09 18:33:09 -04:00
Cameron Taylor
82bb619864 boyfriend tv looping 2023-10-09 18:33:09 -04:00
Cameron Taylor
5ddc4876bc boyfriend animations swapped to atlas sprites 2023-10-09 18:33:03 -04:00
Cameron Taylor
f000d21689 shaders and blendmode overlay stuff in progres 2023-10-09 18:32:18 -04:00
Cameron Taylor
b20cb27f82 hue shifting in progress 2023-10-09 18:31:06 -04:00
Cameron Taylor
20d13f56ac capsule text effect 2023-10-09 18:29:32 -04:00
Cameron Taylor
5d6264e67e sprites follow rotation of capsule 2023-10-09 18:28:59 -04:00
Cameron Taylor
0dbcc50bcc random song music in progress 2023-10-09 18:28:56 -04:00
Cameron Taylor
8525cfaf21 cute text popin 2023-10-09 18:28:11 -04:00
Cameron Taylor
f474c3aac5 better grouping stuf 2023-10-09 18:28:11 -04:00
Cameron Taylor
eacd76a0fa difficulty rankings and grayscale mockup 2023-10-09 18:28:08 -04:00
Cameron Taylor
a8e39d90e8 temp rank stuff in progress 2023-10-09 18:27:17 -04:00
EliteMasterEric
f7bac02ee3 Fix crashing, broken countdown, broken miss muting in song preview 2023-10-09 18:24:07 -04:00