Merge pull request #7 from Orama-Interactive/master

Merge after conflicts

Assets/Graphics/Layers/clone_layer_hover.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/clone_layer_hover.png-122a42327b359a33843a6f637f063bfb.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Layers/clone_layer_hover.png"
+dest_files=[ "res://.import/clone_layer_hover.png-122a42327b359a33843a6f637f063bfb.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Assets/Graphics/Layers/delete_layer_hover.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/delete_layer_hover.png-16bdb6d9b4bbccf3e464cf8615c4ad74.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Layers/delete_layer_hover.png"
+dest_files=[ "res://.import/delete_layer_hover.png-16bdb6d9b4bbccf3e464cf8615c4ad74.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Assets/Graphics/Layers/layer_visible_hover.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/layer_visible_hover.png-d9e0500698eb77cc92513e2c82e90566.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Layers/layer_visible_hover.png"
+dest_files=[ "res://.import/layer_visible_hover.png-d9e0500698eb77cc92513e2c82e90566.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Assets/Graphics/Layers/merge_down_hover.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/merge_down_hover.png-784a31cbd8f9b3d8cd836db6a5b74195.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Layers/merge_down_hover.png"
+dest_files=[ "res://.import/merge_down_hover.png-784a31cbd8f9b3d8cd836db6a5b74195.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Assets/Graphics/Layers/move_down_hover.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/move_down_hover.png-d0aac06e6084b12202dc8a879f5e6a11.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Layers/move_down_hover.png"
+dest_files=[ "res://.import/move_down_hover.png-d0aac06e6084b12202dc8a879f5e6a11.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Assets/Graphics/Layers/move_up_hover.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/move_up_hover.png-9e8c014023835891e72666c758252fe4.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Layers/move_up_hover.png"
+dest_files=[ "res://.import/move_up_hover.png-9e8c014023835891e72666c758252fe4.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Assets/Graphics/Layers/new_layer_hover.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/new_layer_hover.png-3289838446c9e10bb883f5f29f157210.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Layers/new_layer_hover.png"
+dest_files=[ "res://.import/new_layer_hover.png-3289838446c9e10bb883f5f29f157210.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Assets/Graphics/Palette/bubblegum16.json

@@ -1,6 +1,6 @@
 {
-    "name": "BubbleGum16",
-    "colors" : [
+  "name": "BubbleGum16",
+  "colors" : [
     { "data" : "#FF000000", "name" : "no name" },
     { "data" : "#FF7f0622", "name" : "no name" },
     { "data" : "#FFd62411", "name" : "no name" },
@@ -18,6 +18,5 @@
     { "data" : "#FF007899", "name" : "no name" },
     { "data" : "#FF002859", "name" : "no name" },
     ],
-    "comments": "by PineTreePizza - https://twitter.com/PineTreePizza",
-    "editable": false
+    "comments": "by PineTreePizza - https://twitter.com/PineTreePizza"
 }

Assets/Graphics/Palette/default_palette.json

@@ -1,6 +1,6 @@
 {
-    "name": "Default",
-    "colors" : [
+  "name": "Default",
+  "colors" : [
     { "data" : "#FF000000", "name" : "no name" },
     { "data" : "#FF222034", "name" : "no name" },
     { "data" : "#FF45283c", "name" : "no name" },
@@ -33,7 +33,5 @@
     { "data" : "#FFd77bba", "name" : "no name" },
     { "data" : "#FF8f974a", "name" : "no name" },
     { "data" : "#FF8a6f30", "name" : "no name" }
-    ],
-   "comments": "Aseprite default palette",
-   "editable": false
+    ]
 }

Assets/Graphics/Timeline/Go_To_First_Frame_Disabled.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Go_To_First_Frame_Disabled.png-847b83ff8bb78a0a8f232a8912e269a8.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Timeline/Go_To_First_Frame_Disabled.png"
+dest_files=[ "res://.import/Go_To_First_Frame_Disabled.png-847b83ff8bb78a0a8f232a8912e269a8.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Assets/Graphics/Timeline/Go_To_First_Frame_Hover.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Go_To_First_Frame_Hover.png-9c1d7453663385574f36f6c2e2103f20.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Timeline/Go_To_First_Frame_Hover.png"
+dest_files=[ "res://.import/Go_To_First_Frame_Hover.png-9c1d7453663385574f36f6c2e2103f20.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Assets/Graphics/Timeline/Go_To_Last_Frame_Disabled.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Go_To_Last_Frame_Disabled.png-3b5bb115709ade057d733df4ca15d256.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Timeline/Go_To_Last_Frame_Disabled.png"
+dest_files=[ "res://.import/Go_To_Last_Frame_Disabled.png-3b5bb115709ade057d733df4ca15d256.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0