From 3dd4f3e7e8f0f5e854896ebcad9a7b4e1b341787 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 26 Aug 2023 03:36:28 -0500 Subject: [PATCH] release v0.6pre9 also fix a bug in TL macro compat --- android/app/build.gradle | 4 ++-- android/app/src/main/AndroidManifest.xml | 4 ++-- papers/clipboard-format.md | 2 +- papers/format.md | 1 + res/Info.plist | 6 +++--- src/engine/engine.h | 6 +++--- src/engine/instrument.cpp | 16 +++++++--------- src/gui/tutorial.cpp | 8 +------- 8 files changed, 20 insertions(+), 27 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 5384d6d9..dcf7fe76 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -15,8 +15,8 @@ android { } minSdkVersion 21 targetSdkVersion 26 - versionCode 166 - versionName "0.6pre8" + versionCode 169 + versionName "0.6pre9" externalNativeBuild { cmake { arguments "-DANDROID_APP_PLATFORM=android-21", "-DANDROID_STL=c++_static", "-DWARNINGS_ARE_ERRORS=ON" diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a72f1b83..dd3c7a0b 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ diff --git a/papers/clipboard-format.md b/papers/clipboard-format.md index 1b274543..cb353546 100644 --- a/papers/clipboard-format.md +++ b/papers/clipboard-format.md @@ -6,7 +6,7 @@ when copying pattern data from Furnace, it's stored in the clipboard as plain te org.tildearrow.furnace - Pattern Data (144) ``` -this top line of text is always the same except for the number in parentheses, which is the internal build number. for example, 0.6pre8 is `166`. +this top line of text is always the same except for the number in parentheses, which is the internal build number. for example, 0.6pre9 is `169`. the second line is a number between 0 and 18 (decimal) which indicates which column the clip starts from. - `0`: note. diff --git a/papers/format.md b/papers/format.md index 267b7410..a09579bd 100644 --- a/papers/format.md +++ b/papers/format.md @@ -32,6 +32,7 @@ these fields are 0 in format versions prior to 100 (0.6pre1). the format versions are: +- 169: Furnace 0.6pre9 - 166: Furnace 0.6pre8 - 162: Furnace 0.6pre7 - 161: Furnace 0.6pre6 diff --git a/res/Info.plist b/res/Info.plist index bb3bab0e..a7e16ca7 100644 --- a/res/Info.plist +++ b/res/Info.plist @@ -15,17 +15,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 0.6pre8 + 0.6pre9 CFBundleName Furnace CFBundlePackageType APPL CFBundleShortVersionString - 0.6pre8 + 0.6pre9 CFBundleSignature ???? CFBundleVersion - 0.6pre8 + 0.6pre9 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/src/engine/engine.h b/src/engine/engine.h index 653ca8ce..7fb6b511 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -54,10 +54,10 @@ #define EXTERN_BUSY_BEGIN_SOFT e->softLocked=true; e->isBusy.lock(); #define EXTERN_BUSY_END e->isBusy.unlock(); e->softLocked=false; -#define DIV_UNSTABLE +//#define DIV_UNSTABLE -#define DIV_VERSION "dev168" -#define DIV_ENGINE_VERSION 168 +#define DIV_VERSION "0.6pre9" +#define DIV_ENGINE_VERSION 169 // for imports #define DIV_VERSION_MOD 0xff01 #define DIV_VERSION_FC 0xff02 diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp index 97b3bad8..842b88fc 100644 --- a/src/engine/instrument.cpp +++ b/src/engine/instrument.cpp @@ -2264,15 +2264,13 @@ void DivInstrument::readFeatureOx(SafeReader& reader, int op, short version) { // <167 TL macro compat if (macroCode==6 && version<167) { - for (int i=0; i<4; i++) { - if (target->open&6) { - for (int j=0; j<2; j++) { - target->val[j]^=0x7f; - } - } else { - for (int j=0; jlen; j++) { - target->val[j]^=0x7f; - } + if (target->open&6) { + for (int j=0; j<2; j++) { + target->val[j]^=0x7f; + } + } else { + for (int j=0; jlen; j++) { + target->val[j]^=0x7f; } } } diff --git a/src/gui/tutorial.cpp b/src/gui/tutorial.cpp index c1be8912..ea753205 100644 --- a/src/gui/tutorial.cpp +++ b/src/gui/tutorial.cpp @@ -255,12 +255,6 @@ void FurnaceGUI::drawTutorial() { ImGui::Text("welcome to Furnace, the biggest open-source chiptune tracker!"); - ImGui::TextWrapped( - "did I say that 0.6pre5 will have a tutorial? well, it doesn't...\n" - "the reason is because 0.6pre5 fixes a critical bug which may cause config loss in some machines.\n" - "furthermore, it dramatically improves the backup system. couldn't put this version on hold anymore." - ); - ImGui::Separator(); ImGui::TextWrapped("here are some tips to get you started:"); @@ -280,7 +274,7 @@ void FurnaceGUI::drawTutorial() { ImGui::TextWrapped( "if you need help, you may:\n" "- read the (incomplete) manual: https://github.com/tildearrow/furnace/blob/master/doc/README.md\n" - "- ask for help in Discussions (https://github.com/tildearrow/furnace/discussions) or the Furnace Discord (https://discord.gg/EfrwT2wq7z)" + "- ask for help in Discussions (https://github.com/tildearrow/furnace/discussions), the Furnace Discord (https://discord.gg/EfrwT2wq7z) or Furnace in Revolt (https://rvlt.gg/GRPS6tmc)" ); ImGui::Separator();