Merge branch 'master' into extract-rendering

2023-08-10 21:12:52 +03:00 · 2012-09-03 23:33:46 +02:00
parent 3e02037b58 e4699da346
commit bd9f8f4489
6 changed files with 125 additions and 63 deletions
--- a/js/piskel.js
+++ b/js/piskel.js
@@ -91,6 +91,7 @@ $.namespace("pskl");
      this.startAnimation();
      
      pskl.ToolSelector.init();
+      pskl.Palette.init(frameSheet);
    },

    getFramesheetIdFromUrl : function() {