cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-17 15:38:52 +00:00
Code Issues Releases Wiki Activity
2792 commits 11 branches 17 tags 2.9 GiB
Commit graph

2792 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenny Crowe ef2cb4d9fc Convert zoom modifiers from additive to multiplicative 2024-03-28 11:05:38 -07: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 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
EliteMasterEric 709fbc8594 Fix a bug where lag could cause the opponent to miss. 2024-03-23 18:11:06 -04:00
EliteMasterEric ecea5e89e2 Update assets submodule 2024-03-23 17:51:19 -04:00
EliteMasterEric 6407770ed6 Rework every class to use FunkinSound. 2024-03-23 17:50:48 -04:00
EliteMasterEric 8bbb528a9e Update assets submodule 2024-03-23 13:44:27 -04:00
Eric f3e9a4f32a Merge pull request #410 from FunkinCrew/funkin-crew-presents 
the funkin crew presents
 2024-03-23 00:02:09 -04:00
Eric 8e8ec2c5aa Merge branch 'rewrite/master' into funkin-crew-presents 2024-03-22 23:55:05 -04:00
EliteMasterEric e4a9d25ac0 Syntax fix 2024-03-22 23:53:29 -04:00
EliteMasterEric 471b015d1a Add some FlxSignals and showVideo/hideVideo 2024-03-22 23:46:03 -04:00
Cameron Taylor 932f7bce41 Merge pull request #408 from FunkinCrew/bugfix/camera-behavior-fixes 
Make the ZoomCamera events use sensible defaults.
 2024-03-22 23:38:26 -04:00
Cameron Taylor 01e83d4713 the funkin crew presents 2024-03-22 20:21:09 -07:00
EliteMasterEric 28088146eb Fix bug where Pico dadbattle was playing over normal dadbattle 2024-03-22 22:17:34 -04:00
Cameron Taylor 5a10152efb Merge pull request #397 from FunkinCrew/formatting-fixes 
Formatting cleanup in assets folder and source folder
 2024-03-22 22:01:05 -04:00
Cameron Taylor a695fb2b39 Merge branch 'rewrite/master' into formatting-fixes 2024-03-22 19:00:29 -07:00
EliteMasterEric 83e8865a24 Make the ZoomCamera events use sensible defaults. 2024-03-22 20:29:35 -04:00
Cameron Taylor a42524987e Merge pull request #400 from FunkinCrew/bugfix/minimal-mode-gameover 
Fix several crashes when reaching a game over in minimal mode
 2024-03-22 18:03:46 -04:00
Cameron Taylor 7d008e7247 playstate camera fixie 2024-03-22 15:03:17 -07:00
Cameron Taylor 9d7831d40b Merge branch 'rewrite/master' into bugfix/minimal-mode-gameover 2024-03-22 14:56:41 -07:00
Cameron Taylor 08bac461ee Merge pull request #406 from FunkinCrew/bugfix/polymod-null-vars 
Update polymod to fix several script-related crashes
 2024-03-22 17:52:56 -04:00