1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-05 06:14:36 +00:00
Commit graph

3082 commits

Author SHA1 Message Date
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
EliteMasterEric c9f4a0a86d Update polymod to fix several script-related crashes 2024-03-22 15:29:58 -04:00
Cameron Taylor e6939d8104 Merge pull request #404 from FunkinCrew/bugfix/audio-offsets
Update 7 songs to use inst/vocals with fixed offsets, created by Saru
2024-03-22 03:14:13 -04:00
Cameron Taylor 82258cfa1d Merge branch 'rewrite/master' into bugfix/audio-offsets 2024-03-22 00:13:11 -07:00
Cameron Taylor 40d13619d3 assets submod 2024-03-22 00:12:50 -07:00
EliteMasterEric eb5f853e2c Update assets submodule 2024-03-22 03:05:18 -04:00
EliteMasterEric c765249030 Complain if the main metadata file specifies a variation (like erect) but the game can't find it. 2024-03-22 03:04:52 -04:00
EliteMasterEric aea9213eea Make sure the BPM label gets updated properly 2024-03-22 03:04:33 -04:00
EliteMasterEric 2b477c9bd1 Make Conductor a lazy instance 2024-03-22 02:47:56 -04:00
EliteMasterEric 4524b66170 Only show easy/normal/hard in story mode for now 2024-03-22 02:47:43 -04:00
EliteMasterEric d50ff73d3c Registries now get added to the Flixel console (and get lazy instantiated so they don't start before the game does) 2024-03-22 02:47:21 -04:00
Cameron Taylor 11426e5177 Merge pull request #402 from FunkinCrew/feature/freeplay-album-art
Custom album art for freeplay
2024-03-22 02:37:34 -04:00
Cameron Taylor f7acee94cd Merge branch 'rewrite/master' into feature/freeplay-album-art 2024-03-21 23:37:20 -07:00
Cameron Taylor 5b5eb6f109 assets submod 2024-03-21 23:35:49 -07:00
Cameron Taylor 80c938af4f fix for the album roll to come in only once bf hand hits 2024-03-21 23:34:03 -07:00
Cameron Taylor 433d4968da change to elasticOut 2024-03-21 23:32:07 -07:00
Cameron Taylor 668f5decb2 Merge pull request #393 from FunkinCrew/feature/milf-cleanup
Remove the classic MILF script
2024-03-22 01:50:31 -04:00
Cameron Taylor 74dc377b5d asset submod 2024-03-21 22:49:18 -07:00
Eric 75bc63e1d0 Merge pull request #391 from FunkinCrew/title-music-vol-fix
title screen volume fix
2024-03-22 01:32:02 -04:00
Eric fe2e272abb Merge branch 'rewrite/master' into title-music-vol-fix 2024-03-22 00:17:03 -04:00
Eric d481830323 Merge pull request #396 from FunkinCrew/feature/focusCameraTweening
Camera easing upgrades
2024-03-22 00:07:57 -04:00
EliteMasterEric 2b91c0f926 Merge remote-tracking branch 'origin/rewrite/master' into feature/focusCameraTweening 2024-03-22 00:06:55 -04:00
EliteMasterEric 5e0de6d1ce Fix some issues with events unintentionally sharing data after being edited via the toolbox. 2024-03-21 23:57:26 -04:00
Eric 662688023a Merge branch 'rewrite/master' into title-music-vol-fix 2024-03-21 22:57:18 -04:00
Eric 96849a7ada Merge pull request #382 from FunkinCrew/tiny-checkstyle-fix
fixes capitalization in checkstyle settings
2024-03-21 22:56:12 -04:00
EliteMasterEric efa0e103b0 Merge remote-tracking branch 'origin/rewrite/master' into a-bot-bars 2024-03-21 21:54:22 -04:00
Cameron Taylor c8dace8c1c Merge pull request #401 from FunkinCrew/feature/weekend-1-audio-remaster
Update 2hot, Lit Up, and Blazin to polished audio
2024-03-21 21:53:13 -04:00
Cameron Taylor ad3006b17e Merge branch 'rewrite/master' into feature/weekend-1-audio-remaster 2024-03-21 18:52:50 -07:00
Cameron Taylor d96ea5e895 submod update 2024-03-21 18:51:18 -07:00
Eric 72d7c1273d Merge pull request #392 from FunkinCrew/soundtray
funkin soundtray
2024-03-21 21:49:27 -04:00
EliteMasterEric 2069bf1d89 Merge remote-tracking branch 'origin/rewrite/master' into soundtray 2024-03-21 21:49:04 -04:00
Cameron Taylor 407df10929 Merge pull request #403 from FunkinCrew/bugfix/pause-menu-stress-diff
Fix an issue where hidden difficulties could end up in the difficulty list.
2024-03-21 21:48:15 -04:00
EliteMasterEric 038a92c314 Update assets submodule 2024-03-21 20:04:10 -04:00
EliteMasterEric 105aca4707 Fix an issue where hidden difficulties could end up in the difficulty list. 2024-03-21 19:44:02 -04:00
EliteMasterEric 9db9f44924 Update assets submodule 2024-03-21 00:38:59 -04:00
EliteMasterEric 1f81e92827 Scrapped the weird FlxAltasSprite stuff and just used a tween. Also fixed some bugs with story menu 2024-03-21 00:38:52 -04:00
EliteMasterEric 3975d34b70 Fix scoring lerp issue on story menu. 2024-03-20 23:06:32 -04:00
Cameron Taylor 70975cdb59 Merge pull request #398 from FunkinCrew/bugfix/html5-script-fixes
HTML5 script fixes
2024-03-20 18:40:56 -04:00
Cameron Taylor a93aa6c68d submod update 2024-03-20 15:40:33 -07:00
Cameron Taylor 99cb7263ca Merge pull request #399 from FunkinCrew/bugfix/html5-video-pausing
Rework HTML5 video cutscenes to properly support the pause menu and volume controls.
2024-03-20 18:33:25 -04:00