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

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