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

2595 commits

This branch
This branch
All branches
Author SHA1 Message Date
EliteMasterEric
dd3d1116c0 Add a flag to make Git hash display on launcher builds. 2023-10-12 13:22:59 -04:00
EliteMasterEric
996f7b275e Remember difficulty when leaving story/freeplay menu. 2023-10-12 03:20:21 -04:00
Cameron Taylor
9ff4885173 charting sound effects in progress! 2023-10-11 19:39:52 -04:00
EliteMasterEric
a88262a5f4 Hide AnimateAtlas characters in the animation editor. 2023-10-11 19:16:04 -04:00
EliteMasterEric
f3737601f8 Can't spam enter on pause menu or freeplay menu anymore 2023-10-11 18:54:58 -04:00
EliteMasterEric
8589c10c75 Fixes to Pause screen and Results screen 2023-10-11 17:33:55 -04:00
Cameron Taylor
652a1836a0 assets submodule update 2023-10-11 16:50:16 -04:00
EliteMasterEric
0327aeb45f Replace assets/ commit reference with one that exists 2023-10-11 15:34:05 -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
Cameron Taylor
b9572fe9e9 Merge pull request #169 from FunkinCrew/rewrite/feature/chart-editor-wasd 
Chart Editor Working Live Inputs, Note snapping in menu, W/S to scroll
 2023-10-11 06:28:48 -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
4a70f73c4b Merge branch 'rewrite/master' into rewrite/feature/chart-editor-erect-template 2023-10-10 23:44:53 -04:00
EliteMasterEric
2579df1a7e Update submodules 2023-10-10 23:43:56 -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
ab01d087c0 Fast forward submodules 2023-10-10 23:40:36 -04:00
EliteMasterEric
299a3a1a25 Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd 2023-10-10 23:38:38 -04:00
EliteMasterEric
2e56fdb026 Fast-forward submodules 2023-10-10 23:36:38 -04:00
EliteMasterEric
989d1c3175 Merge rewrite/master, fix high score retrieval 2023-10-10 23:32:01 -04:00
EliteMasterEric
b50ccfa080 Resolve merge conflicts 2023-10-10 22:36:58 -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
b01d4ea8f4 Merge pull request #181 from FunkinCrew/rewrite/bugfix/alt-animation-fixes 
Alt animation fixes
 2023-10-10 20:32:58 -04:00
Cameron Taylor
e26a82275c Merge branch 'rewrite/master' into rewrite/bugfix/alt-animation-fixes 2023-10-10 20:32:12 -04:00
Cameron Taylor
5c2a3b912a Merge pull request #183 from FunkinCrew/rewrite/freeplay-polish 
Cherry Pick of Freeplay Polish
 2023-10-10 20:22:03 -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