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

4432 commits

This branch
This branch
All branches
Author SHA1 Message Date
CheemsAndFriends
def2b64a41 Add lock bizz 2024-09-04 20:08:38 +02:00
EliteMasterEric
24096bd319 Fixed positioning in Blazin'. 2024-09-04 10:58:18 -04:00
EliteMasterEric
3a2ca6b525 Code changes to fix Blazin' 2024-09-04 09:58:04 -04:00
EliteMasterEric
0a6350113e Fix some issues with Blazin 2024-09-04 09:58:00 -04:00
Cameron Taylor
b37ebf1aac assets submod 2024-09-03 23:57:01 -04:00
Cameron Taylor
788f0ee026 Merge branch 'bugfix/labor-daybor' into rewrite/master 2024-09-03 23:56:45 -04:00
Cameron Taylor
bd144d6adb Merge branch 'rewrite/master' into bugfix/friday-fixes 2024-09-03 23:42:51 -04:00
EliteMasterEric
36505f75c1 The actual code for custom freeplay music LOL 2024-09-03 21:14:57 -04:00
FabsTheFabs
f16bffb3fc assets submod..................... 2024-09-03 19:19:25 +01:00
FabsTheFabs
b58bd07fd2 rain shader recolor support 2024-09-03 19:16:58 +01:00
FabsTheFabs
d049478c65 registry updates 2024-09-03 19:16:46 +01:00
Cameron Taylor
930f5ff5a6 Merge branch 'feature/instrumental-select-hud' into rewrite/master 2024-09-03 11:25:34 -04:00
EliteMasterEric
2f59363432 Merge branch 'bugfix/assets-cleanup' into develop-2 2024-09-03 00:21:25 -04:00
Cameron Taylor
498cd4a830 Merge branch 'cards-and-char-select' into rewrite/master 2024-09-01 17:56:12 -04:00
Cameron Taylor
33d1112095 Merge branch 'bugfix/assets-cleanup' into rewrite/master 2024-09-01 17:20:03 -04:00
Cameron Taylor
cdc3883173 assets submod 2024-09-01 17:19:39 -04:00
EliteMasterEric
7511de1e7a A bunch of Freeplay visual fixes 2024-09-01 03:28:56 -04:00
EliteMasterEric
21d5bb6112 Update assets submodule 2024-08-29 22:10:27 -04:00
FabsTheFabs
71da847158 forgot to change these back 2024-08-30 01:12:26 +01:00
FabsTheFabs
4f562e3d6c assets submod 2024-08-30 01:08:47 +01:00
FabsTheFabs
27970e4c2d freeplay style changelog oops 2024-08-30 01:04:51 +01:00
FabsTheFabs
60c10aae99 char select to freeplay transition, backing card implementation, beatHit for backing cards 2024-08-30 01:04:30 +01:00
FabsTheFabs
0c809c828e color tint for angle mask shader 2024-08-30 01:03:11 +01:00
FabsTheFabs
de03da7e6f backing card classes 2024-08-30 01:02:32 +01:00
FabsTheFabs
e7448cb8f7 style support 2024-08-30 00:58:19 +01:00
FabsTheFabs
a4f3c2cb84 freeplay style code 2024-08-30 00:55:24 +01:00
Cameron Taylor
78fb6e1188
Merge pull request #712 from FunkinCrew/menu-music-fix 
FUNK-525 stop main menu music from playing when entering freeplay from pausemenu
 2024-08-29 18:28:00 -04:00
Cameron Taylor
ecd6100cf9 assets submod 2024-08-29 18:26:04 -04:00
Cameron Taylor
3e339916d2 flxanimate bump 2024-08-29 18:11:51 -04:00
Cameron Taylor
737a679196 merge conflict fixins 2024-08-29 15:26:35 -04:00
Cameron Taylor
825327e1c8 Merge branch 'rewrite/master' into feature/charSelect 2024-08-29 15:13:58 -04:00
Cameron Taylor
364a5d5a55 hmm flxanimate version fix 2024-08-29 15:06:11 -04:00
Cameron Taylor
0392eddba6 gf/nene char select mini optimization 2024-08-29 14:32:10 -04:00
Cameron Taylor
b27aa4c94d Merge branch 'rewrite/master' into feature/pico-playable-christmas 2024-08-29 13:40:56 -04:00
Cameron Taylor
0a316c815f stop main menu music from playing when entering freeplay from pausemenu 2024-08-29 13:22:56 -04:00
EliteMasterEric
560badd6b5 File optimization and Expansion 2 album art 2024-08-29 06:59:10 -04:00
Cameron Taylor
1fbca9ab6a Merge branch 'bugfix/various-develop-fixes' into rewrite/master 2024-08-28 16:32:50 -04:00
Cameron Taylor
5d590654f4 assets submod 2024-08-28 16:32:41 -04:00
Cameron Taylor
2effd977f4 Merge branch 'feature/cory-chart-revisions' into rewrite/master 2024-08-28 16:31:07 -04:00
Cameron Taylor
8385c2b8ca
Merge pull request #707 from FunkinCrew/flixel-bump 
bump flixel to latest
 2024-08-28 16:30:33 -04:00
EliteMasterEric
452747139e Updated Pico and Erect charts, sent on August 27th 2024-08-28 09:41:58 -04:00
EliteMasterEric
6cff1efc72 Fix several compile errors, and update assets submodule. 2024-08-28 06:45:18 -04:00
EliteMasterEric
e7fca119f8 Logic + animations for new unlocks 2024-08-28 06:11:01 -04:00
EliteMasterEric
1fb5c31c22 Don't apply global offset twice (NOTE: this may break Nene again!) 2024-08-28 06:09:34 -04:00
EliteMasterEric
7e39687994 Data driven char select grid positions 2024-08-28 06:09:14 -04:00
EliteMasterEric
16a6dba9df Pico Fist Pump animation (with loss animation) 2024-08-28 06:08:30 -04:00
EliteMasterEric
2e7eabc494 Remember character ID between visits to Freeplay, plus some fixes to prevent spamming keys 2024-08-28 06:05:28 -04:00
EliteMasterEric
570e672296 Fix magenta flicker on the main menu. 2024-08-28 06:03:26 -04:00
EliteMasterEric
152820f2e1 Fix some warnings with props in StoryMenu 2024-08-28 06:03:12 -04:00
EliteMasterEric
89402f8bb8 Fix a bug where Bot Play could miss (via lag or the player mashing) and lose the song. 2024-08-28 05:47:34 -04:00