Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert palette file format back to JSON #967

Merged
merged 23 commits into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f6e8a42
Some static typing and use notification to check if the theme has cha…
OverloadedOrama Dec 20, 2023
b4f08a7
Use Vector2i for scrolling, hide scrollbars in the node properties
OverloadedOrama Dec 20, 2023
1aa5e9a
More static typing improvements
OverloadedOrama Dec 20, 2023
8da8355
More static typing & docstring improvements, remove some methods from…
OverloadedOrama Dec 20, 2023
9b4712e
[WIP] Go back to json for palettes instead of tres
OverloadedOrama Dec 21, 2023
eef5236
Revert back to using dictionaries for palette colors instead of array
OverloadedOrama Dec 21, 2023
5963148
Read width & height from files, don't store the name
OverloadedOrama Dec 21, 2023
68db6fc
Fix palette renaming
OverloadedOrama Dec 21, 2023
32cfe43
Copy non-json palettes into json files
OverloadedOrama Dec 21, 2023
50fab0f
Fix palette duplication
OverloadedOrama Dec 21, 2023
69cb185
Add a new _fill_imported_palette_with_colors() to avoid duplicate cod…
OverloadedOrama Dec 21, 2023
42a7ee4
Fix palette file importing when not initialising
OverloadedOrama Dec 21, 2023
7f98711
Export palettes as images
OverloadedOrama Dec 21, 2023
5b5ecb5
Replace "tres" with "json" filter in the open sprite dialog
OverloadedOrama Dec 21, 2023
b527236
When exporting a palette as an image, automatically set the file name…
OverloadedOrama Dec 21, 2023
95201c0
Replace default palette files with json
OverloadedOrama Dec 21, 2023
8f3c5e2
Remove the Global.palette_panel variable, use signals instead.
OverloadedOrama Dec 22, 2023
1498ebc
Static typing in signals
OverloadedOrama Dec 22, 2023
ee85c50
Fix warning in Palettes.gd
OverloadedOrama Dec 22, 2023
3ee0ba4
Fix formatting
OverloadedOrama Dec 22, 2023
e6b3656
Add missing comments to the palette files
OverloadedOrama Dec 22, 2023
4a8b53e
Update Palettes.gd
OverloadedOrama Dec 22, 2023
54d3328
A few more static typing improvements
OverloadedOrama Dec 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 71 additions & 0 deletions pixelorama_data/Palettes/BubbleGum16.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"colors": [
{
"color": "(0.0824, 0.0902, 0.102, 1)",
"index": 0
},
{
"color": "(0.4941, 0.0196, 0.1294, 1)",
"index": 1
},
{
"color": "(0.8392, 0.1373, 0.0667, 1)",
"index": 2
},
{
"color": "(1, 0.5137, 0.149, 1)",
"index": 3
},
{
"color": "(1, 0.8196, 0, 1)",
"index": 4
},
{
"color": "(0.9765, 0.9922, 1, 1)",
"index": 5
},
{
"color": "(1, 0.502, 0.6392, 1)",
"index": 6
},
{
"color": "(1, 0.149, 0.4549, 1)",
"index": 7
},
{
"color": "(0.5765, 0.1294, 0.4118, 1)",
"index": 8
},
{
"color": "(0.2588, 0, 0.4039, 1)",
"index": 9
},
{
"color": "(0.1373, 0.2863, 0.4588, 1)",
"index": 10
},
{
"color": "(0.4039, 0.6824, 0.8314, 1)",
"index": 11
},
{
"color": "(0.749, 1, 0.2314, 1)",
"index": 12
},
{
"color": "(0.0627, 0.8196, 0.4588, 1)",
"index": 13
},
{
"color": "(0, 0.4667, 0.6, 1)",
"index": 14
},
{
"color": "(0, 0.1569, 0.349, 1)",
"index": 15
}
],
"comment": "Author: PineTreePizza\nFound in Lospec by CheetoHead/greusser\nhttps://lospec.com/palette-list/bubblegum-16",
"height": 2,
"width": 8
}
113 changes: 0 additions & 113 deletions pixelorama_data/Palettes/BubbleGum16.tres

This file was deleted.

107 changes: 107 additions & 0 deletions pixelorama_data/Palettes/Complementary.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
{
"colors": [
{
"color": "(0.702, 0.3137, 0.0078, 1)",
"index": 0
},
{
"color": "(1, 0.6, 0.2667, 1)",
"index": 1
},
{
"color": "(1, 0.4392, 0, 1)",
"index": 2
},
{
"color": "(0, 0.6, 0.702, 1)",
"index": 3
},
{
"color": "(0, 0.8549, 1, 1)",
"index": 4
},
{
"color": "(0.702, 0.0078, 0.0078, 1)",
"index": 5
},
{
"color": "(1, 0.2667, 0.2667, 1)",
"index": 6
},
{
"color": "(1, 0.0078, 0.0039, 1)",
"index": 7
},
{
"color": "(0, 0.702, 0.2, 1)",
"index": 8
},
{
"color": "(0, 1, 0.2824, 1)",
"index": 9
},
{
"color": "(0.502, 0.0078, 0.702, 1)",
"index": 10
},
{
"color": "(0.7922, 0.2667, 1, 1)",
"index": 11
},
{
"color": "(0.702, 0, 0.9922, 1)",
"index": 12
},
{
"color": "(0.4941, 0.702, 0, 1)",
"index": 13
},
{
"color": "(0.7098, 1, 0, 1)",
"index": 14
},
{
"color": "(0.0078, 0.0667, 0.702, 1)",
"index": 15
},
{
"color": "(0.2667, 0.3294, 1, 1)",
"index": 16
},
{
"color": "(0.0039, 0.0824, 1, 1)",
"index": 17
},
{
"color": "(0.702, 0.549, 0, 1)",
"index": 18
},
{
"color": "(1, 0.7843, 0, 1)",
"index": 19
},
{
"color": "(0.0078, 0.6196, 0.702, 1)",
"index": 20
},
{
"color": "(0.4745, 0.9373, 1, 1)",
"index": 21
},
{
"color": "(0, 0.8824, 1, 1)",
"index": 22
},
{
"color": "(0.702, 0.302, 0, 1)",
"index": 23
},
{
"color": "(1, 0.4314, 0, 1)",
"index": 24
}
],
"comment": "Author: Erevoid",
"height": 4,
"width": 8
}
Loading