From 4e80e655a57cf89e7cc3a9e69f79ccb12afdcd7d Mon Sep 17 00:00:00 2001 From: Patrik Kraif Date: Thu, 4 Jul 2024 08:18:57 +0200 Subject: [PATCH] Fix typo, increase version to 3.21.4 --- 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_DefaultShader/BBMOD_DefaultShader.gml | 2 +- BBMOD_GML/scripts/__bbmod_defines/__bbmod_defines.gml | 2 +- ChangelogDev.md | 2 ++ docs_src/index.md | 2 +- gmdoc.json | 2 +- 16 files changed, 17 insertions(+), 15 deletions(-) diff --git a/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy b/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy index 99c867362..aa37c09e3 100644 --- a/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy +++ b/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy @@ -14,7 +14,7 @@ "copyToTargets":32, "description":"", "exportToGame":true, - "extensionVersion":"3.21.3", + "extensionVersion":"3.21.4", "files":[ {"$GMExtensionFile":"","%Name":"BBMOD_CameraHTML5.js","constants":[],"copyToTargets":32,"filename":"BBMOD_CameraHTML5.js","final":"","functions":[ {"$GMExtensionFunction":"","%Name":"bbmod_html5_pointer_lock","argCount":0,"args":[],"documentation":"","externalName":"bbmod_html5_pointer_lock","help":"bbmod_html5_pointer_lock()","hidden":false,"kind":5,"name":"bbmod_html5_pointer_lock","resourceType":"GMExtensionFunction","resourceVersion":"2.0","returnType":2,}, diff --git a/BBMOD_GML/options/amazonfire/options_amazonfire.yy b/BBMOD_GML/options/amazonfire/options_amazonfire.yy index a4d2ac579..45d029d7b 100644 --- a/BBMOD_GML/options/amazonfire/options_amazonfire.yy +++ b/BBMOD_GML/options/amazonfire/options_amazonfire.yy @@ -44,7 +44,7 @@ "option_amazonfire_texture_page":"2048x2048", "option_amazonfire_tools_from_version":false, "option_amazonfire_tv_banner":"${base_options_dir}/amazonfire/tv_banner.png", - "option_amazonfire_version":"3.21.3", + "option_amazonfire_version":"3.21.4", "resourceType":"GMAmazonFireOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/BBMOD_GML/options/android/options_android.yy b/BBMOD_GML/options/android/options_android.yy index 364e4d32c..e44db8604 100644 --- a/BBMOD_GML/options/android/options_android.yy +++ b/BBMOD_GML/options/android/options_android.yy @@ -75,7 +75,7 @@ "option_android_tv_isgame":true, "option_android_tv_supports_leanback":true, "option_android_use_facebook":false, - "option_android_version":"3.21.3", + "option_android_version":"3.21.4", "resourceType":"GMAndroidOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/BBMOD_GML/options/html5/options_html5.yy b/BBMOD_GML/options/html5/options_html5.yy index 38449a2bb..cd349e593 100644 --- a/BBMOD_GML/options/html5/options_html5.yy +++ b/BBMOD_GML/options/html5/options_html5.yy @@ -28,7 +28,7 @@ "option_html5_usebuiltinparticles":true, "option_html5_usesplash":false, "option_html5_use_facebook":false, - "option_html5_version":"3.21.3.0", + "option_html5_version":"3.21.4.0", "option_html5_webgl":1, "resourceType":"GMHtml5Options", "resourceVersion":"2.0", diff --git a/BBMOD_GML/options/ios/options_ios.yy b/BBMOD_GML/options/ios/options_ios.yy index 84fcc9b43..19c404cf0 100644 --- a/BBMOD_GML/options/ios/options_ios.yy +++ b/BBMOD_GML/options/ios/options_ios.yy @@ -43,7 +43,7 @@ "option_ios_splashscreen_background_colour":255, "option_ios_team_id":"", "option_ios_texture_page":"2048x2048", - "option_ios_version":"3.21.3", + "option_ios_version":"3.21.4", "resourceType":"GMiOSOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/BBMOD_GML/options/linux/options_linux.yy b/BBMOD_GML/options/linux/options_linux.yy index b2cc64904..e8343c4e1 100644 --- a/BBMOD_GML/options/linux/options_linux.yy +++ b/BBMOD_GML/options/linux/options_linux.yy @@ -20,7 +20,7 @@ "option_linux_start_fullscreen":false, "option_linux_sync":false, "option_linux_texture_page":"2048x2048", - "option_linux_version":"3.21.3", + "option_linux_version":"3.21.4", "resourceType":"GMLinuxOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/BBMOD_GML/options/mac/options_mac.yy b/BBMOD_GML/options/mac/options_mac.yy index 3761771d1..d7d2f3bb4 100644 --- a/BBMOD_GML/options/mac/options_mac.yy +++ b/BBMOD_GML/options/mac/options_mac.yy @@ -30,7 +30,7 @@ "option_mac_start_fullscreen":false, "option_mac_team_id":"", "option_mac_texture_page":"2048x2048", - "option_mac_version":"3.21.3", + "option_mac_version":"3.21.4", "option_mac_vsync":false, "option_mac_x86_64":true, "resourceType":"GMMacOptions", diff --git a/BBMOD_GML/options/operagx/options_operagx.yy b/BBMOD_GML/options/operagx/options_operagx.yy index 2b754c2f8..cc2b9a413 100644 --- a/BBMOD_GML/options/operagx/options_operagx.yy +++ b/BBMOD_GML/options/operagx/options_operagx.yy @@ -23,7 +23,7 @@ "option_operagx_team_id":"", "option_operagx_team_name":"", "option_operagx_texture_page":"2048x2048", - "option_operagx_version":"3.21.3.0", + "option_operagx_version":"3.21.4.0", "resourceType":"GMOperaGXOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/BBMOD_GML/options/tvos/options_tvos.yy b/BBMOD_GML/options/tvos/options_tvos.yy index 9c73305c9..51598b02f 100644 --- a/BBMOD_GML/options/tvos/options_tvos.yy +++ b/BBMOD_GML/options/tvos/options_tvos.yy @@ -25,7 +25,7 @@ "option_tvos_topshelf_2x":"${base_options_dir}/tvos/topshelf/topshelf_2x.png", "option_tvos_topshelf_wide":"${base_options_dir}/tvos/topshelf/topshelf_wide.png", "option_tvos_topshelf_wide_2x":"${base_options_dir}/tvos/topshelf/topshelf_wide_2x.png", - "option_tvos_version":"3.21.3", + "option_tvos_version":"3.21.4", "resourceType":"GMtvOSOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/BBMOD_GML/options/windows/options_windows.yy b/BBMOD_GML/options/windows/options_windows.yy index 9850b20e7..e3c9e56bd 100644 --- a/BBMOD_GML/options/windows/options_windows.yy +++ b/BBMOD_GML/options/windows/options_windows.yy @@ -29,7 +29,7 @@ "option_windows_steam_use_alternative_launcher":false, "option_windows_texture_page":"2048x2048", "option_windows_use_splash":false, - "option_windows_version":"3.21.3.0", + "option_windows_version":"3.21.4.0", "option_windows_vsync":false, "resourceType":"GMWindowsOptions", "resourceVersion":"2.0", diff --git a/BBMOD_GML/options/windowsuap/options_windowsuap.yy b/BBMOD_GML/options/windowsuap/options_windowsuap.yy index 4199bef18..668892611 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.21.3.0", + "option_windowsuap_version": "3.21.4.0", "option_windowsuap_orient_portrait": true, "option_windowsuap_orient_portrait_flipped": true, "option_windowsuap_orient_landscape": true, diff --git a/BBMOD_GML/scripts/BBMOD_DefaultShader/BBMOD_DefaultShader.gml b/BBMOD_GML/scripts/BBMOD_DefaultShader/BBMOD_DefaultShader.gml index e50119cde..5ea4866a8 100644 --- a/BBMOD_GML/scripts/BBMOD_DefaultShader/BBMOD_DefaultShader.gml +++ b/BBMOD_GML/scripts/BBMOD_DefaultShader/BBMOD_DefaultShader.gml @@ -145,7 +145,7 @@ function BBMOD_DefaultShader(_shader, _vertexFormat) if (_normalRoughness != undefined) { bbmod_shader_set_normal_roughness(_shaderCurrent, _normalRoughness); - bbmod_shader_set_normal_w_uv(_shaderCurrent, texture_get_uvs(_normalSmoothness)); + bbmod_shader_set_normal_w_uv(_shaderCurrent, texture_get_uvs(_normalRoughness)); } // Specular color/Metallic and AO diff --git a/BBMOD_GML/scripts/__bbmod_defines/__bbmod_defines.gml b/BBMOD_GML/scripts/__bbmod_defines/__bbmod_defines.gml index c51140123..8c4e7262a 100644 --- a/BBMOD_GML/scripts/__bbmod_defines/__bbmod_defines.gml +++ b/BBMOD_GML/scripts/__bbmod_defines/__bbmod_defines.gml @@ -12,7 +12,7 @@ #macro BBMOD_RELEASE_MINOR 21 /// @macro {Real} The patch version number of this BBMOD release. -#macro BBMOD_RELEASE_PATCH 3 +#macro BBMOD_RELEASE_PATCH 4 /// @macro {String} The version of this BBMOD release as a string ("major.minor.patch" format). #macro BBMOD_RELEASE_STRING $"{BBMOD_RELEASE_MAJOR}.{BBMOD_RELEASE_MINOR}.{BBMOD_RELEASE_PATCH}" diff --git a/ChangelogDev.md b/ChangelogDev.md index 15430d386..88afce0fa 100644 --- a/ChangelogDev.md +++ b/ChangelogDev.md @@ -1,2 +1,4 @@ # Changelog dev > This file is used to accumulate changes before a changelog for a release is created. + +* Fixed typo in method `set_material` of `BBMOD_DefaultShader`, which tried to use the `NormalSmoothness` texture when the material was using `NormalRoughness`, causing an error. diff --git a/docs_src/index.md b/docs_src/index.md index 42dfdb792..6cf25fcb2 100644 --- a/docs_src/index.md +++ b/docs_src/index.md @@ -1,5 +1,5 @@ # BBMOD -Welcome to the official documentation of BBMOD 3.21.3! +Welcome to the official documentation of BBMOD 3.21.4! BBMOD is an advanced 3D rendering solution for GameMaker. It consists of a custom model, animation and material formats, a model converter (BBMOD CLI), diff --git a/gmdoc.json b/gmdoc.json index 41dbfdf80..6a21dcb14 100644 --- a/gmdoc.json +++ b/gmdoc.json @@ -5,7 +5,7 @@ "title": "BBMOD Docs", "author": "BlueBurn", "prefix": ["bbmod", "__bbmod"], - "version": "3.21.3", + "version": "3.21.4", "analytics": "", "api": { "rating": "/bbmod/page_rating.php"