1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-04 22:04:29 +00:00
Commit graph

3088 commits

Author SHA1 Message Date
Cameron Taylor ed0cfc36fb Merge pull request #504 from FunkinCrew/bugfix/monday-fixes
Bugfix/monday fixes
2024-04-23 04:08:23 -04:00
Cameron Taylor 46f2dec672 assets submod 2024-04-23 04:08:00 -04:00
EliteMasterEric 1e5153f133 Fix an issue where zooming in the camera would persist to results screen 2024-04-22 23:04:57 -04:00
EliteMasterEric 6edd9e8c6a Make cars stop moving while the game is paused. 2024-04-22 22:30:29 -04:00
EliteMasterEric 66b45b526f Fix issue where controller couldn't switch difficulties in Story Menu 2024-04-22 21:24:44 -04:00
EliteMasterEric b23ea58561 Fix Weekend 1 audio issue 2024-04-22 21:24:15 -04:00
Cameron Taylor ab336f07af Merge pull request #502 from FunkinCrew/bugfix/rayman
Fix a bug where Darnell's arms would be invisible on HTML5
2024-04-21 17:25:47 -04:00
EliteMasterEric d760a0d209 Add Ctrl-Alt-Shift-W as a debug hotkey to unlock all Darnell songs in Freeplay 2024-04-21 17:23:48 -04:00
EliteMasterEric 5f26eaacd3 Fix issue where some FlxAnimate symbols wouldn't render on HTML5 2024-04-21 17:23:27 -04:00
Cameron Taylor 5063e747a1 Merge pull request #501 from FunkinCrew/bugfix/credits-ng-logo
Fix the animated NG logo overlapping the text in the credits
2024-04-21 17:20:55 -04:00
EliteMasterEric 4671a9172c Fix the NG logo overlapping the text 2024-04-20 23:48:27 -04:00
Cameron Taylor ba240c45a4 Merge pull request #352 from FunkinCrew/a-bot-bars
A-Bot bars phase 1
2024-04-19 15:11:56 -04:00
Cameron Taylor 678dbc0ab7 Merge branch 'rewrite/master' into a-bot-bars 2024-04-19 15:11:28 -04:00
Cameron Taylor 7826c79871 assets update for submodule 2024-04-19 15:11:20 -04:00
Cameron Taylor 57df7db5f1 add small #if web define 2024-04-19 15:10:43 -04:00
Cameron Taylor e87830c117 Merge pull request #498 from FunkinCrew/polish/popup-combo-fixes-rebased
Polish/popup combo fixes rebased
2024-04-19 15:01:59 -04:00
Cameron Taylor 9500722a72 Merge branch 'rewrite/master' into polish/popup-combo-fixes-rebased 2024-04-19 15:00:37 -04:00
Cameron Taylor 49a81189c4 use funkinaction in controls.hx 2024-04-19 15:00:12 -04:00
Cameron Taylor b3869f6504 assets update for submodule 2024-04-19 14:16:57 -04:00
FabsTheFabs 351cb8cbaa popupstuff changes + make combopopup able to be edited outside of playstate 2024-04-19 14:14:33 -04:00
FabsTheFabs 3fa60cd228 update assets submodule 2024-04-19 14:14:29 -04:00
Cameron Taylor a0c061e93b Merge pull request #489 from FunkinCrew/bugfix/blazin-death-confirm
Blazin' Death confirm fix
2024-04-19 14:06:19 -04:00
Cameron Taylor 5d8c28ca2b Merge branch 'rewrite/master' into bugfix/blazin-death-confirm 2024-04-19 14:05:52 -04:00
Cameron Taylor 30d052f6ee assets update for submodule 2024-04-19 14:05:38 -04:00
Cameron Taylor f8240e926e Merge pull request #481 from FunkinCrew/bugfix/draw-crash
Fix crash caused when game tries to render disposed sprites during a Sticker transition.
2024-04-19 14:04:20 -04:00
Cameron Taylor 035db7f00a Merge branch 'rewrite/master' into bugfix/draw-crash 2024-04-19 14:03:58 -04:00
Cameron Taylor 9af0ebd240 assets update for submodule 2024-04-19 14:02:14 -04:00
Cameron Taylor 9c8f6ba600 Merge branch 'bugfix/weekend-1-bug-fixes' into rewrite/master 2024-04-19 14:01:37 -04:00
Cameron Taylor f385379935 assets update for submodule 2024-04-19 14:01:19 -04:00
Cameron Taylor cbba7bade3 Merge pull request #270 from FunkinCrew/feature/chart-editor-gamepad-support
Chart Editor: Gamepad support
2024-04-19 13:59:08 -04:00
Cameron Taylor 366bebc94c assets submod 2024-04-19 13:58:35 -04:00
Cameron Taylor 22e411d43f Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-04-19 13:57:42 -04:00
Cameron Taylor cdc0c18531 Merge pull request #475 from FunkinCrew/bugfix/weekend-1-bug-fixes
Bugfix/weekend 1 bug fixes
2024-04-19 13:55:34 -04:00
Cameron Taylor 93ae7692c8 Merge branch 'rewrite/master' into bugfix/weekend-1-bug-fixes 2024-04-19 13:55:01 -04:00
Cameron Taylor 9a284c34e9 assets update for submodule 2024-04-19 13:45:36 -04:00
Cameron Taylor bb7b863272 Fix an issue where changing focus would pause some sounds but not others (#491)
Repro: Start a song then switch to another window. Instrumental and opponent pause but player doesn't.
2024-04-17 20:08:26 -04:00
Cameron Taylor fd2356aed4 Fix a crash in the Results state. also nudge GF over to the spot shes in in the FLA (#490) 2024-04-17 20:07:47 -04:00
Cameron Taylor 0f858708c9 Properly fix the menu background to use the correct line colors. (#493) 2024-04-17 20:06:42 -04:00
EliteMasterEric b982484856 Properly fix the menu background to use the correct line colors. 2024-04-16 20:19:20 -04:00
Cameron Taylor 1405e21e3d Merge branch 'rewrite/master' into a-bot-bars 2024-04-16 20:02:08 -04:00
EliteMasterEric 80a558ac08 Fix an issue where changing focus would pause some sounds but not others. 2024-04-16 19:57:19 -04:00
EliteMasterEric d346c9387c Fix a crash in the Results state. also nudge GF over to the spot she's in in the FLA 2024-04-16 19:42:52 -04:00
EliteMasterEric bc0a27c985 Fix references to missing graphics in Freeplay 2024-04-16 18:43:11 -04:00
EliteMasterEric 2210f8bc18 Made Blazin' death a separate asset to fix blend modes. 2024-04-16 18:42:43 -04:00
Cameron Taylor dd64091a99 Merge pull request #483 from FunkinCrew/bugfix/remove-kickstarter-backers
Remove Kickstarter link from credits.
2024-04-16 13:33:38 -04:00
Cameron Taylor 2d5153cdbf Merge branch 'rewrite/master' into bugfix/remove-kickstarter-backers 2024-04-16 13:33:02 -04:00
Cameron Taylor fab6412bc6 Merge pull request #486 from FunkinCrew/bugfix/main-menu-color
Fix the saturation on the main menu background.
2024-04-16 13:25:46 -04:00
Cameron Taylor b9a57b845e Merge pull request #487 from FunkinCrew/bugfix/lingering-hold-cover
Ensure playNoteHoldCover doesn't call if note is judged as 'miss'
2024-04-16 13:25:12 -04:00
Cameron Taylor e6dc795d2a Merge branch 'rewrite/master' into bugfix/lingering-hold-cover 2024-04-16 13:25:00 -04:00
Eric b553dbd517 Remove janky animation on Freeplay menu. (#488) 2024-04-16 13:24:41 -04:00