From b8fbb26440242c32b4e62a3b93a02378fa4b77ee Mon Sep 17 00:00:00 2001 From: Lily Date: Fri, 21 Jun 2024 02:17:15 +0300 Subject: [PATCH 1/5] zack I'll murder you --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0cce55b78e..de4000ac3e 100644 --- a/README.md +++ b/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 From 09d048e60b6c09e0ce96d85cbb37852a49da0866 Mon Sep 17 00:00:00 2001 From: zacksgamerz <81515012+zacksgamerz@users.noreply.github.com> Date: Fri, 21 Jun 2024 17:55:05 +0700 Subject: [PATCH 2/5] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71385728b7..1f16bd161a 100644 --- a/CHANGELOG.md +++ b/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 From 2964a6ec4af5c4f51a5ccf1484b0df40df89c88c Mon Sep 17 00:00:00 2001 From: Karim Akra <144803230+KarimAkra@users.noreply.github.com> Date: Fri, 21 Jun 2024 14:52:20 +0300 Subject: [PATCH 3/5] Update hmm.json --- hmm.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hmm.json b/hmm.json index e72854b0bb..aacc7737c6 100644 --- a/hmm.json +++ b/hmm.json @@ -45,7 +45,7 @@ "type": "git", "dir": null, "ref": "main", - "url": "https://github.com/FunkinDroidTeam/FlxPartialSound.git" + "url": "https://github.com/FunkinCrew/FlxPartialSound.git" }, { "name": "format", @@ -174,7 +174,7 @@ "name": "polymod", "type": "git", "dir": null, - "ref": "bfbe30d81601b3543d80dce580108ad6b7e182c7", + "ref": "05d1516e5d84f55317a92ba6d1e66eaaf2cfa6a5", "url": "https://github.com/larsiusprime/polymod" }, { From 052e3c4ab3d6ace81f535976955fbd2b5e82193a Mon Sep 17 00:00:00 2001 From: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com> Date: Fri, 21 Jun 2024 15:16:50 +0300 Subject: [PATCH 4/5] Fix dialogue pause button. --- source/funkin/play/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index 3f1ec72624..7a3af8f538 100644 --- a/source/funkin/play/PlayState.hx +++ b/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(); } From 7db44d2a050ea0fa7a6416f568d51744e6012d9b Mon Sep 17 00:00:00 2001 From: Lily Date: Fri, 21 Jun 2024 16:44:25 +0300 Subject: [PATCH 5/5] eric failed --- hmm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hmm.json b/hmm.json index aacc7737c6..10320b27f7 100644 --- a/hmm.json +++ b/hmm.json @@ -45,7 +45,7 @@ "type": "git", "dir": null, "ref": "main", - "url": "https://github.com/FunkinCrew/FlxPartialSound.git" + "url": "https://github.com/FunkinDroidTeam/FlxPartialSound.git" }, { "name": "format",