summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpommicket <leonardomtenenbaum@gmail.com>2016-06-19 12:49:18 -0400
committerpommicket <leonardomtenenbaum@gmail.com>2016-06-19 12:49:18 -0400
commitec5e23a5c759d1e4306d1a9f75d6444d3e94be0b (patch)
treeef7ac64de956dd8458e97d483d369045d85b0465
parentce071a9d599b53c3678e705feb68644bdc8a211d (diff)
parent670c1e2ce075179292e07e0a89aacd52bfd25799 (diff)
Merge branch 'master' of https://github.com/pommicket/AutoArt
-rw-r--r--README.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/README.md b/README.md
index 33891db..de70085 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,18 @@
# AutoArt
A computer program that generates art
+**AutoArt now has an [Android app](https://github.com/pommicket/AutoArtAndroid).**
+
+**[AutoCam](http://github.com/pommicket/AutoCam) uses videos from your webcam to generate AutoArt!**
+
AutoArt uses [stb_image](https://github.com/nothings/stb) to create images.
For an online version of AutoArt go to http://autoart.neocities.org
For a faster version of AutoArt that runs on your GPU, try [AutoArtGPU](http://github.com/pommicket/AutoArtGPU). Note that this has many more dependencies than AutoArt, so it will be harder to install.
+An explanation of how AutoArt works can be found [here](http://autoart.neocities.org/explanation.html).
+
**AutoVideos (not AutoImages) requires avconv**
**Mac OSX is not supported. If you want to run AutoArt on a Mac, either compile the source code yourself, go to the [online version](http://autoart.neocities.org), or try [AutoArtGPU](http://github.com/pommicket/AutoArtGPU).**
@@ -31,3 +37,5 @@ On Debian/Ubuntu just run the following command:
```
sudo apt-get install libav-tools
```
+
+