Commit graph

4387 commits

Author SHA1 Message Date
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
FabsTheFabs
f8a2709482 assets submod 2024-09-09 08:03:06 +01:00
CheemsAndFriends
6961e6cc63 Add a buncho Gizmos 2024-09-09 08:23:46 +02:00
EliteMasterEric
4f1423870c Update assets submodule 2024-09-08 14:44:22 -04:00
Cameron Taylor
51e5eb929c add hxjsonast to hmm.json to fix builds? 2024-09-08 11:22:24 -04:00
Cameron Taylor
fbcf553bd9 Merge branch 'rewrite/master' into week5-alt-bg 2024-09-06 20:23:21 -04:00
CheemsAndFriends
f3722e5da2 Add hmm flxanimate, new conditional for Cheems' PC sake and more wip char select animation 2024-09-07 02:07:00 +02:00
FabsTheFabs
40b5ad7c2a assets submod 2024-09-07 00:54:21 +01:00
FabsTheFabs
e0a4818e5a registry updates 2024-09-07 00:52:38 +01:00
Cameron Taylor
b1e68c27fd Merge branch 'rewrite/master' into feature/pico-results-perfect 2024-09-06 19:46:39 -04:00
Cameron Taylor
a623ec77f7 Merge branch 'feature/char-unlock-notif' into rewrite/master 2024-09-06 19:44:58 -04:00
Cameron Taylor
89e1cb8258 small null fix for if we're not playing music 2024-09-06 19:44:33 -04:00
Cameron Taylor
55c5e01bd5 Merge branch 'camera-helpies' into rewrite/master 2024-09-06 19:12:59 -04:00
Cameron Taylor
4f666e4855 creds merge 2024-09-06 19:12:36 -04:00
Cameron Taylor
e185eef7ea Merge branch 'feature/album-titles-and-results-themes' into rewrite/master 2024-09-06 19:11:50 -04:00
Cameron Taylor
c45fa93786 update lime (ndlls) 2024-09-06 16:46:11 -04:00
CheemsAndFriends
a901677853 Merge branch 'feature/char-unlock' of https://github.com/FunkinCrew/Funkin-secret into feature/char-unlock 2024-09-06 06:33:01 +02:00
CheemsAndFriends
a61f40571d add wip bizz 2024-09-06 06:28:08 +02:00
EliteMasterEric
313dba6985 Update assets submodule 2024-09-06 00:24:07 -04:00
CheemsAndFriends
1021f5c2ee wip sequence 2024-09-05 22:44:05 -04:00
CheemsAndFriends
4cad56705a Add lock bizz 2024-09-05 22:40:27 -04:00
CheemsAndFriends
677357ba37 wip sequence 2024-09-06 02:55:47 +02:00