Merge branch 'dev'

JujuAdams · May 31, 2022 · 7c03df9 · 7c03df9
2 parents e5829f7 + 00e3bb0
commit 7c03df9
Show file tree

Hide file tree

Showing 31 changed files with 184 additions and 63 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center"><img src="https://raw.githubusercontent.com/JujuAdams/scribble/master/LOGO.png" style="display:block; margin:auto; width:300px"></p>
-<h1 align="center">8.0.2</h1>
+<h1 align="center">8.0.3</h1>
 
 <p align="center">A modern text renderer for GameMaker Studio 2.3.6+ by <b>@jujuadams</b></p>
 

diff --git a/Scribble.yyp b/Scribble.yyp
diff --git a/objects/obj_test_align/obj_test_align.yy b/objects/obj_test_align/obj_test_align.yy
diff --git a/objects/obj_test_bbox_getters/obj_test_bbox_getters.yy b/objects/obj_test_bbox_getters/obj_test_bbox_getters.yy
diff --git a/objects/obj_test_blend/obj_test_blend.yy b/objects/obj_test_blend/obj_test_blend.yy
diff --git a/objects/obj_test_build/obj_test_build.yy b/objects/obj_test_build/obj_test_build.yy
diff --git a/objects/obj_test_flush/obj_test_flush.yy b/objects/obj_test_flush/obj_test_flush.yy
diff --git a/objects/obj_test_flush_multi/obj_test_flush_multi.yy b/objects/obj_test_flush_multi/obj_test_flush_multi.yy
diff --git a/objects/obj_test_get_events/obj_test_get_events.yy b/objects/obj_test_get_events/obj_test_get_events.yy
diff --git a/objects/obj_test_has_character/obj_test_has_character.yy b/objects/obj_test_has_character/obj_test_has_character.yy
diff --git a/objects/obj_test_ignore_command_tags/obj_test_ignore_command_tags.yy b/objects/obj_test_ignore_command_tags/obj_test_ignore_command_tags.yy
diff --git a/objects/obj_test_line_height/obj_test_line_height.yy b/objects/obj_test_line_height/obj_test_line_height.yy
diff --git a/objects/obj_test_line_spacing/obj_test_line_spacing.yy b/objects/obj_test_line_spacing/obj_test_line_spacing.yy
diff --git a/objects/obj_test_origin/obj_test_origin.yy b/objects/obj_test_origin/obj_test_origin.yy
diff --git a/objects/obj_test_overwrite/obj_test_overwrite.yy b/objects/obj_test_overwrite/obj_test_overwrite.yy
diff --git a/objects/obj_test_skew/Draw_0.gml b/objects/obj_test_skew/Draw_0.gml
@@ -0,0 +1,18 @@
+var _x = room_width/2;
+var _y = room_height/4;
+
+var _element = scribble("No skew\nNo skew\nNo skew");
+_element.skew(0, 0);
+_element.draw(_x, _y);
+
+_y = 2*room_height/4;
+
+var _element = scribble("x-skew\nx-skew\nx-skew", 0);
+_element.skew(0.5, 0);
+_element.draw(_x, _y);
+
+_y = 3*room_height/4;
+
+var _element = scribble("y-skew\ny-skew\ny-skew");
+_element.skew(0, 0.5);
+_element.draw(_x, _y);
diff --git a/objects/obj_test_skew/obj_test_skew.yy b/objects/obj_test_skew/obj_test_skew.yy
diff --git a/objects/obj_test_sprite_autofit/Draw_0.gml b/objects/obj_test_sprite_autofit/Draw_0.gml
@@ -0,0 +1,5 @@
+draw_set_font(scribble_fallback_font);
+draw_text(10, 10, "SCRIBBLE_AUTOFIT_INLINE_SPRITES = " + string(SCRIBBLE_AUTOFIT_INLINE_SPRITES));
+
+scribble("[spr_large_coin] <-- This is a big coin\n[spr_large_coin] <-- And another").draw(10, 40);
+scribble("[spr_coin] <-- This is a small coin").draw(10, 90);
diff --git a/objects/obj_test_sprite_autofit/obj_test_sprite_autofit.yy b/objects/obj_test_sprite_autofit/obj_test_sprite_autofit.yy
diff --git a/objects/obj_test_starting_format/obj_test_starting_format.yy b/objects/obj_test_starting_format/obj_test_starting_format.yy
diff --git a/objects/obj_test_template/obj_test_template.yy b/objects/obj_test_template/obj_test_template.yy