-
Notifications
You must be signed in to change notification settings - Fork 904
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' into release
- Loading branch information
Showing
41 changed files
with
392 additions
and
238 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# ![ml5](https://user-images.githubusercontent.com/10605821/41332516-2ee26714-6eac-11e8-83e4-a40b8761e764.png) | ||
[![All Contributors](https://img.shields.io/badge/all_contributors-60-orange.svg?style=flat-square)](#contributors) | ||
[![All Contributors](https://img.shields.io/badge/all_contributors-61-orange.svg?style=flat-square)](#contributors) | ||
|
||
|
||
[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=QVNDdlkvMzNYSmhRRWlweXlIOTBENkd0MDBCOUJlbmFVZFRneFIzNlh4az0tLXA4S0loSGNlVUc2V2I3cVdLdXBKdGc9PQ==--8a5e5bfd3eafbba0702c02ec57ffec9d627a78ef)](https://www.browserstack.com/automate/public-build/QVNDdlkvMzNYSmhRRWlweXlIOTBENkd0MDBCOUJlbmFVZFRneFIzNlh4az0tLXA4S0loSGNlVUc2V2I3cVdLdXBKdGc9PQ==--8a5e5bfd3eafbba0702c02ec57ffec9d627a78ef)[![Version](https://img.shields.io/npm/v/ml5.svg?style=flat-square)](https://www.npmjs.com/package/ml5) | ||
|
@@ -26,19 +26,21 @@ There are several ways you can use the ml5.js library: | |
|
||
|
||
|
||
|
||
<p id="latest-version"> | ||
|
||
* You can use the latest version (0.4.0) by adding it to the head section of your HTML document: | ||
* You can use the latest version (0.4.1) by adding it to the head section of your HTML document: | ||
|
||
**v0.4.0** | ||
**v0.4.1** | ||
|
||
<script src="https://unpkg.com/[email protected].0/dist/ml5.min.js" type="text/javascript"></script> | ||
<script src="https://unpkg.com/[email protected].1/dist/ml5.min.js" type="text/javascript"></script> | ||
|
||
</p data-id="latest-version"> | ||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
* If you need to use an earlier version for any reason, you can change the version number. The [previous versions of ml5 can be found here](https://www.npmjs.com/package/ml5). You can use those previous versions by replacing `<version>` with the ml5 version of interest: | ||
|
@@ -49,7 +51,7 @@ There are several ways you can use the ml5.js library: | |
|
||
For example: | ||
```js | ||
<script src="https://unpkg.com/ml5@0.3.1/dist/ml5.min.js" type="text/javascript"></script> | ||
<script src="https://unpkg.com/ml5@0.4.1/dist/ml5.min.js" type="text/javascript"></script> | ||
``` | ||
|
||
* You can also reference "latest", but we do not recommend this as your code may break as we update ml5. | ||
|
@@ -170,6 +172,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d | |
<td align="center"><a href="https://github.com/EmmaGoodliffe"><img src="https://avatars1.githubusercontent.com/u/32788926?v=4" width="100px;" alt="Emma Goodliffe"/><br /><sub><b>Emma Goodliffe</b></sub></a><br /><a href="#ideas-EmmaGoodliffe" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-EmmaGoodliffe" title="Answering Questions">💬</a> <a href="#maintenance-EmmaGoodliffe" title="Maintenance">🚧</a></td> | ||
<td align="center"><a href="http://yangyang.blog"><img src="https://avatars3.githubusercontent.com/u/9332910?v=4" width="100px;" alt="Yang"/><br /><sub><b>Yang</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=EonYang" title="Code">💻</a> <a href="https://github.com/ml5js/ml5-library/issues?q=author%3AEonYang" title="Bug reports">🐛</a></td> | ||
<td align="center"><a href="https://github.com/lydiajessup"><img src="https://avatars3.githubusercontent.com/u/26204298?v=4" width="100px;" alt="Lydia Jessup"/><br /><sub><b>Lydia Jessup</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=lydiajessup" title="Code">💻</a> <a href="#ideas-lydiajessup" title="Ideas, Planning, & Feedback">🤔</a> <a href="#example-lydiajessup" title="Examples">💡</a></td> | ||
<td align="center"><a href="https://coding.garden"><img src="https://avatars0.githubusercontent.com/u/14241866?v=4" width="100px;" alt="CJ R."/><br /><sub><b>CJ R.</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=w3cj" title="Documentation">📖</a> <a href="#content-w3cj" title="Content">🖋</a></td> | ||
</tr> | ||
</table> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,13 +19,13 @@ The fastest way to get started exploring the creative possibilities of ml5.js ar | |
3. You can also copy and paste the cdn link to the ml5 library here: | ||
|
||
``` | ||
<script src="https://unpkg.com/[email protected].0/dist/ml5.min.js"></script> | ||
<script src="https://unpkg.com/[email protected].1/dist/ml5.min.js"></script> | ||
``` | ||
|
||
*** | ||
#### Quickstart: Plain JavaScript | ||
|
||
Reference the [latest version](https://unpkg.com/[email protected].0/dist/ml5.min.js) of ml5.js using a script tag in an HTML file as below: | ||
Reference the [latest version](https://unpkg.com/[email protected].1/dist/ml5.min.js) of ml5.js using a script tag in an HTML file as below: | ||
|
||
|
||
In an **index.html** file, copy and paste the following and open up that file in your web browser. | ||
|
@@ -34,15 +34,15 @@ In an **index.html** file, copy and paste the following and open up that file in | |
<!DOCTYPE html> | ||
<html lang="en"> | ||
<head> | ||
<title>Getting Started with ml5.js and p5.js</title> | ||
<title>Getting Started with ml5.js</title> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
<script src="https://unpkg.com/[email protected].0/dist/ml5.min.js"></script> | ||
<script src="https://unpkg.com/[email protected].1/dist/ml5.min.js"></script> | ||
</head> | ||
|
||
<body> | ||
<script> | ||
// Your code will go here | ||
// open up your console - if everything loaded properly you should see 0.4.0 | ||
// open up your console - if everything loaded properly you should see 0.4.1 | ||
console.log('ml5 version:', ml5.version); | ||
</script> | ||
|
@@ -71,7 +71,7 @@ In an **index.html** file, copy and paste the following and open up that file in | |
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script> | ||
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.sound.min.js"></script> | ||
<!-- ml5 --> | ||
<script src="https://unpkg.com/[email protected].0/dist/ml5.min.js"></script> | ||
<script src="https://unpkg.com/[email protected].1/dist/ml5.min.js"></script> | ||
</head> | ||
|
||
<body> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.