merged from master

This commit is contained in:
Julian Descottes
2012-08-30 01:30:26 +02:00
11 changed files with 9996 additions and 2 deletions

View File

@@ -192,7 +192,6 @@
body.setAttribute('onmouseup', 'piskel.onCanvasMouseup(event)');
drawingAreaContainer.setAttribute('onmousedown', 'piskel.onCanvasMousedown(event)');
drawingAreaContainer.setAttribute('onmousemove', 'piskel.onCanvasMousemove(event)');
this.drawFrameToCanvas(frameSheet.getFrameByIndex(this.getActiveFrameIndex()), drawingAreaCanvas, drawingCanvasDpi);
},
@@ -246,6 +245,7 @@
}
$("display-fps").innerHTML = animPreviewFPS + " fps";
animFPSTuner.value = animPreviewFPS;
$("fps-value").innerHTML = animPreviewFPS + " fps";
refreshUpdater = startPreviewRefresh();
});
},
@@ -482,4 +482,5 @@
window.piskel = piskel;
piskel.init();
})(function(id){return document.getElementById(id)});
})(function(id){return document.getElementById(id)});
//small change for checking my git setup :(