Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
JujuAdams committed Feb 9, 2021
2 parents 8c4b107 + 7c23358 commit 9598d0c
Show file tree
Hide file tree
Showing 51 changed files with 1,240 additions and 103 deletions.
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<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">7.0.3</h1>
<h1 align="center">7.1.0</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/7.0.3">Download the .yymps</a></p>
<p align="center"><a href="https://github.com/JujuAdams/scribble/releases/">Download the .yymps</a></p>
<p align="center">Chat about Scribble on the <a href="https://discord.gg/8krYCqr">Discord server</a></p>

&nbsp;

|[![FAQ](https://raw.githubusercontent.com/wiki/JujuAdams/scribble/images/faq.png)](https://github.com/JujuAdams/scribble/wiki/FAQ)|[![Features](https://raw.githubusercontent.com/wiki/JujuAdams/scribble/images/features.png)](https://github.com/JujuAdams/scribble/wiki/Features)|[![Setting Up](https://raw.githubusercontent.com/wiki/JujuAdams/scribble/images/setup.png)](https://github.com/JujuAdams/scribble/wiki/Setting-Up)|[![GML Functions](https://raw.githubusercontent.com/wiki/JujuAdams/scribble/images/code.png)](https://github.com/JujuAdams/scribble/wiki/scribble()-Methods)|
|[![About & Support](https://raw.githubusercontent.com/wiki/JujuAdams/scribble/images/aboutsupport.png)](https://github.com/JujuAdams/scribble/wiki/(6.0.0)-About-&-Support)|[![Features](https://raw.githubusercontent.com/wiki/JujuAdams/scribble/images/features.png)](https://github.com/JujuAdams/scribble/wiki/(6.0.0)-Features)|[![Setting Up](https://raw.githubusercontent.com/wiki/JujuAdams/scribble/images/settingup.png)](https://github.com/JujuAdams/scribble/wiki/(6.0.0)-Setting-Up)|[![GML Functions](https://raw.githubusercontent.com/wiki/JujuAdams/scribble/images/functions.png)](https://github.com/JujuAdams/scribble/wiki/(6.0.0)-GML-Functions)|
|----------------------|----------------------|----------------------|----------------------|
|<p align="center">[FAQ](https://github.com/JujuAdams/scribble/wiki/FAQ)</p>|<p align="center">[Features](https://github.com/JujuAdams/scribble/wiki/Features)</p>|<p align="center">[Setting Up](https://github.com/JujuAdams/scribble/wiki/Setting-Up)</p>|<p align="center">[Using `scribble()`](https://github.com/JujuAdams/scribble/wiki/scribble()-Methods)</p>|
|Commonly asked questions about Scribble| Synopsis of Scribble's features | Basic setup guide for new users | Every Scribble method and how to use them |
|<p align="center">[About & Support](https://github.com/JujuAdams/scribble/wiki/(6.0.0)-About-&-Support)</p>|<p align="center">[Features](https://github.com/JujuAdams/scribble/wiki/(6.0.0)-Features)</p>|<p align="center">[Setting Up](https://github.com/JujuAdams/scribble/wiki/(6.0.0)-Setting-Up)</p>|<p align="center">[GML Functions](https://github.com/JujuAdams/scribble/wiki/(6.0.0)-GML-Functions)</p>|
|Who made Scribble and how to get help| Synopsis of Scribble's features | Basic setup guide for new users | Every Scribble function and how to use them in common situations |
8 changes: 8 additions & 0 deletions Scribble.yyp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions datafiles/Industry-Demi.json

Large diffs are not rendered by default.

137 changes: 137 additions & 0 deletions datafiles/fnt_industrydemi.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added fonts/fnt_industrydemi/fnt_industrydemi.old.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fonts/fnt_industrydemi/fnt_industrydemi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9598d0c

Please sign in to comment.