Merge remote-tracking branch 'upstream/master'

README.md

@@ -41,7 +41,6 @@ Suggestions / Planned features:
 	- Show colors which would need to be added to palette
 	- Warning windows for wrong inputs
 	- Hide non-hovered layers
-	- Snap brush preview to pixel grid
 	- Palette option remove unused colors
 	- Move selection with arrows
 	- Update pivot buttons when resizing canvas

js/_createColorPalette.js

@@ -1,5 +1,5 @@
 
-function createColorPalette(selectedPalette, fillBackground, deletePreviousPalette = true) {
+function createColorPalette(paletteColors, fillBackground, deletePreviousPalette = true) {
     //remove current palette
     if (deletePreviousPalette) {
         colors = document.getElementsByClassName('color-button');
@@ -11,8 +11,8 @@ function createColorPalette(selectedPalette, fillBackground, deletePreviousPalet
     var lightestColor = '#000000';
     var darkestColor = '#ffffff';
 
-    for (var i = 0; i < selectedPalette.length; i++) {
-        var newColor = selectedPalette[i];
+    for (var i = 0; i < paletteColors.length; i++) {
+        var newColor = paletteColors[i];
         var newColorElement = addColor(newColor);
 
         var newColorHex = hexToRgb(newColor);

js/_presets.js

@@ -8,7 +8,7 @@ var presets = {
     'PICO-8': {
         width: 128,
         height: 128,
-        palette: 'PICO-8',
+        palette: 'PICO-8'
     },
     'Commodore 64': {
         width: 40,

views/pixel-editor.hbs

@@ -405,6 +405,12 @@
       {{#specifiedPalette}}
       var keepUrl = true;
       {{/specifiedPalette}}
+
+    // Set the default palettes
+    palettes["Commodore 64"] = {"name":"Commodore 64","author":"","colors":["000000","626262","898989","adadad","ffffff","9f4e44","cb7e75","6d5412","a1683c","c9d487","9ae29b","5cab5e","6abfc6","887ecb","50459b","a057a3"]}
+    palettes["PICO-8"] = {"name":"PICO-8","author":"","colors":["000000","1D2B53","7E2553","008751","AB5236","5F574F","C2C3C7","FFF1E8","FF004D","FFA300","FFEC27","00E436","29ADFF","83769C","FF77A8","FFCCAA"]}
+    palettes["Gameboy Color"] = {"name":"Nintendo Gameboy (Black Zero)","author":"","colors":["2e463d","385d49","577b46","7e8416"]}
+
     </script>
     <script src="/pixel-editor/pixel-editor.js"></script>
 </body>