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

2553 commits

Author SHA1 Message Date
EliteMasterEric 73cf6b9fd2 Rewrite save data to fix scripted story levels. Add a "pre-transition death delay" 2024-03-04 16:37:42 -05:00
EliteMasterEric c36ea962dc Update assets submodule 2024-03-03 01:40:58 -05:00
EliteMasterEric 761a3d53df Taunt improvements. 2024-03-02 23:23:52 -05:00
EliteMasterEric f7a3d43e54 Fixes to animation looping and holds 2024-03-02 22:46:13 -05:00
EliteMasterEric 0294ea0b79 Implemented FlxAnimate characters into Blazin'. 2024-03-01 08:13:06 -05:00
EliteMasterEric 684eb919b5 Make the playback rate option explicit so it doesn't break in the future. 2024-02-29 18:49:20 -05:00
Cameron Taylor d9dbb5791c Merge pull request #348 from FunkinCrew/feature/new-pause-menu
Revamped Pause Menu and Cutscene Pausing
2024-02-29 13:54:13 -05:00
Cameron Taylor e36629a41f Merge branch 'rewrite/master' into feature/new-pause-menu 2024-02-29 13:53:55 -05:00
Cameron Taylor 88f57cf520 pause menu tween polish 2024-02-29 13:53:09 -05:00
Cameron Taylor aab050d757 trolled use FunkinCrew for hxcodec in hmm.json 2024-02-29 13:44:53 -05:00
EliteMasterEric bad84b1a50 Merge branch 'feature/new-pause-menu' of https://github.com/FunkinCrew/Funkin-secret into feature/new-pause-menu 2024-02-29 02:50:10 -05:00
EliteMasterEric 0193c1ddea Update hxCodec to add autoFocus 2024-02-29 02:50:04 -05:00
Cameron Taylor 2e012d54a4 assets submod 2024-02-29 02:26:29 -05:00
Cameron Taylor 45e256ebbb Merge pull request #350 from FunkinCrew/feature/blazin-animation-work
Several chart editor fixes
2024-02-29 02:24:59 -05:00
EliteMasterEric 1102c483fd Update assets submodule. 2024-02-29 01:19:51 -05:00
EliteMasterEric 0139d5c4f6 Fix a crash on atlas characters. 2024-02-29 01:19:32 -05:00
EliteMasterEric 1d70ff95f9 Several chart editor fixes (more precise playback speed, live input mode loads properly from save) 2024-02-28 21:19:21 -05:00
EliteMasterEric 2252040241 Fix custom pause music in Week 6, improve documentation 2024-02-28 14:51:39 -05:00
EliteMasterEric 8683900922 Fixes to cutscene pausing. 2024-02-28 03:53:36 -05:00
EliteMasterEric 5d030b8a31 Merge remote-tracking branch 'origin/rewrite/master' into feature/new-pause-menu 2024-02-28 03:04:56 -05:00
EliteMasterEric cecddbc2ee Fixed issues with audio in Week 6 after skipping the cutscene. 2024-02-28 03:01:20 -05:00
Eric b1f092d87f Merge pull request #349 from FunkinCrew/gameover-fixies
script fixes for gameover related trolls
2024-02-28 00:21:08 -05:00
EliteMasterEric 4da3729058 Update assets submodule 2024-02-28 00:20:06 -05:00
EliteMasterEric 13d6ba378e Work in progress on fixing Week 6 2024-02-28 00:19:08 -05:00
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