1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-12 08:25:13 +00:00
Commit graph

2779 commits

Author SHA1 Message Date
Cameron Taylor b9594ad812 asset submod 2024-02-28 00:07:52 -05:00
Cameron Taylor 5db3e006d6 asset submod 2024-02-27 23:48:29 -05:00
Cameron Taylor 00d75e7a3a Merge pull request #346 from FunkinCrew/gitmodules-link-update
renames urls in gitmodules to current updated names of the repos
2024-02-27 22:30:34 -05:00
Cameron Taylor 6da1dd57ad Update build-shit.yml 2024-02-27 22:27:50 -05:00
Cameron Taylor 5dafd54097 update submodules, and add change from other PR 2024-02-27 22:09:09 -05:00
Cameron Taylor b88d0b063b Merge pull request #347 from FunkinCrew/feature/blazin-cutscene
Blazin' Cutscene
2024-02-27 22:04:33 -05:00
Cameron Taylor ddeac1db15 deubbershish... 2024-02-27 22:02:04 -05:00
EliteMasterEric 12a48b9b86 Work in progress on revamped, more extensible pause menu. 2024-02-26 23:18:56 -05:00
EliteMasterEric d8fdf45dda Update assets submodule 2024-02-26 21:07:22 -05:00
EliteMasterEric 90360de0d0 Working Blazin cutscene and fixed time travel 2024-02-26 19:03:04 -05:00
Cameron Taylor 85cb20e23d renames urls in gitmodules to current updated names of the repos 2024-02-26 15:42:56 -05:00
EliteMasterEric 66c91d8b3e Sort the chart editor note kind dropdown. 2024-02-23 03:23:00 -05:00
EliteMasterEric 4168962fec Revert "Fix FunkinSound not resuming after focus"
This reverts commit d6b3e2a9cf.
2024-02-23 03:19:34 -05:00
EliteMasterEric fb9fd57210 Improve json parsing error handling. 2024-02-23 03:16:51 -05:00
EliteMasterEric eb4a21f2d5 Update assets submodule. 2024-02-23 03:16:41 -05:00
EliteMasterEric e349b0bb49 New pre-caching techniques should reduce stuttering on Weekend 1. 2024-02-23 00:16:11 -05:00
EliteMasterEric ddfb0c6a61 Working on more asset caching improvements. 2024-02-22 23:37:52 -05:00
EliteMasterEric 11bb69002b Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation 2024-02-22 21:01:07 -05:00
EliteMasterEric 50e208cf43 Update assets submodule. 2024-02-22 20:56:50 -05:00
EliteMasterEric 01ed1730f4 Fix some issues with cutscenes. 2024-02-22 20:56:41 -05:00
Eric d8b4d92d50 Merge pull request #340 from FunkinCrew/anim-editor-stuffs
fix for dropdowns appearing on FlxG.camera (rather than hudCam) on DebugBoundingState
2024-02-22 19:07:51 -05:00
Eric 905d47c005 Merge branch 'rewrite/master' into anim-editor-stuffs 2024-02-22 19:07:31 -05:00
EliteMasterEric c6e6772dcf Update assets submod 2024-02-22 19:07:15 -05:00
Cameron Taylor b6a21044ea Merge pull request #343 from FunkinCrew/feature/screenshot-sound
Add a screenshot sound provided by Isaac.
2024-02-22 19:05:28 -05:00
EliteMasterEric 572ecc8aa8 Merge remote-tracking branch 'origin/rewrite/master' into anim-editor-stuffs 2024-02-22 19:05:20 -05:00
Cameron Taylor e9dc03f8f1 Merge branch 'rewrite/master' into feature/screenshot-sound 2024-02-22 19:04:07 -05:00
Cameron Taylor 1f67bd23bf assets submod 2024-02-22 19:01:26 -05:00
EliteMasterEric 539b688055 Exploration in expanding FunkinSprite for optimization 2024-02-22 18:55:24 -05:00
Cameron Taylor 49159c749f Merge pull request #342 from FunkinCrew/feature/louder-audio
Update hitsound audio to be louder
2024-02-22 18:54:14 -05:00
Cameron Taylor 2574eaaef9 Merge branch 'rewrite/master' into feature/louder-audio 2024-02-22 18:53:27 -05:00
Cameron Taylor 17a7d6d958 Merge pull request #341 from FunkinCrew/feature/gc-logging
Add additional memory utilities and logging.
2024-02-22 18:52:40 -05:00
Cameron Taylor 201c81cfef changed keybind to ctrl+shift+L 2024-02-22 18:51:18 -05:00
EliteMasterEric 5b486e5634 Merge remote-tracking branch 'origin/bugfix/audio-focus' into feature/2hot-death-animation 2024-02-22 12:59:34 -05:00
EliteMasterEric 818e80ed74 Add a screenshot sound provided by Isaac. 2024-02-22 03:15:06 -05:00
EliteMasterEric 402a84831d Update assets submodule 2024-02-22 02:18:24 -05:00
EliteMasterEric 0b49a88cdd Move the crash keybind into a global plugin. 2024-02-22 01:47:35 -05:00
EliteMasterEric 744e2f95bd Add additional memory utilities and logging. 2024-02-22 00:06:02 -05:00
EliteMasterEric d95232dda0 Add .vs to gitignore 2024-02-22 00:05:56 -05:00
EliteMasterEric 907d9150c0 Add additional memory utilities and logging. 2024-02-21 17:10:18 -05:00
EliteMasterEric 36c0c61946 Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation 2024-02-20 18:44:51 -05:00
EliteMasterEric d888fb860d Remove support for >100% audio since it didn't actually boost the gain. 2024-02-20 13:37:53 -05:00
Cameron Taylor 2cfeb2c94d anim editor dropdown fix 2024-02-20 00:29:11 -05:00
Cameron Taylor ef6a5c033a assets submod 2024-02-19 23:48:14 -05:00
EliteMasterEric db428a3e36 Update assets submodule. 2024-02-19 23:09:23 -05:00
Cameron Taylor 758a8378e7 Merge pull request #339 from FunkinCrew/bugfix/darnell-stuck
Fix Darnell to not get stuck in his sing poses when the opponent is singing
2024-02-19 22:11:29 -05:00
EliteMasterEric ef39382fea Update assets submodule 2024-02-19 21:49:05 -05:00
Eric 7600b8264a Merge pull request #338 from FunkinCrew/leveltitle-positioning
tiny levelitems positioning
2024-02-19 21:43:09 -05:00
Cameron Taylor 85b3441a03 tiny levelitems positioning 2024-02-19 21:40:52 -05:00
Cameron Taylor 4b4cf7ea53 Merge pull request #336 from FunkinCrew/bugfix/misc-editor-fixes
Chart editor bugfixes
2024-02-19 21:25:57 -05:00
Cameron Taylor a50d3e817e Merge branch 'rewrite/master' into bugfix/misc-editor-fixes 2024-02-19 21:25:26 -05:00