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

4358 commits

This branch
This branch
All branches
Author SHA1 Message Date
CheemsAndFriends
3553d008cf tinkering shit 2024-09-12 01:37:32 +02:00
CheemsAndFriends
70ab000be4 Readd CharSelectSubState from char unlock 2024-09-11 21:16:02 +02:00
CheemsAndFriends
cfcfc773da readd Save from char unlock 2024-09-11 20:53:05 +02:00
CheemsAndFriends
9f5c154b1d readd IntroSubState from char unlock 2024-09-11 20:49:55 +02:00
CheemsAndFriends
bea23c37a8 readd FlxAtlasSprite from char unlock branch 2024-09-11 20:47:45 +02:00
CheemsAndFriends
c81f041695 Tinkering with atlassprite 2024-09-11 20:05:39 +02:00
CheemsAndFriends
17a48bfc2b D'oh! 2024-09-11 19:26:38 +02:00
CheemsAndFriends
68d87a0837 Add one more conditional in atlas + add ignoreExclusions in Bopper/BaseCharacter 2024-09-11 19:24:21 +02:00
CheemsAndFriends
6349ba3a5a Fix GF not appearing on screen 2024-09-11 18:30:11 +02:00
CheemsAndFriends
5c1766a00f Fix char select substate crash 2024-09-11 18:29:47 +02:00
CheemsAndFriends
0dc286e1d3 Fix Eggnog santa not playing plus Ugh fix 2024-09-11 18:29:31 +02:00
CheemsAndFriends
2aa9e58f67 Fix titlestate reentering crash 2024-09-11 18:29:00 +02:00
CheemsAndFriends
07d9ce2d5a Submodule thing 2024-09-11 17:15:31 +02:00
Cameron Taylor
4cbea7d486 get rid of submodules that appeared for some reason 2024-09-11 00:07:52 -04:00
Cameron Taylor
22b1a5d9c0 Merge branch 'rewrite/master' into feature/char-unlock-merging 2024-09-10 23:52:52 -04:00
Cameron Taylor
9891dc7309 Merge branch 'rewrite/master' into bugfix/web-fixes 2024-09-10 23:43:26 -04:00
Cameron Taylor
e5a788de7d change xargs input 2024-09-10 20:22:44 -04:00
EliteMasterEric
59fac5a809 Enable New labels for character mixes 2024-09-10 19:32:19 -04:00
EliteMasterEric
9a242c5d00 Fix an issue where New labels wouldn't show on character mixes 2024-09-10 19:32:10 -04:00
EliteMasterEric
a530d91a76 Fix a bug where StickerSubState was being loaded as a state and not a substate, breaking some transitions 2024-09-10 19:16:48 -04:00
CheemsAndFriends
f74365f230 Add Changes 2024-09-11 00:55:14 +02:00
EliteMasterEric
0ec22bcc85 Update assets submodule 2024-09-10 17:40:27 -04:00
EliteMasterEric
7aa20223b9 Update art submodule 2024-09-10 17:35:52 -04:00
EliteMasterEric
c678cabbf2 Fix issue where difficulty names wouldn't show up properly sometimes. 2024-09-10 17:30:33 -04:00
EliteMasterEric
5021b49915 Enable the New Character backing card 2024-09-10 17:27:04 -04:00
EliteMasterEric
7063fafd33 Fix web builds using disgusting amounts of bandwidth 2024-09-10 17:26:33 -04:00
Cameron Taylor
9c8142b769 Merge branch 'html5-fps' into rewrite/master 2024-09-10 15:40:30 -04:00
Cameron Taylor
96657e9e41 Merge branch 'rewrite/master' into week2-erect-bg-fixes 2024-09-10 07:38:38 -04:00
FabsTheFabs
ee78178b20 assets submod 2024-09-10 07:30:24 +01:00
FabsTheFabs
03d9416ab1 texture swap shader 2024-09-10 07:26:15 +01:00
FabsTheFabs
34e93fa95a color util (with just one function lol) 2024-09-10 07:25:11 +01:00
EliteMasterEric
f6bd203786 Fix an issue where base inst wouldn't be chosen properly on remixes 2024-09-10 01:33:15 -04:00
Cameron Taylor
06389cb5cd Merge branch 'rewrite/master' into bugfix/doppel-random 2024-09-09 23:50:00 -04:00
Cameron Taylor
030afe1355 Merge branch 'bugfix/instrumental-selector' into rewrite/master 2024-09-09 23:49:02 -04:00
Cameron Taylor
adb4bc96ca flxanimate version bump 2024-09-09 23:47:17 -04:00
EliteMasterEric
4c1b4859e7 Fix a bug where the random event in Week 3 would always trigger 2024-09-09 22:35:02 -04:00
EliteMasterEric
877d64c32b Fixed a bug where the instrumental selector would be ignored sometimes 2024-09-09 21:21:50 -04:00
CheemsAndFriends
af8fe0c0d2 Remove onAnimationLoopComplete 2024-09-10 01:11:41 +02:00
CheemsAndFriends
8d27a45d17 change lock a bit 2024-09-09 21:39:38 +02:00
Cameron Taylor
e2c287e112 logarithmic volume control 2024-09-09 13:01:19 -04:00
Cameron Taylor
591d4a29f4 gameover positioning fixes 2024-09-09 12:34:55 -04:00
Cameron Taylor
d9a3604880 Merge branch 'pico-doppleganger-cutscene' into rewrite/master 2024-09-09 11:45:57 -04:00
Cameron Taylor
7220fd7e95 assets submod 2024-09-09 11:45:37 -04:00
Cameron Taylor
c2ebd4ead6 Merge branch 'weekend1-alt-bg-tweaks' into rewrite/master 2024-09-09 11:44:49 -04:00
Cameron Taylor
5a4795eea2 assets submod 2024-09-09 11:44:27 -04:00
Cameron Taylor
e2d25b2721 Merge branch 'feature/pico-excellent-music' into rewrite/master 2024-09-09 11:43:27 -04:00
CheemsAndFriends
35af057f88 Fix scaleY not parsing 2024-09-09 17:41:25 +02:00
Cameron Taylor
d61357b80d hmm flxanimate bump 2024-09-09 11:40:17 -04:00
FabsTheFabs
b9b8490243 assets submod 2024-09-09 08:09:40 +01:00
FabsTheFabs
50d2a8fd9d assets submod 2024-09-09 08:06:11 +01:00