Increased version to 3.21.1, added changelog

blueburncz · Apr 16, 2024 · fd99721 · fd99721
1 parent 23dc719
commit fd99721
Show file tree

Hide file tree

Showing 21 changed files with 96 additions and 52 deletions.
diff --git a/BBMOD_GML/BBMOD.resource_order b/BBMOD_GML/BBMOD.resource_order
@@ -81,6 +81,7 @@
   ],
   "ResourceOrderSettings":[
     {"name":"BBMOD_CameraHTML5","order":1,"path":"extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy",},
+    {"name":"Room1","order":2,"path":"rooms/Room1/Room1.yy",},
     {"name":"__bbmod_array","order":5,"path":"scripts/__bbmod_array/__bbmod_array.yy",},
     {"name":"__bbmod_async","order":3,"path":"scripts/__bbmod_async/__bbmod_async.yy",},
     {"name":"__bbmod_blendmode","order":14,"path":"scripts/__bbmod_blendmode/__bbmod_blendmode.yy",},
@@ -311,8 +312,8 @@
     {"name":"BBMOD_SprLensDirt","order":1,"path":"sprites/BBMOD_SprLensDirt/BBMOD_SprLensDirt.yy",},
     {"name":"BBMOD_SprLensFlareHeptagon","order":1,"path":"sprites/BBMOD_SprLensFlareHeptagon/BBMOD_SprLensFlareHeptagon.yy",},
     {"name":"BBMOD_SprLensFlareHoop","order":3,"path":"sprites/BBMOD_SprLensFlareHoop/BBMOD_SprLensFlareHoop.yy",},
+    {"name":"BBMOD_SprLensFlareStarburst","order":6,"path":"sprites/BBMOD_SprLensFlareStarburst/BBMOD_SprLensFlareStarburst.yy",},
     {"name":"BBMOD_SprLensFlareStreak","order":5,"path":"sprites/BBMOD_SprLensFlareStreak/BBMOD_SprLensFlareStreak.yy",},
     {"name":"BBMOD_SprWhite","order":2,"path":"sprites/BBMOD_SprWhite/BBMOD_SprWhite.yy",},
-    {"name":"BBMOD_SprLensFlareStarburst","order":6,"path":"sprites/BBMOD_SprLensFlareStarburst/BBMOD_SprLensFlareStarburst.yy",},
   ],
 }
diff --git a/BBMOD_GML/BBMOD.yyp b/BBMOD_GML/BBMOD.yyp
diff --git a/BBMOD_GML/ExpandShaders.py b/BBMOD_GML/ExpandShaders.py
@@ -104,8 +104,8 @@ def combine(*_args: list[dict]) -> dict:
 expand_shader("BBMOD_ShGBufferTerrain", combine(TERRAIN, OUTPUT_GBUFFER))
 
 # Zombie shaders
-ZOMBIE = combine({ "X_ZOMBIE": 1 }, ANIMATED)
+# ZOMBIE = combine({ "X_ZOMBIE": 1 }, ANIMATED)
 
-expand_shader("ShZombie", combine(ZOMBIE, PBR))
-expand_shader("ShZombieDepth", combine(ZOMBIE, OUTPUT_DEPTH))
-expand_shader("ShZombieGBuffer", combine(ZOMBIE, OUTPUT_GBUFFER))
+# expand_shader("ShZombie", combine(ZOMBIE, PBR))
+# expand_shader("ShZombieDepth", combine(ZOMBIE, OUTPUT_DEPTH))
+# expand_shader("ShZombieGBuffer", combine(ZOMBIE, OUTPUT_GBUFFER))
diff --git a/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy b/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy
diff --git a/BBMOD_GML/options/amazonfire/options_amazonfire.yy b/BBMOD_GML/options/amazonfire/options_amazonfire.yy
diff --git a/BBMOD_GML/options/android/options_android.yy b/BBMOD_GML/options/android/options_android.yy
diff --git a/BBMOD_GML/options/html5/options_html5.yy b/BBMOD_GML/options/html5/options_html5.yy
diff --git a/BBMOD_GML/options/ios/options_ios.yy b/BBMOD_GML/options/ios/options_ios.yy
diff --git a/BBMOD_GML/options/linux/options_linux.yy b/BBMOD_GML/options/linux/options_linux.yy
diff --git a/BBMOD_GML/options/mac/options_mac.yy b/BBMOD_GML/options/mac/options_mac.yy
diff --git a/BBMOD_GML/options/operagx/options_operagx.yy b/BBMOD_GML/options/operagx/options_operagx.yy
diff --git a/BBMOD_GML/options/tvos/options_tvos.yy b/BBMOD_GML/options/tvos/options_tvos.yy
diff --git a/BBMOD_GML/options/windows/options_windows.yy b/BBMOD_GML/options/windows/options_windows.yy
diff --git a/BBMOD_GML/options/windowsuap/options_windowsuap.yy b/BBMOD_GML/options/windowsuap/options_windowsuap.yy
diff --git a/BBMOD_GML/rooms/Room1/Room1.yy b/BBMOD_GML/rooms/Room1/Room1.yy
diff --git 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 0
+#macro BBMOD_RELEASE_PATCH 1
 
 /// @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
@@ -1,6 +1,2 @@
 # Changelog dev
 > This file is used to accumulate changes before a changelog for a release is created.
-
-* Fixed method `present` of renderers.
-* Fixed wrong comparisons with the epsilon value, which caused getting `NaN` in various places (e.g. `BBMOD_Vec3.Normalize`). Thanks to [@xgreffe](https://github.com/xgreffe) for the pull request!
-* Fixed error in `BBMOD_Material.from_json` when given JSON included string "undefined".