From c2f9f9ae233a4883b62afe54e9e45e5eb262e6f1 Mon Sep 17 00:00:00 2001 From: pepperpepperpepper Date: Mon, 16 Nov 2015 15:08:02 -0800 Subject: ready to merge to main branch --- share/frontend/im/index.html | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'share/frontend/im/index.html') diff --git a/share/frontend/im/index.html b/share/frontend/im/index.html index 9a14e27..c19770f 100755 --- a/share/frontend/im/index.html +++ b/share/frontend/im/index.html @@ -373,10 +373,11 @@ div#controls, span#userlink {

- Mess around with heightmaps and textures Landscape + Draw color codes → Ascii - - Overlay patterns onto your gifs pattern + Mess around with heightmaps and textures → ImLandscape + + Overlay patterns onto your gifs → ImPattern Write your own effects → Shaderblaster & Dither @@ -474,10 +475,8 @@ var Main = $("#output-url").hide() $("#output-img").hide() }, - callback: function (raw) + callback: function (data) { - data = JSON.parse(raw) - console.log(data) Main.generating = false $("#output-cmd").html("size: "+Main.filesize(data.size)+"
" + data.width + " x " + data.height); -- cgit v1.2.3-70-g09d2