Merge branch 'dev'

JujuAdams · Jun 23, 2020 · f9f2832 · f9f2832
2 parents d9aeaae + 42efe2d
commit f9f2832
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/scripts/scribble_add_font/scribble_add_font.gml b/scripts/scribble_add_font/scribble_add_font.gml
@@ -8,7 +8,8 @@
 /// Scribble requires that you explicitly initialise fonts for use with Scribble. This is a three-step process:
 /// 
 ///  1. Add a normal GameMaker font resource through the IDE
-///  2. Add the font's .yy file as an Included File (found in the font's folder in the project directory)
+///  2. Click the Regenerate button in font dialogue inside the GameMaker IDE, then add the font's .yy file as an Included File (found in
+///     the font's folder in the project directory)
 ///  3. Call scribble_add_font() targeting the font
 /// 
 /// Scribble needs to access information that GameMaker generates. All this information is contained in a single .yy file in the font's folder

diff --git a/scripts/scribble_autotype_skip/scribble_autotype_skip.gml b/scripts/scribble_autotype_skip/scribble_autotype_skip.gml
@@ -22,6 +22,7 @@ switch(_occurance_array[__SCRIBBLE_OCCURANCE.METHOD])
 {
     case 1: var _max = _page_array[__SCRIBBLE_PAGE.LAST_CHAR] + 2; break; //Per character
     case 2: var _max = _page_array[__SCRIBBLE_PAGE.LINES    ];     break; //Per line
+    default: exit;
 }
 
 _occurance_array[@ __SCRIBBLE_OCCURANCE.WINDOW      ] = 0;

diff --git a/scripts/scribble_init/scribble_init.gml b/scripts/scribble_init/scribble_init.gml
@@ -12,8 +12,8 @@
 
 // @jujuadams
 // With thanks to glitchroy, Mark Turner, DragoniteSpam, sp202, Rob van Saaze, soVes, and @stoozey_
-#macro __SCRIBBLE_VERSION  "6.0.6"
-#macro __SCRIBBLE_DATE     "2020-06-21"
+#macro __SCRIBBLE_VERSION  "6.0.6b"
+#macro __SCRIBBLE_DATE     "2020-06-23"
 #macro __SCRIBBLE_DEBUG    false
 
 //You'll usually only want to modify SCRIBBLE_GLYPH.X_OFFSET, SCRIBBLE_GLYPH.Y_OFFSET, and SCRIBBLE_GLYPH.SEPARATION

diff --git a/shaders/shd_scribble/shd_scribble.fsh b/shaders/shd_scribble/shd_scribble.fsh
@@ -1,4 +1,4 @@
-//   @jujuadams   v6.0.6   2020-06-20
+//   @jujuadams   v6.0.6b   2020-06-23
 
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;

diff --git a/shaders/shd_scribble/shd_scribble.vsh b/shaders/shd_scribble/shd_scribble.vsh
@@ -1,4 +1,4 @@
-//   @jujuadams   v6.0.6   2020-06-20
+//   @jujuadams   v6.0.6b   2020-06-23
 
 const int MAX_EFFECTS = 7;
 //By default, the effect indexes are:

diff --git a/shaders/shd_scribble_bake_outline/shd_scribble_bake_outline.fsh b/shaders/shd_scribble_bake_outline/shd_scribble_bake_outline.fsh
@@ -1,4 +1,4 @@
-//   @jujuadams   v6.0.6   2020-06-20
+//   @jujuadams   v6.0.6b   2020-06-23
 
 const float PI = 3.14159265359;
 

diff --git a/shaders/shd_scribble_bake_outline/shd_scribble_bake_outline.vsh b/shaders/shd_scribble_bake_outline/shd_scribble_bake_outline.vsh
@@ -1,4 +1,4 @@
-//   @jujuadams   v6.0.6   2020-06-20
+//   @jujuadams   v6.0.6b   2020-06-23
 
 attribute vec3 in_Position;
 attribute vec4 in_Colour;