From 30aa31b42f9175d60c0c3b9b5fe8f91097b1ff6a Mon Sep 17 00:00:00 2001 From: Patrik Kraif Date: Fri, 17 Jun 2022 20:24:39 +0200 Subject: [PATCH] Updated version --- BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy | 2 +- BBMOD_GML/options/amazonfire/options_amazonfire.yy | 2 +- BBMOD_GML/options/android/options_android.yy | 2 +- BBMOD_GML/options/html5/options_html5.yy | 2 +- BBMOD_GML/options/ios/options_ios.yy | 2 +- BBMOD_GML/options/linux/options_linux.yy | 2 +- BBMOD_GML/options/mac/options_mac.yy | 2 +- BBMOD_GML/options/operagx/options_operagx.yy | 2 +- BBMOD_GML/options/tvos/options_tvos.yy | 2 +- BBMOD_GML/options/windows/options_windows.yy | 2 +- BBMOD_GML/options/windowsuap/options_windowsuap.yy | 2 +- BBMOD_GML/scripts/BBMOD_Animation/BBMOD_Animation.gml | 2 +- docs_src/Changelog/Changelog3.6.2.md | 2 ++ docs_src/Changelog/Changelog_.md | 1 + docs_src/index.md | 2 +- gmdoc.json | 3 ++- 16 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 docs_src/Changelog/Changelog3.6.2.md diff --git a/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy b/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy index bedc6470..b32ea30c 100644 --- a/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy +++ b/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy @@ -3,7 +3,7 @@ "options": [], "exportToGame": true, "supportedTargets": -1, - "extensionVersion": "3.6.1", + "extensionVersion": "3.6.2", "packageId": "", "productId": "", "author": "", diff --git a/BBMOD_GML/options/amazonfire/options_amazonfire.yy b/BBMOD_GML/options/amazonfire/options_amazonfire.yy index c5cbc3a2..a79f7e9e 100644 --- a/BBMOD_GML/options/amazonfire/options_amazonfire.yy +++ b/BBMOD_GML/options/amazonfire/options_amazonfire.yy @@ -1,7 +1,7 @@ { "option_amazonfire_sync_android": false, "option_amazonfire_display_name": "BBMOD Demo", - "option_amazonfire_version": "3.6.1", + "option_amazonfire_version": "3.6.2", "option_amazonfire_tools_from_version": false, "option_amazonfire_build_tools": "", "option_amazonfire_support_lib": "", diff --git a/BBMOD_GML/options/android/options_android.yy b/BBMOD_GML/options/android/options_android.yy index 51f58871..ee3c73e8 100644 --- a/BBMOD_GML/options/android/options_android.yy +++ b/BBMOD_GML/options/android/options_android.yy @@ -1,7 +1,7 @@ { "option_android_sync_amazon": false, "option_android_display_name": "BBMOD Demo", - "option_android_version": "3.6.1", + "option_android_version": "3.6.2", "option_android_tools_from_version": false, "option_android_build_tools": "", "option_android_support_lib": "30.0.0", diff --git a/BBMOD_GML/options/html5/options_html5.yy b/BBMOD_GML/options/html5/options_html5.yy index f2e659d8..4122d1a7 100644 --- a/BBMOD_GML/options/html5/options_html5.yy +++ b/BBMOD_GML/options/html5/options_html5.yy @@ -1,6 +1,6 @@ { "option_html5_browser_title": "BBMOD Demo", - "option_html5_version": "3.6.1.0", + "option_html5_version": "3.6.2.0", "option_html5_foldername": "html5game", "option_html5_outputname": "index.html", "option_html5_splash_png": "${base_options_dir}/html5/splash.png", diff --git a/BBMOD_GML/options/ios/options_ios.yy b/BBMOD_GML/options/ios/options_ios.yy index b21ccf61..01d10615 100644 --- a/BBMOD_GML/options/ios/options_ios.yy +++ b/BBMOD_GML/options/ios/options_ios.yy @@ -1,7 +1,7 @@ { "option_ios_display_name": "BBMOD Demo", "option_ios_bundle_name": "com.company.game", - "option_ios_version": "3.6.1", + "option_ios_version": "3.6.2", "option_ios_output_dir": "~/gamemakerstudio2", "option_ios_team_id": "", "option_ios_orientation_portrait": true, diff --git a/BBMOD_GML/options/linux/options_linux.yy b/BBMOD_GML/options/linux/options_linux.yy index 93d5d44a..a67f4676 100644 --- a/BBMOD_GML/options/linux/options_linux.yy +++ b/BBMOD_GML/options/linux/options_linux.yy @@ -1,6 +1,6 @@ { "option_linux_display_name": "BBMOD Demo", - "option_linux_version": "3.6.1", + "option_linux_version": "3.6.2", "option_linux_maintainer_email": "", "option_linux_homepage": "http://www.yoyogames.com", "option_linux_short_desc": "", diff --git a/BBMOD_GML/options/mac/options_mac.yy b/BBMOD_GML/options/mac/options_mac.yy index 277a5356..38212a70 100644 --- a/BBMOD_GML/options/mac/options_mac.yy +++ b/BBMOD_GML/options/mac/options_mac.yy @@ -1,7 +1,7 @@ { "option_mac_display_name": "BBMOD Demo", "option_mac_app_id": "com.company.game", - "option_mac_version": "3.6.1", + "option_mac_version": "3.6.2", "option_mac_output_dir": "~/gamemakerstudio2", "option_mac_team_id": "", "option_mac_signing_identity": "Developer ID Application:", diff --git a/BBMOD_GML/options/operagx/options_operagx.yy b/BBMOD_GML/options/operagx/options_operagx.yy index cf387359..47eb4d8f 100644 --- a/BBMOD_GML/options/operagx/options_operagx.yy +++ b/BBMOD_GML/options/operagx/options_operagx.yy @@ -1,5 +1,5 @@ { - "option_operagx_version": "3.6.1.0", + "option_operagx_version": "3.6.2.0", "option_operagx_game_name": "BBMOD Demo", "option_operagx_interpolate_pixels": false, "option_operagx_scale": 1, diff --git a/BBMOD_GML/options/tvos/options_tvos.yy b/BBMOD_GML/options/tvos/options_tvos.yy index a43d969c..b7ba4239 100644 --- a/BBMOD_GML/options/tvos/options_tvos.yy +++ b/BBMOD_GML/options/tvos/options_tvos.yy @@ -1,7 +1,7 @@ { "option_tvos_display_name": "BBMOD Demo", "option_tvos_bundle_name": "com.company.game", - "option_tvos_version": "3.6.1", + "option_tvos_version": "3.6.2", "option_tvos_output_dir": "~/GameMakerStudio2/tvOS", "option_tvos_team_id": "", "option_tvos_icon_400": "${base_options_dir}/tvos/icons/400.png", diff --git a/BBMOD_GML/options/windows/options_windows.yy b/BBMOD_GML/options/windows/options_windows.yy index 3e8219f1..d78df607 100644 --- a/BBMOD_GML/options/windows/options_windows.yy +++ b/BBMOD_GML/options/windows/options_windows.yy @@ -1,7 +1,7 @@ { "option_windows_display_name": "BBMOD Demo", "option_windows_executable_name": "${project_name}.exe", - "option_windows_version": "3.6.1.0", + "option_windows_version": "3.6.2.0", "option_windows_company_info": "BlueBurn", "option_windows_product_info": "BBMOD", "option_windows_copyright_info": "", diff --git a/BBMOD_GML/options/windowsuap/options_windowsuap.yy b/BBMOD_GML/options/windowsuap/options_windowsuap.yy index 686361c9..a9a0cce8 100644 --- a/BBMOD_GML/options/windowsuap/options_windowsuap.yy +++ b/BBMOD_GML/options/windowsuap/options_windowsuap.yy @@ -4,7 +4,7 @@ "option_windowsuap_publisher_display_name": "YourPublisherName", "option_windowsuap_package_display_name": "YourPackageDisplayName", "option_windowsuap_description": "Your Description", - "option_windowsuap_version": "3.6.1.0", + "option_windowsuap_version": "3.6.2.0", "option_windowsuap_orient_portrait": true, "option_windowsuap_orient_portrait_flipped": true, "option_windowsuap_orient_landscape": true, diff --git a/BBMOD_GML/scripts/BBMOD_Animation/BBMOD_Animation.gml b/BBMOD_GML/scripts/BBMOD_Animation/BBMOD_Animation.gml index 7c6af90f..b2ff8e5a 100644 --- a/BBMOD_GML/scripts/BBMOD_Animation/BBMOD_Animation.gml +++ b/BBMOD_GML/scripts/BBMOD_Animation/BBMOD_Animation.gml @@ -185,7 +185,7 @@ function BBMOD_Animation(_file=undefined, _sha1=undefined) if (_hasMinorVersion) { VersionMinor = buffer_read(_buffer, buffer_u8); - if (VersionMinor != BBMOD_VERSION_MINOR) + if (VersionMinor > BBMOD_VERSION_MINOR) { throw new BBMOD_Exception( "Invalid BBANIM minor version " + string(VersionMinor) + "!"); diff --git a/docs_src/Changelog/Changelog3.6.2.md b/docs_src/Changelog/Changelog3.6.2.md new file mode 100644 index 00000000..d2c52d52 --- /dev/null +++ b/docs_src/Changelog/Changelog3.6.2.md @@ -0,0 +1,2 @@ +# Changelog 3.6.2 +This release is a hotfix of loading of BBMOD and BBANIM files with a minor version lesser than the current one is. diff --git a/docs_src/Changelog/Changelog_.md b/docs_src/Changelog/Changelog_.md index c84f2a47..f30383f5 100644 --- a/docs_src/Changelog/Changelog_.md +++ b/docs_src/Changelog/Changelog_.md @@ -2,6 +2,7 @@ In this section you can find changelogs for all releases of BBMOD since 3.0.0. ## Contents +* [3.6.2](./Changelog3.6.2.html) * [3.6.1](./Changelog3.6.1.html) * [3.6.0](./Changelog3.6.0.html) * [3.5.1](./Changelog3.5.1.html) diff --git a/docs_src/index.md b/docs_src/index.md index b697f840..aabc246b 100644 --- a/docs_src/index.md +++ b/docs_src/index.md @@ -1,5 +1,5 @@ # BBMOD -Welcome to the official documentation of BBMOD 3.6.1! +Welcome to the official documentation of BBMOD 3.6.2! BBMOD is an advanced 3D rendering solution for GameMaker. It consists of a custom model and animation file formats (`*.bbmod`, `*.bbanim`), a model diff --git a/gmdoc.json b/gmdoc.json index e29552cc..60089132 100644 --- a/gmdoc.json +++ b/gmdoc.json @@ -5,7 +5,7 @@ "title": "BBMOD Docs", "author": "BlueBurn", "prefix": ["bbmod", "__bbmod"], - "version": "3.6.1", + "version": "3.6.2", "analytics": "", "api": { "rating": "/bbmod/page_rating.php" @@ -15,6 +15,7 @@ "Changelog": { "file": "Changelog/Changelog_.md", "pages": { + "3.6.2": "Changelog/Changelog3.6.2.md", "3.6.1": "Changelog/Changelog3.6.1.md", "3.6.0": "Changelog/Changelog3.6.0.md", "3.5.1": "Changelog/Changelog3.5.1.md",