Commit graph

2965 commits

Author SHA1 Message Date
Cameron Taylor
31827f30b1 Merge pull request #425 from FunkinCrew/feature/more-new-charts
Update several charts (Lit Up, 2hot, High Erect, South Erect)
2024-03-27 01:10:17 -04:00
Cameron Taylor
cccfdd0638 Merge branch 'rewrite/master' into feature/more-new-charts 2024-03-27 01:09:45 -04:00
Cameron Taylor
75b8336dce assets submod 2024-03-27 01:09:24 -04:00
Cameron Taylor
14c10448d2 Merge pull request #427 from FunkinCrew/bugfix/song-delay+volume-fixes
fixed song delay and made volume consistent across all tracks
2024-03-27 01:08:33 -04:00
Cameron Taylor
ce53e46510 Merge branch 'rewrite/master' into bugfix/song-delay+volume-fixes 2024-03-27 01:08:04 -04:00
Cameron Taylor
b3076c7ec4 assets submod 2024-03-27 01:07:37 -04:00
Cameron Taylor
030be3a24b Merge pull request #429 from FunkinCrew/bugfix/story-mode-scroll-sound
Readd scroll sounds to Story Menu
2024-03-27 01:06:35 -04:00
Cameron Taylor
982616e2ba assets submod 2024-03-27 01:05:53 -04:00
EliteMasterEric
4209c5156e Readd a missing sound in the story menu 2024-03-27 01:02:11 -04:00
FabsTheFabs
5ec3546bbc fixed song delay and made volume consistent across all tracks 2024-03-27 04:31:03 +00:00
EliteMasterEric
6b35898ed9 Fix some issues with Weekend 1. 2024-03-26 23:24:59 -04:00
EliteMasterEric
d373e1bfed Implement a bunch of updated charts. 2024-03-26 21:30:25 -04:00
EliteMasterEric
0e93f2ab27 Improve error logging when the game can't find a chart file. 2024-03-26 21:30:08 -04:00
EliteMasterEric
291a9f630d Update assets submodule 2024-03-26 19:39:02 -04:00
EliteMasterEric
9ebb253b53 Fix music updating issue. 2024-03-26 19:38:56 -04:00
EliteMasterEric
e84fdf9fac Resolve FlxG.sound.music crash 2024-03-26 19:38:42 -04:00
Eric
88c973f1ae Merge branch 'rewrite/master' into bugfix/freeplay-afk-fixes 2024-03-26 19:35:10 -04:00
EliteMasterEric
1e888658f7 First implementation of credits state. 2024-03-26 12:33:54 -04:00
Cameron Taylor
99ea7bbe84 Merge pull request #422 from FunkinCrew/bugfix/blazin-crashes
Fix crashes tied to Blazin' character animations not parsing
2024-03-26 01:31:19 -04:00
Cameron Taylor
524ae119fa Merge branch 'rewrite/master' into bugfix/blazin-crashes 2024-03-26 01:30:59 -04:00
Cameron Taylor
6d4c2e804f assets submod 2024-03-26 01:30:48 -04:00
Cameron Taylor
593b9f30d2 Merge pull request #420 from FunkinCrew/bugfix/some-mac-fixins
MacOS fixins
2024-03-26 01:30:00 -04:00
Cameron Taylor
e9121ac64d Merge pull request #421 from FunkinCrew/bugfix/funkin-sound-overhaul-2
Funkin Sound Overhaul 2: Electric Boogaloo
2024-03-26 01:29:35 -04:00
Cameron Taylor
1cfbcb964c Merge branch 'rewrite/master' into bugfix/funkin-sound-overhaul-2 2024-03-26 01:29:11 -04:00
Cameron Taylor
364652a22f assets submod 2024-03-26 01:28:58 -04:00
EliteMasterEric
8943cd117e Make the error message a bit better if an Animate atlas fails to parse. 2024-03-26 01:12:46 -04:00
EliteMasterEric
32b21e21b2 Update assets submodule 2024-03-26 01:12:22 -04:00
EliteMasterEric
368b82846e Update assets submodule 2024-03-25 21:15:20 -04:00
EliteMasterEric
5ae075e947 Fix a couple Flixel warnings on the results screen. 2024-03-25 21:09:14 -04:00
EliteMasterEric
90f861628d Fix an HTML5 build issue. 2024-03-25 21:09:02 -04:00
EliteMasterEric
f4617cbbda Add mac builds with proper arguments 2024-03-25 21:08:53 -04:00
EliteMasterEric
07ad250060 Fix an audio crash when exiting a cutscene 2024-03-25 21:08:39 -04:00
Cameron Taylor
0409c0ba6a Merge pull request #405 from FunkinCrew/feature/high-erect
Implement High Erect draft, plus some bug fixes
2024-03-25 16:02:46 -04:00
Cameron Taylor
ccfb9ca65b Merge branch 'rewrite/master' into feature/high-erect 2024-03-25 16:02:09 -04:00
Cameron Taylor
a66b746e43 assets submod 2024-03-25 16:01:38 -04:00
Cameron Taylor
fe6cb8c5a9 Merge pull request #413 from FunkinCrew/bugfix/funkin-sound-overhaul
Funkin Sound overhaul
2024-03-25 15:59:02 -04:00
Cameron Taylor
6a5026b714 assets submod 2024-03-25 15:06:47 -04:00
Cameron Taylor
6a0672684c Merge pull request #416 from FunkinCrew/bugfix/camera-zoom-option
Fix a bug where the Camera Zoom toggle didn't work.
2024-03-25 14:52:24 -04:00
Cameron Taylor
01ff4acc1a Merge pull request #409 from FunkinCrew/bugfix/cut-pico-dadbattle
Fix bug where Pico dadbattle was playing over normal dadbattle
2024-03-25 13:43:05 -04:00
Cameron Taylor
9fd780e00c Merge branch 'rewrite/master' into bugfix/cut-pico-dadbattle 2024-03-25 13:42:50 -04:00
Cameron Taylor
275a58e633 assets submod 2024-03-25 13:42:35 -04:00
Cameron Taylor
c456430910 Merge pull request #414 from FunkinCrew/bugfix/opponent-mute-on-miss
Fix a bug where lag could cause the opponent to miss which would mute the vocals.
2024-03-25 13:37:12 -04:00
Cameron Taylor
3c9f63892b Merge pull request #411 from FunkinCrew/feature/video-cutscene-hide
Hide a video cutscene after playing it
2024-03-25 13:37:00 -04:00
Hazel
2b1fc1e7d7 bugfix: html5 builds (#418) 2024-03-25 16:12:37 +01:00
EliteMasterEric
51d36ea25e Work in progress on fixing Boyfriend's spook/tv animations 2024-03-24 04:53:05 -04:00
EliteMasterEric
138dfd61e8 Fix a bug where the Camera Zoom toggle didn't work. 2024-03-23 23:52:08 -04:00
EliteMasterEric
24b03e4f6b Replace calls to FlxG.sound.playMusic with ones that set the BPM. 2024-03-23 23:38:07 -04:00
fabs
6d84f92860 Merge pull request #415 from FunkinCrew/bugfix/album-missing
Fix a bug where the album disappears never to return
2024-03-24 02:18:43 +00:00
fabs
b494c9438a Merge pull request #412 from FunkinCrew/bugfix/gf-zoom-pink
Fix pink background visible in Week 6 and Week 7
2024-03-24 02:18:24 +00:00
EliteMasterEric
a8486a47df Fix a bug where the album disappears never to return 2024-03-23 18:22:15 -04:00