From 59ffec9d0b0d62a71a83a6eb26ec29abca5d3cf4 Mon Sep 17 00:00:00 2001 From: Juju Adams Date: Fri, 26 Jun 2020 21:56:54 +0100 Subject: [PATCH] 6.0.7 --- options/windows/options_windows.yy | 2 +- scripts/scribble_init/scribble_init.gml | 4 ++-- shaders/shd_scribble/shd_scribble.fsh | 2 +- shaders/shd_scribble/shd_scribble.vsh | 2 +- .../shd_scribble_bake_outline/shd_scribble_bake_outline.fsh | 2 +- .../shd_scribble_bake_outline/shd_scribble_bake_outline.vsh | 2 +- views/84f15521-954c-4d2d-9709-5b2d9ca231f1.yy | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 212fa6dee..a2e815789 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -31,7 +31,7 @@ "option_windows_texture_page": "2048x2048", "option_windows_use_splash": false, "option_windows_version": { - "build": 5, + "build": 7, "major": 6, "minor": 0, "revision": 0 diff --git a/scripts/scribble_init/scribble_init.gml b/scripts/scribble_init/scribble_init.gml index b20057ace..dcfd92436 100644 --- 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.6b" -#macro __SCRIBBLE_DATE "2020-06-23" +#macro __SCRIBBLE_VERSION "6.0.7" +#macro __SCRIBBLE_DATE "2020-06-26" #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 index ebad4afd7..57237dfe8 100644 --- a/shaders/shd_scribble/shd_scribble.fsh +++ b/shaders/shd_scribble/shd_scribble.fsh @@ -1,4 +1,4 @@ -// @jujuadams v6.0.6b 2020-06-23 +// @jujuadams v6.0.7 2020-06-26 varying vec2 v_vTexcoord; varying vec4 v_vColour; diff --git a/shaders/shd_scribble/shd_scribble.vsh b/shaders/shd_scribble/shd_scribble.vsh index 6f718ed1a..93fa86310 100644 --- a/shaders/shd_scribble/shd_scribble.vsh +++ b/shaders/shd_scribble/shd_scribble.vsh @@ -1,4 +1,4 @@ -// @jujuadams v6.0.6b 2020-06-23 +// @jujuadams v6.0.7 2020-06-26 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 index fdb309cfe..eea0b5411 100644 --- 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.6b 2020-06-23 +// @jujuadams v6.0.7 2020-06-26 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 index 498b8f343..b48745e24 100644 --- 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.6b 2020-06-23 +// @jujuadams v6.0.7 2020-06-26 attribute vec3 in_Position; attribute vec4 in_Colour; diff --git a/views/84f15521-954c-4d2d-9709-5b2d9ca231f1.yy b/views/84f15521-954c-4d2d-9709-5b2d9ca231f1.yy index 698e37b01..a12414c40 100644 --- a/views/84f15521-954c-4d2d-9709-5b2d9ca231f1.yy +++ b/views/84f15521-954c-4d2d-9709-5b2d9ca231f1.yy @@ -4,10 +4,10 @@ "mvc": "1.1", "name": "84f15521-954c-4d2d-9709-5b2d9ca231f1", "children": [ - "94a2d6ab-abc6-4785-9bd3-09b66392e1e8", "dbcf1cbf-cbd0-40fa-9a88-c5c9e80976c1", "9d531882-0dcf-4be8-8225-d8370e77e70b", - "fab0fef8-eab5-4e5b-bccd-f5ed6f43db50" + "fab0fef8-eab5-4e5b-bccd-f5ed6f43db50", + "94a2d6ab-abc6-4785-9bd3-09b66392e1e8" ], "filterType": "GMRoom", "folderName": "rooms",