Merge remote-tracking branch 'upstream/master'

This commit is contained in:
unsettledgames
2020-09-17 19:24:23 +02:00
parent 37a532236b
commit d6b292a443
4 changed files with 10 additions and 5 deletions

View File

@ -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);

View File

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