diff --git a/Assets/Graphics/Light Themes/Layers/Clone_Layer.png b/Assets/Graphics/Light Themes/Layers/Clone_Layer.png index 0b722f36b..aa5c6dd21 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Clone_Layer.png and b/Assets/Graphics/Light Themes/Layers/Clone_Layer.png differ diff --git a/Assets/Graphics/Light Themes/Layers/Delete_Layer.png b/Assets/Graphics/Light Themes/Layers/Delete_Layer.png index 70a61bb34..787cf86ac 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Delete_Layer.png and b/Assets/Graphics/Light Themes/Layers/Delete_Layer.png differ diff --git a/Assets/Graphics/Light Themes/Layers/Layer_Invisible.png b/Assets/Graphics/Light Themes/Layers/Layer_Invisible.png index ca0296dbd..4000e347c 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Layer_Invisible.png and b/Assets/Graphics/Light Themes/Layers/Layer_Invisible.png differ diff --git a/Assets/Graphics/Light Themes/Layers/Layer_Visible.png b/Assets/Graphics/Light Themes/Layers/Layer_Visible.png index b405fa5bb..a236268ef 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Layer_Visible.png and b/Assets/Graphics/Light Themes/Layers/Layer_Visible.png differ diff --git a/Assets/Graphics/Light Themes/Layers/Merge_Down.png b/Assets/Graphics/Light Themes/Layers/Merge_Down.png index a0215bd8d..1fa720635 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Merge_Down.png and b/Assets/Graphics/Light Themes/Layers/Merge_Down.png differ diff --git a/Assets/Graphics/Light Themes/Layers/Move_Down.png b/Assets/Graphics/Light Themes/Layers/Move_Down.png index cba033866..2a90ff9c9 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Move_Down.png and b/Assets/Graphics/Light Themes/Layers/Move_Down.png differ diff --git a/Assets/Graphics/Light Themes/Layers/Move_Up.png b/Assets/Graphics/Light Themes/Layers/Move_Up.png index 8a93cec7b..7551644df 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Move_Up.png and b/Assets/Graphics/Light Themes/Layers/Move_Up.png differ diff --git a/Assets/Graphics/Light Themes/Layers/New_Layer.png b/Assets/Graphics/Light Themes/Layers/New_Layer.png index 0642c0e82..4d08c51d1 100644 Binary files a/Assets/Graphics/Light Themes/Layers/New_Layer.png and b/Assets/Graphics/Light Themes/Layers/New_Layer.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Go_To_First_Frame.png b/Assets/Graphics/Light Themes/Timeline/Go_To_First_Frame.png index f14ad5496..bc9753370 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Go_To_First_Frame.png and b/Assets/Graphics/Light Themes/Timeline/Go_To_First_Frame.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Go_To_Last_Frame.png b/Assets/Graphics/Light Themes/Timeline/Go_To_Last_Frame.png index beea38bde..99633ba3f 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Go_To_Last_Frame.png and b/Assets/Graphics/Light Themes/Timeline/Go_To_Last_Frame.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Loop.png b/Assets/Graphics/Light Themes/Timeline/Loop.png index d08f65f34..c9fb1263b 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Loop.png and b/Assets/Graphics/Light Themes/Timeline/Loop.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Loop_None.png b/Assets/Graphics/Light Themes/Timeline/Loop_None.png index 6b3332ee0..e81dd6210 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Loop_None.png and b/Assets/Graphics/Light Themes/Timeline/Loop_None.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Loop_PingPong.png b/Assets/Graphics/Light Themes/Timeline/Loop_PingPong.png index 926c6fe76..f05dfa07f 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Loop_PingPong.png and b/Assets/Graphics/Light Themes/Timeline/Loop_PingPong.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/New_Frame.png b/Assets/Graphics/Light Themes/Timeline/New_Frame.png index 3e0066482..3a430ba42 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/New_Frame.png and b/Assets/Graphics/Light Themes/Timeline/New_Frame.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Next_Frame.png b/Assets/Graphics/Light Themes/Timeline/Next_Frame.png index 24372b939..47e25780b 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Next_Frame.png and b/Assets/Graphics/Light Themes/Timeline/Next_Frame.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Pause.png b/Assets/Graphics/Light Themes/Timeline/Pause.png index 4f947f0c2..fa2ceb299 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Pause.png and b/Assets/Graphics/Light Themes/Timeline/Pause.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Play Backwards.png b/Assets/Graphics/Light Themes/Timeline/Play Backwards.png index 924bec462..e606af394 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Play Backwards.png and b/Assets/Graphics/Light Themes/Timeline/Play Backwards.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Play.png b/Assets/Graphics/Light Themes/Timeline/Play.png index 127fd0e52..4102993f2 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Play.png and b/Assets/Graphics/Light Themes/Timeline/Play.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Previous_Frame.png b/Assets/Graphics/Light Themes/Timeline/Previous_Frame.png index 327a63188..c5f12e4ad 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Previous_Frame.png and b/Assets/Graphics/Light Themes/Timeline/Previous_Frame.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Brush.png b/Assets/Graphics/Light Themes/Tools/Brush.png index e97dc8cc8..2c245085e 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Brush.png and b/Assets/Graphics/Light Themes/Tools/Brush.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Brush_l.png b/Assets/Graphics/Light Themes/Tools/Brush_l.png index ae2919e07..2104df551 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Brush_l.png and b/Assets/Graphics/Light Themes/Tools/Brush_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Brush_r.png b/Assets/Graphics/Light Themes/Tools/Brush_r.png index 67d3dfde8..85b0afa6c 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Brush_r.png and b/Assets/Graphics/Light Themes/Tools/Brush_r.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Bucket.png b/Assets/Graphics/Light Themes/Tools/Bucket.png index 63d118768..8e80c9bc9 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Bucket.png and b/Assets/Graphics/Light Themes/Tools/Bucket.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Bucket_l.png b/Assets/Graphics/Light Themes/Tools/Bucket_l.png index 3ef679bf7..d285efa0c 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Bucket_l.png and b/Assets/Graphics/Light Themes/Tools/Bucket_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Bucket_r.png b/Assets/Graphics/Light Themes/Tools/Bucket_r.png index 4c4cdb2d9..c0bd7bef7 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Bucket_r.png and b/Assets/Graphics/Light Themes/Tools/Bucket_r.png differ diff --git a/Assets/Graphics/Light Themes/Tools/ColorPicker.png b/Assets/Graphics/Light Themes/Tools/ColorPicker.png index 095eceed6..b693c5af2 100644 Binary files a/Assets/Graphics/Light Themes/Tools/ColorPicker.png and b/Assets/Graphics/Light Themes/Tools/ColorPicker.png differ diff --git a/Assets/Graphics/Light Themes/Tools/ColorPicker_l.png b/Assets/Graphics/Light Themes/Tools/ColorPicker_l.png index 86f59c7f5..2ed36f7a9 100644 Binary files a/Assets/Graphics/Light Themes/Tools/ColorPicker_l.png and b/Assets/Graphics/Light Themes/Tools/ColorPicker_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/ColorPicker_r.png b/Assets/Graphics/Light Themes/Tools/ColorPicker_r.png index 7a85f6993..e17385fbc 100644 Binary files a/Assets/Graphics/Light Themes/Tools/ColorPicker_r.png and b/Assets/Graphics/Light Themes/Tools/ColorPicker_r.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Eraser.png b/Assets/Graphics/Light Themes/Tools/Eraser.png index 53b59385d..c7280214f 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Eraser.png and b/Assets/Graphics/Light Themes/Tools/Eraser.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Eraser_l.png b/Assets/Graphics/Light Themes/Tools/Eraser_l.png index 400f8f99f..a676602f2 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Eraser_l.png and b/Assets/Graphics/Light Themes/Tools/Eraser_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Eraser_r.png b/Assets/Graphics/Light Themes/Tools/Eraser_r.png index eedda6419..2c8beb5ba 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Eraser_r.png and b/Assets/Graphics/Light Themes/Tools/Eraser_r.png differ diff --git a/Assets/Graphics/Light Themes/Tools/LightenDarken.png b/Assets/Graphics/Light Themes/Tools/LightenDarken.png index adfa57fe0..f6d3dc6c1 100644 Binary files a/Assets/Graphics/Light Themes/Tools/LightenDarken.png and b/Assets/Graphics/Light Themes/Tools/LightenDarken.png differ diff --git a/Assets/Graphics/Light Themes/Tools/LightenDarken_l.png b/Assets/Graphics/Light Themes/Tools/LightenDarken_l.png index 266dc779e..33a009e9b 100644 Binary files a/Assets/Graphics/Light Themes/Tools/LightenDarken_l.png and b/Assets/Graphics/Light Themes/Tools/LightenDarken_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/LightenDarken_r.png b/Assets/Graphics/Light Themes/Tools/LightenDarken_r.png index d28a7ada4..d3f3a8007 100644 Binary files a/Assets/Graphics/Light Themes/Tools/LightenDarken_r.png and b/Assets/Graphics/Light Themes/Tools/LightenDarken_r.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Pencil.png b/Assets/Graphics/Light Themes/Tools/Pencil.png index 27c4ea992..3b61a0324 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Pencil.png and b/Assets/Graphics/Light Themes/Tools/Pencil.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Pencil_l.png b/Assets/Graphics/Light Themes/Tools/Pencil_l.png index 8d890050f..388d38451 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Pencil_l.png and b/Assets/Graphics/Light Themes/Tools/Pencil_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Pencil_r.png b/Assets/Graphics/Light Themes/Tools/Pencil_r.png index 779517c9e..6f4fd0fc5 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Pencil_r.png and b/Assets/Graphics/Light Themes/Tools/Pencil_r.png differ diff --git a/Assets/Graphics/Light Themes/Tools/RectSelect.png b/Assets/Graphics/Light Themes/Tools/RectSelect.png index af5517590..2a4e1d8c9 100644 Binary files a/Assets/Graphics/Light Themes/Tools/RectSelect.png and b/Assets/Graphics/Light Themes/Tools/RectSelect.png differ diff --git a/Assets/Graphics/Light Themes/Tools/RectSelect_l.png b/Assets/Graphics/Light Themes/Tools/RectSelect_l.png index 6339c87b3..a18ff569d 100644 Binary files a/Assets/Graphics/Light Themes/Tools/RectSelect_l.png and b/Assets/Graphics/Light Themes/Tools/RectSelect_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/RectSelect_r.png b/Assets/Graphics/Light Themes/Tools/RectSelect_r.png index de73bf5f0..23892a427 100644 Binary files a/Assets/Graphics/Light Themes/Tools/RectSelect_r.png and b/Assets/Graphics/Light Themes/Tools/RectSelect_r.png differ diff --git a/Scripts/Import.gd b/Scripts/Import.gd index d781a2c55..b3b3f5d2a 100644 --- a/Scripts/Import.gd +++ b/Scripts/Import.gd @@ -1,13 +1,5 @@ extends Node -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" - -# Called when the node enters the scene tree for the first time. -func _ready(): - pass # Replace with function body. - func import_gpl(path : String) -> Palette: var result : Palette = null var file = File.new() @@ -28,7 +20,7 @@ func import_gpl(path : String) -> Palette: var name_end = path.find_last('.') if name_end > name_start: result.name = path.substr(name_start, name_end - name_start) - + # Comments if line.begins_with('#'): comments += line.trim_prefix('#') + '\n' @@ -41,13 +33,9 @@ func import_gpl(path : String) -> Palette: var color = Color(red, green, blue) result.add_color(color, name) line_number += 1 - + if result: result.comments = comments file.close() - - return result -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta): -# pass + return result diff --git a/Scripts/Palette/PaletteContainer.gd b/Scripts/Palette/PaletteContainer.gd index 7649918ca..fc2e0c216 100644 --- a/Scripts/Palette/PaletteContainer.gd +++ b/Scripts/Palette/PaletteContainer.gd @@ -51,7 +51,7 @@ func on_palette_import_file_selected(path) -> void: palette = Palette.new().load_from_file(path) elif path.to_lower().ends_with("gpl"): palette = Import.import_gpl(path) - + if palette: if not Global.palettes.has(palette.name): Global.palettes[palette.name] = palette @@ -216,5 +216,5 @@ func _delete_palette_file(file_name : String) -> void: func save_palette(palette_name : String, filename : String) -> void: var palette = Global.palettes[palette_name] - + palette.save_to_file("user://palettes/custom/" + filename)