Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
JujuAdams committed Dec 20, 2020
2 parents 8156a2a + dca2f83 commit 4e2f589
Show file tree
Hide file tree
Showing 426 changed files with 11,466 additions and 11,657 deletions.
1 change: 1 addition & 0 deletions MSDF charset example.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!,'.<>?@^)(*%±$#£ "
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<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">6.0.14a</h1>
<h1 align="center">7.0.2</h1>

<p align="center">A modern text renderer for GameMaker Studio 2 by <b>@jujuadams</b></p>

<p align="center"><a href="https://github.com/JujuAdams/scribble/releases/tag/6.0.14">Download the .yymp</a></p>
<p align="center"><a href="https://github.com/JujuAdams/scribble/releases/tag/7.0.2">Download the .yymps</a></p>
<p align="center">Chat about Scribble on the <a href="https://discord.gg/8krYCqr">Discord server</a></p>

&nbsp;
Expand Down
218 changes: 99 additions & 119 deletions Scribble.yyp

Large diffs are not rendered by default.

Loading

0 comments on commit 4e2f589

Please sign in to comment.