diff --git a/CMakeLists.txt b/CMakeLists.txt index c3bf5b826c..2490246a32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_PROJECT_VERSION_MAJOR 0) set(CMAKE_PROJECT_VERSION_MINOR 6) -set(CMAKE_PROJECT_VERSION_PATCH 0) +set(CMAKE_PROJECT_VERSION_PATCH 1) set(BUILD_GUI_DEFAULT ON) set(USE_SDL2_DEFAULT ON) diff --git a/README.md b/README.md index 5abdc8127b..3bf73dc142 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ for other operating systems, you may [build the source](#developer-info). - YM3812 (OPL2) - YMF262 (OPL3) with full 4-op support! - Y8950 (OPL with ADPCM) + - ESS ESFM (like OPL3 but with more features) - square wave chips: - AY-3-8910/YM2149(F) used in several computers and game consoles - Commodore VIC used in the VIC-20 @@ -86,6 +87,7 @@ for other operating systems, you may [build the source](#developer-info). - modern/fantasy: - Commander X16 VERA - tildearrow Sound Unit + - PowerNoise - Generic PCM DAC - mix and match sound chips! - over 200 ready to use presets from computers, game consoles and arcade boards... diff --git a/android/app/build.gradle b/android/app/build.gradle index 1b09780c50..6fed5ed8e3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -15,8 +15,8 @@ android { } minSdkVersion 21 targetSdkVersion 26 - versionCode 181 - versionName "0.6" + versionCode 192 + versionName "0.6.1" 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 a8b2007b1d..0c430ea6b4 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ diff --git a/demos/specs2/back_into_adventure.fur b/demos/specs2/back_into_adventure.fur new file mode 100644 index 0000000000..865a97e6b9 Binary files /dev/null and b/demos/specs2/back_into_adventure.fur differ diff --git a/demos/specs2/spa.fur b/demos/specs2/spa.fur new file mode 100644 index 0000000000..34ecd25582 Binary files /dev/null and b/demos/specs2/spa.fur differ diff --git a/papers/clipboard-format.md b/papers/clipboard-format.md index 06d1c4f4a6..7182b59e21 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.6 is `181`. +this top line of text is always the same except for the number in parentheses, which is the internal build number. for example, 0.6.1 is `192`. 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 fc442e8952..149c498695 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: +- 192: Furnace 0.6.1 - 181: Furnace 0.6 - 180: Furnace 0.6pre18 - 179: Furnace 0.6pre17 diff --git a/res/Info.plist b/res/Info.plist index 7895024da8..20f1b73b52 100644 --- a/res/Info.plist +++ b/res/Info.plist @@ -15,17 +15,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 0.6 + 0.6.1 CFBundleName Furnace CFBundlePackageType APPL CFBundleShortVersionString - 0.6 + 0.6.1 CFBundleSignature ???? CFBundleVersion - 0.6 + 0.6.1 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/scripts/release-linux-AppImage.sh b/scripts/release-linux-AppImage.sh index c535d2f6ec..f5fbfeeb7c 100755 --- a/scripts/release-linux-AppImage.sh +++ b/scripts/release-linux-AppImage.sh @@ -8,11 +8,11 @@ fi cd /tmp/furnace -if [ ! -e linuxbuild ]; then - mkdir linuxbuild || exit 1 +if [ ! -e aibuild ]; then + mkdir aibuild || exit 1 fi -cd linuxbuild +cd aibuild cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Werror" -DWITH_DEMOS=OFF -DWITH_INSTRUMENTS=OFF -DWITH_WAVETABLES=OFF .. || exit 1 make -j4 || exit 1 @@ -20,7 +20,7 @@ make -j4 || exit 1 cd .. mkdir -p release/linux/furnace.AppDir || exit 1 -cd linuxbuild +cd aibuild make DESTDIR=/tmp/furnace/release/linux/furnace.AppDir install || exit 1 diff --git a/src/engine/engine.h b/src/engine/engine.h index c1d60bbea3..4ce839c0b2 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -52,10 +52,10 @@ class DivWorkPool; #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 "dev191" -#define DIV_ENGINE_VERSION 191 +#define DIV_VERSION "0.6.1" +#define DIV_ENGINE_VERSION 192 // for imports #define DIV_VERSION_MOD 0xff01 #define DIV_VERSION_FC 0xff02 diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index 1fdb594a2f..71f3cda809 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -44,7 +44,7 @@ #endif #ifdef HAVE_FREETYPE -#define FONT_BACKEND_DEFAULT 1 +#define FONT_BACKEND_DEFAULT 0 #else #define FONT_BACKEND_DEFAULT 0 #endif