Merge branch 'dev'

JujuAdams · Sep 12, 2020 · c44ba7b · c44ba7b
2 parents ae8d3f6 + 25075a7
commit c44ba7b
Show file tree

Hide file tree

Showing 40 changed files with 912 additions and 131 deletions.
diff --git a/Scribble.yyp b/Scribble.yyp
diff --git a/objects/obj_test_autotype_delay/Create_0.gml b/objects/obj_test_autotype_delay/Create_0.gml
@@ -0,0 +1,4 @@
+scribble_init("Fonts", "fnt_test_2", true);
+
+element = scribble_cache("abcdefg[delay]hijklmnop");
+scribble_autotype_fade_in(element, 0.05, 0, false);
diff --git a/objects/obj_test_autotype_delay/Draw_0.gml b/objects/obj_test_autotype_delay/Draw_0.gml
@@ -0,0 +1 @@
+scribble_draw(x, y, element);
diff --git a/objects/obj_test_autotype_delay/obj_test.yy b/objects/obj_test_autotype_delay/obj_test.yy
diff --git a/objects/obj_test_autotype_delay/obj_test_autotype_delay.yy b/objects/obj_test_autotype_delay/obj_test_autotype_delay.yy
diff --git a/objects/obj_test_autotype_delay/obj_test_wrap.yy b/objects/obj_test_autotype_delay/obj_test_wrap.yy
diff --git a/objects/obj_test_autotype_pause/Create_0.gml b/objects/obj_test_autotype_pause/Create_0.gml
@@ -0,0 +1,4 @@
+scribble_init("Fonts", "fnt_test_2", true);
+
+element = scribble_cache("abcdefg[pause]hijklmnop");
+scribble_autotype_fade_in(element, 0.12, 10, false);
diff --git a/objects/obj_test_autotype_pause/Draw_0.gml b/objects/obj_test_autotype_pause/Draw_0.gml
@@ -0,0 +1 @@
+scribble_draw(x, y, element);
diff --git a/objects/obj_test_autotype_pause/Step_0.gml b/objects/obj_test_autotype_pause/Step_0.gml
@@ -0,0 +1,4 @@
+if (keyboard_check_pressed(vk_space))
+{
+    scribble_autotype_set_pause(element, false);
+}