Merge branch 'develop' of https://github.com/FunkinDroidTeam/Funkin i…

…nto develop

CHANGELOG.md

@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * FlxPartialSound are now working on iOS Platforms due to openfl’s getBytes
 * FlxPartialSound are now working on Android Platforms due to it using sys libraries.
 * Plugging in a keyboard while inside the app doesn’t crash it now.
+* Armv7 builds on android do not crash now.
 
 ## \[0.4.1\] - 2024-06-12
 

README.md

@@ -44,7 +44,7 @@ Full credits can be found in-game, or wherever the credits.json file is.
 * [Karim-Akra](https://x.com/KarimAkra_0) - Mobile Programming (Android)
 * [Sector_5](https://github.com/sector-a) - Mobile Programming (Android)
 * [Luckydog7](https://github.com/luckydog7) - Mobile Programming (Android)
-* [mca.gabe9](https://github.com/mcagabe19) - Mobile Programming (iOS)
+* [Lily](https://github.com/mcagabe19) - Mobile Programming (iOS)
 * Our contributors on GitHub
 
 ## Art / Animation / UI

hmm.json

@@ -174,7 +174,7 @@
       "name": "polymod",
       "type": "git",
       "dir": null,
-      "ref": "bfbe30d81601b3543d80dce580108ad6b7e182c7",
+      "ref": "05d1516e5d84f55317a92ba6d1e66eaaf2cfa6a5",
       "url": "https://github.com/larsiusprime/polymod"
     },
     {

source/funkin/play/PlayState.hx

@@ -2810,7 +2810,7 @@ class PlayState extends MusicBeatSubState
     if (currentConversation != null)
     {
       // Pause/unpause may conflict with advancing the conversation!
-      if ((controls.CUTSCENE_ADVANCE || TouchUtil.justPressed) && !justUnpaused)
+      if ((controls.CUTSCENE_ADVANCE #if mobile || (!pauseButtonCheck && TouchUtil.justPressed) #end) && !justUnpaused)
       {
         currentConversation.advanceConversation();
       }