diff --git a/.gitignore b/.gitignore index 0f14fc402..8c051aa3e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ export_presets.cfg Scripts/Old/ -Assets/Graphics/Tools/ diff --git a/Assets/Fonts/Roboto-Small.tres b/Assets/Fonts/Roboto-Small.tres index 57bb57983..b2ad89a7f 100644 --- a/Assets/Fonts/Roboto-Small.tres +++ b/Assets/Fonts/Roboto-Small.tres @@ -3,7 +3,6 @@ [ext_resource path="res://Assets/Fonts/Roboto-Regular.ttf" type="DynamicFontData" id=1] [resource] -size = 8 +size = 10 use_mipmaps = true -use_filter = true font_data = ExtResource( 1 ) diff --git a/Assets/Graphics/Layers/clone_layer.png b/Assets/Graphics/Layers/clone_layer.png new file mode 100644 index 000000000..eef163f33 Binary files /dev/null and b/Assets/Graphics/Layers/clone_layer.png differ diff --git a/Assets/Graphics/Layers/clone_layer.png.import b/Assets/Graphics/Layers/clone_layer.png.import new file mode 100644 index 000000000..7acc16a4c --- /dev/null +++ b/Assets/Graphics/Layers/clone_layer.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/clone_layer.png-279472503c17fbe5679d112c3642c8e1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/clone_layer.png" +dest_files=[ "res://.import/clone_layer.png-279472503c17fbe5679d112c3642c8e1.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 diff --git a/Assets/Graphics/Layers/delete_layer.png b/Assets/Graphics/Layers/delete_layer.png new file mode 100644 index 000000000..ff38e3c4c Binary files /dev/null and b/Assets/Graphics/Layers/delete_layer.png differ diff --git a/Assets/Graphics/Layers/delete_layer.png.import b/Assets/Graphics/Layers/delete_layer.png.import new file mode 100644 index 000000000..123888532 --- /dev/null +++ b/Assets/Graphics/Layers/delete_layer.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/delete_layer.png-fe431fecde99d8e928adbcd8ce5355c9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/delete_layer.png" +dest_files=[ "res://.import/delete_layer.png-fe431fecde99d8e928adbcd8ce5355c9.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 diff --git a/Assets/Graphics/Layers/delete_layer_disabled.png b/Assets/Graphics/Layers/delete_layer_disabled.png new file mode 100644 index 000000000..7b2bcc3cb Binary files /dev/null and b/Assets/Graphics/Layers/delete_layer_disabled.png differ diff --git a/Assets/Graphics/Layers/delete_layer_disabled.png.import b/Assets/Graphics/Layers/delete_layer_disabled.png.import new file mode 100644 index 000000000..2a7e3743f --- /dev/null +++ b/Assets/Graphics/Layers/delete_layer_disabled.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/delete_layer_disabled.png-9787176ae926b9fa36516deece94659d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/delete_layer_disabled.png" +dest_files=[ "res://.import/delete_layer_disabled.png-9787176ae926b9fa36516deece94659d.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 diff --git a/Assets/Graphics/Layers/layer_invisible.png b/Assets/Graphics/Layers/layer_invisible.png new file mode 100644 index 000000000..6159669dc Binary files /dev/null and b/Assets/Graphics/Layers/layer_invisible.png differ diff --git a/Assets/Graphics/Layers/layer_invisible.png.import b/Assets/Graphics/Layers/layer_invisible.png.import new file mode 100644 index 000000000..3f83580d5 --- /dev/null +++ b/Assets/Graphics/Layers/layer_invisible.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/layer_invisible.png-c53d1765a791b50fd1bee230ac626083.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/layer_invisible.png" +dest_files=[ "res://.import/layer_invisible.png-c53d1765a791b50fd1bee230ac626083.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 diff --git a/Assets/Graphics/Layers/layer_visible.png b/Assets/Graphics/Layers/layer_visible.png new file mode 100644 index 000000000..0a6c39ee7 Binary files /dev/null and b/Assets/Graphics/Layers/layer_visible.png differ diff --git a/Assets/Graphics/Layers/layer_visible.png.import b/Assets/Graphics/Layers/layer_visible.png.import new file mode 100644 index 000000000..b6d5cb198 --- /dev/null +++ b/Assets/Graphics/Layers/layer_visible.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/layer_visible.png-66b5f937e71944a9789ca41e5221eb9d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/layer_visible.png" +dest_files=[ "res://.import/layer_visible.png-66b5f937e71944a9789ca41e5221eb9d.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 diff --git a/Assets/Graphics/Layers/merge_down.png b/Assets/Graphics/Layers/merge_down.png new file mode 100644 index 000000000..06527e155 Binary files /dev/null and b/Assets/Graphics/Layers/merge_down.png differ diff --git a/Assets/Graphics/Layers/merge_down.png.import b/Assets/Graphics/Layers/merge_down.png.import new file mode 100644 index 000000000..c703be84e --- /dev/null +++ b/Assets/Graphics/Layers/merge_down.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/merge_down.png-ee1d1ef0f9a1d548d1a41a439b5896d9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/merge_down.png" +dest_files=[ "res://.import/merge_down.png-ee1d1ef0f9a1d548d1a41a439b5896d9.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 diff --git a/Assets/Graphics/Layers/merge_down_disabled.png b/Assets/Graphics/Layers/merge_down_disabled.png new file mode 100644 index 000000000..1eb3b767d Binary files /dev/null and b/Assets/Graphics/Layers/merge_down_disabled.png differ diff --git a/Assets/Graphics/Layers/merge_down_disabled.png.import b/Assets/Graphics/Layers/merge_down_disabled.png.import new file mode 100644 index 000000000..21ec1cd16 --- /dev/null +++ b/Assets/Graphics/Layers/merge_down_disabled.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/merge_down_disabled.png-88c80db811d4ff967e4694f9c3d8931a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/merge_down_disabled.png" +dest_files=[ "res://.import/merge_down_disabled.png-88c80db811d4ff967e4694f9c3d8931a.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 diff --git a/Assets/Graphics/Layers/move_down.png b/Assets/Graphics/Layers/move_down.png new file mode 100644 index 000000000..cb190559d Binary files /dev/null and b/Assets/Graphics/Layers/move_down.png differ diff --git a/Assets/Graphics/Layers/move_down.png.import b/Assets/Graphics/Layers/move_down.png.import new file mode 100644 index 000000000..50db7d9fe --- /dev/null +++ b/Assets/Graphics/Layers/move_down.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/move_down.png-65130d96bfd7c31d5482cfd379fef210.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/move_down.png" +dest_files=[ "res://.import/move_down.png-65130d96bfd7c31d5482cfd379fef210.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 diff --git a/Assets/Graphics/Layers/move_down_disabled.png b/Assets/Graphics/Layers/move_down_disabled.png new file mode 100644 index 000000000..f4a05c970 Binary files /dev/null and b/Assets/Graphics/Layers/move_down_disabled.png differ diff --git a/Assets/Graphics/Layers/move_down_disabled.png.import b/Assets/Graphics/Layers/move_down_disabled.png.import new file mode 100644 index 000000000..e224d7e49 --- /dev/null +++ b/Assets/Graphics/Layers/move_down_disabled.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/move_down_disabled.png-fd68ed035a9b6c92f28dccf5a9728b76.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/move_down_disabled.png" +dest_files=[ "res://.import/move_down_disabled.png-fd68ed035a9b6c92f28dccf5a9728b76.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 diff --git a/Assets/Graphics/Layers/move_left.png b/Assets/Graphics/Layers/move_left.png new file mode 100644 index 000000000..fc086f386 Binary files /dev/null and b/Assets/Graphics/Layers/move_left.png differ diff --git a/Assets/Graphics/Layers/move_left.png.import b/Assets/Graphics/Layers/move_left.png.import new file mode 100644 index 000000000..63ab3a2f7 --- /dev/null +++ b/Assets/Graphics/Layers/move_left.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/move_left.png-ff1b5a8cc38e9ffb1873d78dfac72da4.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/move_left.png" +dest_files=[ "res://.import/move_left.png-ff1b5a8cc38e9ffb1873d78dfac72da4.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 diff --git a/Assets/Graphics/Layers/move_left_disabled.png b/Assets/Graphics/Layers/move_left_disabled.png new file mode 100644 index 000000000..26a78390e Binary files /dev/null and b/Assets/Graphics/Layers/move_left_disabled.png differ diff --git a/Assets/Graphics/Layers/move_left_disabled.png.import b/Assets/Graphics/Layers/move_left_disabled.png.import new file mode 100644 index 000000000..1b59fb520 --- /dev/null +++ b/Assets/Graphics/Layers/move_left_disabled.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/move_left_disabled.png-74972afc2ca24eab252e7f2236af9a0f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/move_left_disabled.png" +dest_files=[ "res://.import/move_left_disabled.png-74972afc2ca24eab252e7f2236af9a0f.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 diff --git a/Assets/Graphics/Layers/move_right.png b/Assets/Graphics/Layers/move_right.png new file mode 100644 index 000000000..c8e3a2661 Binary files /dev/null and b/Assets/Graphics/Layers/move_right.png differ diff --git a/Assets/Graphics/Layers/move_right.png.import b/Assets/Graphics/Layers/move_right.png.import new file mode 100644 index 000000000..030a93f3c --- /dev/null +++ b/Assets/Graphics/Layers/move_right.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/move_right.png-b7cf2eac97df90530e52eb0d3043c58b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/move_right.png" +dest_files=[ "res://.import/move_right.png-b7cf2eac97df90530e52eb0d3043c58b.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 diff --git a/Assets/Graphics/Layers/move_right_disabled.png b/Assets/Graphics/Layers/move_right_disabled.png new file mode 100644 index 000000000..77914a628 Binary files /dev/null and b/Assets/Graphics/Layers/move_right_disabled.png differ diff --git a/Assets/Graphics/Layers/move_right_disabled.png.import b/Assets/Graphics/Layers/move_right_disabled.png.import new file mode 100644 index 000000000..42f58229d --- /dev/null +++ b/Assets/Graphics/Layers/move_right_disabled.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/move_right_disabled.png-5171252fb7107f80376b45c01a460458.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/move_right_disabled.png" +dest_files=[ "res://.import/move_right_disabled.png-5171252fb7107f80376b45c01a460458.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 diff --git a/Assets/Graphics/Layers/move_up.png b/Assets/Graphics/Layers/move_up.png new file mode 100644 index 000000000..2611a6fbc Binary files /dev/null and b/Assets/Graphics/Layers/move_up.png differ diff --git a/Assets/Graphics/Layers/move_up.png.import b/Assets/Graphics/Layers/move_up.png.import new file mode 100644 index 000000000..c268def27 --- /dev/null +++ b/Assets/Graphics/Layers/move_up.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/move_up.png-9895dea38f2278e29ccd57255b73d087.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/move_up.png" +dest_files=[ "res://.import/move_up.png-9895dea38f2278e29ccd57255b73d087.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 diff --git a/Assets/Graphics/Layers/move_up_disabled.png b/Assets/Graphics/Layers/move_up_disabled.png new file mode 100644 index 000000000..b78fce3de Binary files /dev/null and b/Assets/Graphics/Layers/move_up_disabled.png differ diff --git a/Assets/Graphics/Layers/move_up_disabled.png.import b/Assets/Graphics/Layers/move_up_disabled.png.import new file mode 100644 index 000000000..8ec37620f --- /dev/null +++ b/Assets/Graphics/Layers/move_up_disabled.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/move_up_disabled.png-8e6b06911250d113cafbba4329d2320d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/move_up_disabled.png" +dest_files=[ "res://.import/move_up_disabled.png-8e6b06911250d113cafbba4329d2320d.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 diff --git a/Assets/Graphics/Layers/new_layer.png b/Assets/Graphics/Layers/new_layer.png new file mode 100644 index 000000000..f38052fe4 Binary files /dev/null and b/Assets/Graphics/Layers/new_layer.png differ diff --git a/Assets/Graphics/Layers/new_layer.png.import b/Assets/Graphics/Layers/new_layer.png.import new file mode 100644 index 000000000..63de2dac9 --- /dev/null +++ b/Assets/Graphics/Layers/new_layer.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/new_layer.png-6f042042bc418daa72142f41f436a47c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/new_layer.png" +dest_files=[ "res://.import/new_layer.png-6f042042bc418daa72142f41f436a47c.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 diff --git a/Assets/Graphics/Layers/pause.png b/Assets/Graphics/Layers/pause.png new file mode 100644 index 000000000..5a4fd40ca Binary files /dev/null and b/Assets/Graphics/Layers/pause.png differ diff --git a/Assets/Graphics/Layers/pause.png.import b/Assets/Graphics/Layers/pause.png.import new file mode 100644 index 000000000..925901ae1 --- /dev/null +++ b/Assets/Graphics/Layers/pause.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/pause.png-48c57b4119e52ddae9386734c5fbb017.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/pause.png" +dest_files=[ "res://.import/pause.png-48c57b4119e52ddae9386734c5fbb017.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 diff --git a/Assets/Graphics/Layers/play backwards.png b/Assets/Graphics/Layers/play backwards.png new file mode 100644 index 000000000..060df298b Binary files /dev/null and b/Assets/Graphics/Layers/play backwards.png differ diff --git a/Assets/Graphics/Layers/play backwards.png.import b/Assets/Graphics/Layers/play backwards.png.import new file mode 100644 index 000000000..0279887fb --- /dev/null +++ b/Assets/Graphics/Layers/play backwards.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/play backwards.png-3771bca2f38de343da7b136421a808f9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/play backwards.png" +dest_files=[ "res://.import/play backwards.png-3771bca2f38de343da7b136421a808f9.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 diff --git a/Assets/Graphics/Layers/play forward.png b/Assets/Graphics/Layers/play forward.png new file mode 100644 index 000000000..e4ba41670 Binary files /dev/null and b/Assets/Graphics/Layers/play forward.png differ diff --git a/Assets/Graphics/Layers/play forward.png.import b/Assets/Graphics/Layers/play forward.png.import new file mode 100644 index 000000000..e56a47255 --- /dev/null +++ b/Assets/Graphics/Layers/play forward.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/play forward.png-ef93d267dd7a1d3484c44e6a9c669746.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Layers/play forward.png" +dest_files=[ "res://.import/play forward.png-ef93d267dd7a1d3484c44e6a9c669746.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 diff --git a/Assets/Graphics/Timeline/Go_To_First_Frame.png b/Assets/Graphics/Timeline/Go_To_First_Frame.png new file mode 100644 index 000000000..f6a300920 Binary files /dev/null and b/Assets/Graphics/Timeline/Go_To_First_Frame.png differ diff --git a/Assets/Graphics/Timeline/Go_To_First_Frame.png.import b/Assets/Graphics/Timeline/Go_To_First_Frame.png.import new file mode 100644 index 000000000..e9cfe1ebe --- /dev/null +++ b/Assets/Graphics/Timeline/Go_To_First_Frame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Go_To_First_Frame.png-f2cc5dda21fd600ff41ec5fd5105bf36.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Timeline/Go_To_First_Frame.png" +dest_files=[ "res://.import/Go_To_First_Frame.png-f2cc5dda21fd600ff41ec5fd5105bf36.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 diff --git a/Assets/Graphics/Timeline/Go_To_Last_Frame.png b/Assets/Graphics/Timeline/Go_To_Last_Frame.png new file mode 100644 index 000000000..a05812a54 Binary files /dev/null and b/Assets/Graphics/Timeline/Go_To_Last_Frame.png differ diff --git a/Assets/Graphics/Timeline/Go_To_Last_Frame.png.import b/Assets/Graphics/Timeline/Go_To_Last_Frame.png.import new file mode 100644 index 000000000..881e48642 --- /dev/null +++ b/Assets/Graphics/Timeline/Go_To_Last_Frame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Go_To_Last_Frame.png-4a57163dfbe1a36e70ba5ee4d2741665.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Timeline/Go_To_Last_Frame.png" +dest_files=[ "res://.import/Go_To_Last_Frame.png-4a57163dfbe1a36e70ba5ee4d2741665.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 diff --git a/Assets/Graphics/Timeline/Loop.png b/Assets/Graphics/Timeline/Loop.png new file mode 100644 index 000000000..92832313d Binary files /dev/null and b/Assets/Graphics/Timeline/Loop.png differ diff --git a/Assets/Graphics/Timeline/Loop.png.import b/Assets/Graphics/Timeline/Loop.png.import new file mode 100644 index 000000000..9061c5134 --- /dev/null +++ b/Assets/Graphics/Timeline/Loop.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Loop.png-3640aee4edc274cbc6faec13d4b8b787.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Timeline/Loop.png" +dest_files=[ "res://.import/Loop.png-3640aee4edc274cbc6faec13d4b8b787.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 diff --git a/Assets/Graphics/Timeline/Loop_None.png b/Assets/Graphics/Timeline/Loop_None.png new file mode 100644 index 000000000..9f1035def Binary files /dev/null and b/Assets/Graphics/Timeline/Loop_None.png differ diff --git a/Assets/Graphics/Timeline/Loop_None.png.import b/Assets/Graphics/Timeline/Loop_None.png.import new file mode 100644 index 000000000..242b85103 --- /dev/null +++ b/Assets/Graphics/Timeline/Loop_None.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Loop_None.png-14fc2cb4603d993574befff18ad98338.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Timeline/Loop_None.png" +dest_files=[ "res://.import/Loop_None.png-14fc2cb4603d993574befff18ad98338.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 diff --git a/Assets/Graphics/Timeline/Loop_PingPong.png b/Assets/Graphics/Timeline/Loop_PingPong.png new file mode 100644 index 000000000..c05333c74 Binary files /dev/null and b/Assets/Graphics/Timeline/Loop_PingPong.png differ diff --git a/Assets/Graphics/Timeline/Loop_PingPong.png.import b/Assets/Graphics/Timeline/Loop_PingPong.png.import new file mode 100644 index 000000000..37e59e054 --- /dev/null +++ b/Assets/Graphics/Timeline/Loop_PingPong.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Loop_PingPong.png-b4923f70c51381502d0517f45940438a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Timeline/Loop_PingPong.png" +dest_files=[ "res://.import/Loop_PingPong.png-b4923f70c51381502d0517f45940438a.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 diff --git a/Assets/Graphics/Timeline/New_Frame.png b/Assets/Graphics/Timeline/New_Frame.png new file mode 100644 index 000000000..3610e58b8 Binary files /dev/null and b/Assets/Graphics/Timeline/New_Frame.png differ diff --git a/Assets/Graphics/Timeline/New_Frame.png.import b/Assets/Graphics/Timeline/New_Frame.png.import new file mode 100644 index 000000000..b72c2577a --- /dev/null +++ b/Assets/Graphics/Timeline/New_Frame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/New_Frame.png-f645aed4cd6aef51aff87398a19a5b5c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Timeline/New_Frame.png" +dest_files=[ "res://.import/New_Frame.png-f645aed4cd6aef51aff87398a19a5b5c.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 diff --git a/Assets/Graphics/Timeline/Next_Frame.png b/Assets/Graphics/Timeline/Next_Frame.png new file mode 100644 index 000000000..cb44873ef Binary files /dev/null and b/Assets/Graphics/Timeline/Next_Frame.png differ diff --git a/Assets/Graphics/Timeline/Next_Frame.png.import b/Assets/Graphics/Timeline/Next_Frame.png.import new file mode 100644 index 000000000..8727bc2cf --- /dev/null +++ b/Assets/Graphics/Timeline/Next_Frame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Next_Frame.png-b45181b94daa05d9b8236fa51d2e14ac.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Timeline/Next_Frame.png" +dest_files=[ "res://.import/Next_Frame.png-b45181b94daa05d9b8236fa51d2e14ac.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 diff --git a/Assets/Graphics/Timeline/Pause.png b/Assets/Graphics/Timeline/Pause.png new file mode 100644 index 000000000..6fcf8f44f Binary files /dev/null and b/Assets/Graphics/Timeline/Pause.png differ diff --git a/Assets/Graphics/Timeline/Pause.png.import b/Assets/Graphics/Timeline/Pause.png.import new file mode 100644 index 000000000..ec7a8f597 --- /dev/null +++ b/Assets/Graphics/Timeline/Pause.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Pause.png-510b20b85c3bb7d1982ccd26142494c2.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Timeline/Pause.png" +dest_files=[ "res://.import/Pause.png-510b20b85c3bb7d1982ccd26142494c2.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 diff --git a/Assets/Graphics/Timeline/Play Backwards.png b/Assets/Graphics/Timeline/Play Backwards.png new file mode 100644 index 000000000..fd930dca2 Binary files /dev/null and b/Assets/Graphics/Timeline/Play Backwards.png differ diff --git a/Assets/Graphics/Timeline/Play Backwards.png.import b/Assets/Graphics/Timeline/Play Backwards.png.import new file mode 100644 index 000000000..368ba85d1 --- /dev/null +++ b/Assets/Graphics/Timeline/Play Backwards.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Play Backwards.png-71f73ee07adca0cb87ad0bcf1432540e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Timeline/Play Backwards.png" +dest_files=[ "res://.import/Play Backwards.png-71f73ee07adca0cb87ad0bcf1432540e.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 diff --git a/Assets/Graphics/Timeline/Play.png b/Assets/Graphics/Timeline/Play.png new file mode 100644 index 000000000..1f24eae84 Binary files /dev/null and b/Assets/Graphics/Timeline/Play.png differ diff --git a/Assets/Graphics/Timeline/Play.png.import b/Assets/Graphics/Timeline/Play.png.import new file mode 100644 index 000000000..0b0d13ab9 --- /dev/null +++ b/Assets/Graphics/Timeline/Play.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Play.png-2341cdcbc2e55f1747caf37da45fc80d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Timeline/Play.png" +dest_files=[ "res://.import/Play.png-2341cdcbc2e55f1747caf37da45fc80d.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 diff --git a/Assets/Graphics/Timeline/Previous_Frame.png b/Assets/Graphics/Timeline/Previous_Frame.png new file mode 100644 index 000000000..45b06f1c7 Binary files /dev/null and b/Assets/Graphics/Timeline/Previous_Frame.png differ diff --git a/Assets/Graphics/Timeline/Previous_Frame.png.import b/Assets/Graphics/Timeline/Previous_Frame.png.import new file mode 100644 index 000000000..4e98546c9 --- /dev/null +++ b/Assets/Graphics/Timeline/Previous_Frame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Previous_Frame.png-226e7937514479118b1fc746ba67dd3b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Timeline/Previous_Frame.png" +dest_files=[ "res://.import/Previous_Frame.png-226e7937514479118b1fc746ba67dd3b.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 diff --git a/Assets/Graphics/Timeline/onion_skinning.png b/Assets/Graphics/Timeline/onion_skinning.png new file mode 100644 index 000000000..93acce0c2 Binary files /dev/null and b/Assets/Graphics/Timeline/onion_skinning.png differ diff --git a/Assets/Graphics/Timeline/onion_skinning.png.import b/Assets/Graphics/Timeline/onion_skinning.png.import new file mode 100644 index 000000000..5ac7d4480 --- /dev/null +++ b/Assets/Graphics/Timeline/onion_skinning.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/onion_skinning.png-443079ff94197d6bd7a60b0685b1a6c6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Timeline/onion_skinning.png" +dest_files=[ "res://.import/onion_skinning.png-443079ff94197d6bd7a60b0685b1a6c6.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 diff --git a/Assets/Graphics/Tools/Brush.png b/Assets/Graphics/Tools/Brush.png new file mode 100644 index 000000000..bbe69ea15 Binary files /dev/null and b/Assets/Graphics/Tools/Brush.png differ diff --git a/Assets/Graphics/Tools/Brush.png.import b/Assets/Graphics/Tools/Brush.png.import new file mode 100644 index 000000000..1d4fc0f67 --- /dev/null +++ b/Assets/Graphics/Tools/Brush.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Brush.png-be161d4821aadbd04edeb9bfd3d48744.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Brush.png" +dest_files=[ "res://.import/Brush.png-be161d4821aadbd04edeb9bfd3d48744.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 diff --git a/Assets/Graphics/Tools/Brush_l.png b/Assets/Graphics/Tools/Brush_l.png new file mode 100644 index 000000000..56025b2f9 Binary files /dev/null and b/Assets/Graphics/Tools/Brush_l.png differ diff --git a/Assets/Graphics/Tools/Brush_l.png.import b/Assets/Graphics/Tools/Brush_l.png.import new file mode 100644 index 000000000..3b5442a0b --- /dev/null +++ b/Assets/Graphics/Tools/Brush_l.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Brush_l.png-f1a1213816b51e44e3c5cea82f1143f1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Brush_l.png" +dest_files=[ "res://.import/Brush_l.png-f1a1213816b51e44e3c5cea82f1143f1.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 diff --git a/Assets/Graphics/Tools/Brush_l_r.png b/Assets/Graphics/Tools/Brush_l_r.png new file mode 100644 index 000000000..325695e4c Binary files /dev/null and b/Assets/Graphics/Tools/Brush_l_r.png differ diff --git a/Assets/Graphics/Tools/Brush_l_r.png.import b/Assets/Graphics/Tools/Brush_l_r.png.import new file mode 100644 index 000000000..daffc1dbd --- /dev/null +++ b/Assets/Graphics/Tools/Brush_l_r.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Brush_l_r.png-5b0b2b1d5aaa3b4883404b24ddd63152.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Brush_l_r.png" +dest_files=[ "res://.import/Brush_l_r.png-5b0b2b1d5aaa3b4883404b24ddd63152.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 diff --git a/Assets/Graphics/Tools/Brush_r.png b/Assets/Graphics/Tools/Brush_r.png new file mode 100644 index 000000000..046d7f7f4 Binary files /dev/null and b/Assets/Graphics/Tools/Brush_r.png differ diff --git a/Assets/Graphics/Tools/Brush_r.png.import b/Assets/Graphics/Tools/Brush_r.png.import new file mode 100644 index 000000000..c8fe90d31 --- /dev/null +++ b/Assets/Graphics/Tools/Brush_r.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Brush_r.png-2dd42e7ea71b8fd6ecbfc2c28079712f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Brush_r.png" +dest_files=[ "res://.import/Brush_r.png-2dd42e7ea71b8fd6ecbfc2c28079712f.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 diff --git a/Assets/Graphics/Tools/Bucket.png b/Assets/Graphics/Tools/Bucket.png new file mode 100644 index 000000000..e282f436d Binary files /dev/null and b/Assets/Graphics/Tools/Bucket.png differ diff --git a/Assets/Graphics/Tools/Bucket.png.import b/Assets/Graphics/Tools/Bucket.png.import new file mode 100644 index 000000000..d04fba06e --- /dev/null +++ b/Assets/Graphics/Tools/Bucket.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Bucket.png-0fdc4e57032ebc5812bbc7cadae424ea.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Bucket.png" +dest_files=[ "res://.import/Bucket.png-0fdc4e57032ebc5812bbc7cadae424ea.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 diff --git a/Assets/Graphics/Tools/Bucket_l.png b/Assets/Graphics/Tools/Bucket_l.png new file mode 100644 index 000000000..39fc40b93 Binary files /dev/null and b/Assets/Graphics/Tools/Bucket_l.png differ diff --git a/Assets/Graphics/Tools/Bucket_l.png.import b/Assets/Graphics/Tools/Bucket_l.png.import new file mode 100644 index 000000000..5054cf839 --- /dev/null +++ b/Assets/Graphics/Tools/Bucket_l.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Bucket_l.png-545d0f3d32061c5b9017e039914210fe.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Bucket_l.png" +dest_files=[ "res://.import/Bucket_l.png-545d0f3d32061c5b9017e039914210fe.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 diff --git a/Assets/Graphics/Tools/Bucket_l_r.png b/Assets/Graphics/Tools/Bucket_l_r.png new file mode 100644 index 000000000..0f1566883 Binary files /dev/null and b/Assets/Graphics/Tools/Bucket_l_r.png differ diff --git a/Assets/Graphics/Tools/Bucket_l_r.png.import b/Assets/Graphics/Tools/Bucket_l_r.png.import new file mode 100644 index 000000000..b5fbc4a06 --- /dev/null +++ b/Assets/Graphics/Tools/Bucket_l_r.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Bucket_l_r.png-a82f6b5b78c375626b890b402e3f68b3.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Bucket_l_r.png" +dest_files=[ "res://.import/Bucket_l_r.png-a82f6b5b78c375626b890b402e3f68b3.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 diff --git a/Assets/Graphics/Tools/Bucket_r.png b/Assets/Graphics/Tools/Bucket_r.png new file mode 100644 index 000000000..b69842c61 Binary files /dev/null and b/Assets/Graphics/Tools/Bucket_r.png differ diff --git a/Assets/Graphics/Tools/Bucket_r.png.import b/Assets/Graphics/Tools/Bucket_r.png.import new file mode 100644 index 000000000..9e23819a3 --- /dev/null +++ b/Assets/Graphics/Tools/Bucket_r.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Bucket_r.png-53c19f8818aaa0fb02a3cdff17f7a672.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Bucket_r.png" +dest_files=[ "res://.import/Bucket_r.png-53c19f8818aaa0fb02a3cdff17f7a672.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 diff --git a/Assets/Graphics/Tools/Eraser.png b/Assets/Graphics/Tools/Eraser.png new file mode 100644 index 000000000..f0858d8e2 Binary files /dev/null and b/Assets/Graphics/Tools/Eraser.png differ diff --git a/Assets/Graphics/Tools/Eraser.png.import b/Assets/Graphics/Tools/Eraser.png.import new file mode 100644 index 000000000..79f26822d --- /dev/null +++ b/Assets/Graphics/Tools/Eraser.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Eraser.png-168fd713a0b1f154f1e5bd973b1cd554.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Eraser.png" +dest_files=[ "res://.import/Eraser.png-168fd713a0b1f154f1e5bd973b1cd554.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 diff --git a/Assets/Graphics/Tools/Eraser_l.png b/Assets/Graphics/Tools/Eraser_l.png new file mode 100644 index 000000000..e9369244e Binary files /dev/null and b/Assets/Graphics/Tools/Eraser_l.png differ diff --git a/Assets/Graphics/Tools/Eraser_l.png.import b/Assets/Graphics/Tools/Eraser_l.png.import new file mode 100644 index 000000000..f39ff2418 --- /dev/null +++ b/Assets/Graphics/Tools/Eraser_l.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Eraser_l.png-f21650fe1cd2d2a70e4c022c01b15a96.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Eraser_l.png" +dest_files=[ "res://.import/Eraser_l.png-f21650fe1cd2d2a70e4c022c01b15a96.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 diff --git a/Assets/Graphics/Tools/Eraser_l_r.png b/Assets/Graphics/Tools/Eraser_l_r.png new file mode 100644 index 000000000..2b9703dae Binary files /dev/null and b/Assets/Graphics/Tools/Eraser_l_r.png differ diff --git a/Assets/Graphics/Tools/Eraser_l_r.png.import b/Assets/Graphics/Tools/Eraser_l_r.png.import new file mode 100644 index 000000000..546768a52 --- /dev/null +++ b/Assets/Graphics/Tools/Eraser_l_r.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Eraser_l_r.png-7cde479aa2fb42782bc8405d8e6dfa79.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Eraser_l_r.png" +dest_files=[ "res://.import/Eraser_l_r.png-7cde479aa2fb42782bc8405d8e6dfa79.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 diff --git a/Assets/Graphics/Tools/Eraser_r.png b/Assets/Graphics/Tools/Eraser_r.png new file mode 100644 index 000000000..cf29a02d9 Binary files /dev/null and b/Assets/Graphics/Tools/Eraser_r.png differ diff --git a/Assets/Graphics/Tools/Eraser_r.png.import b/Assets/Graphics/Tools/Eraser_r.png.import new file mode 100644 index 000000000..a9d0ec9f6 --- /dev/null +++ b/Assets/Graphics/Tools/Eraser_r.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Eraser_r.png-2b593b95eab178b22e0ba2dcb1884ab0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Eraser_r.png" +dest_files=[ "res://.import/Eraser_r.png-2b593b95eab178b22e0ba2dcb1884ab0.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 diff --git a/Assets/Graphics/Tools/LightenDarken.png b/Assets/Graphics/Tools/LightenDarken.png new file mode 100644 index 000000000..2197649e4 Binary files /dev/null and b/Assets/Graphics/Tools/LightenDarken.png differ diff --git a/Assets/Graphics/Tools/LightenDarken.png.import b/Assets/Graphics/Tools/LightenDarken.png.import new file mode 100644 index 000000000..0219f1ba6 --- /dev/null +++ b/Assets/Graphics/Tools/LightenDarken.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/LightenDarken.png-465dc0b9dd73c983c91d729b7d3e96c8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/LightenDarken.png" +dest_files=[ "res://.import/LightenDarken.png-465dc0b9dd73c983c91d729b7d3e96c8.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 diff --git a/Assets/Graphics/Tools/LightenDarken_l.png b/Assets/Graphics/Tools/LightenDarken_l.png new file mode 100644 index 000000000..0e8cae8cd Binary files /dev/null and b/Assets/Graphics/Tools/LightenDarken_l.png differ diff --git a/Assets/Graphics/Tools/LightenDarken_l.png.import b/Assets/Graphics/Tools/LightenDarken_l.png.import new file mode 100644 index 000000000..9f8c3e3f5 --- /dev/null +++ b/Assets/Graphics/Tools/LightenDarken_l.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/LightenDarken_l.png-64e10f5f13a9aa0e4701376336f27a73.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/LightenDarken_l.png" +dest_files=[ "res://.import/LightenDarken_l.png-64e10f5f13a9aa0e4701376336f27a73.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 diff --git a/Assets/Graphics/Tools/LightenDarken_l_r.png b/Assets/Graphics/Tools/LightenDarken_l_r.png new file mode 100644 index 000000000..c5729cf38 Binary files /dev/null and b/Assets/Graphics/Tools/LightenDarken_l_r.png differ diff --git a/Assets/Graphics/Tools/LightenDarken_l_r.png.import b/Assets/Graphics/Tools/LightenDarken_l_r.png.import new file mode 100644 index 000000000..5b2b6c1c6 --- /dev/null +++ b/Assets/Graphics/Tools/LightenDarken_l_r.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/LightenDarken_l_r.png-1c91a1473ff3907f1724acafa18c64d0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/LightenDarken_l_r.png" +dest_files=[ "res://.import/LightenDarken_l_r.png-1c91a1473ff3907f1724acafa18c64d0.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 diff --git a/Assets/Graphics/Tools/LightenDarken_r.png b/Assets/Graphics/Tools/LightenDarken_r.png new file mode 100644 index 000000000..eaf053fa9 Binary files /dev/null and b/Assets/Graphics/Tools/LightenDarken_r.png differ diff --git a/Assets/Graphics/Tools/LightenDarken_r.png.import b/Assets/Graphics/Tools/LightenDarken_r.png.import new file mode 100644 index 000000000..eac03e524 --- /dev/null +++ b/Assets/Graphics/Tools/LightenDarken_r.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/LightenDarken_r.png-9c2f411ab0c11d826a789b00d02c1706.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/LightenDarken_r.png" +dest_files=[ "res://.import/LightenDarken_r.png-9c2f411ab0c11d826a789b00d02c1706.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 diff --git a/Assets/Graphics/Tools/Pencil.png b/Assets/Graphics/Tools/Pencil.png new file mode 100644 index 000000000..f20ff9b36 Binary files /dev/null and b/Assets/Graphics/Tools/Pencil.png differ diff --git a/Assets/Graphics/Tools/Pencil.png.import b/Assets/Graphics/Tools/Pencil.png.import new file mode 100644 index 000000000..cb740c12c --- /dev/null +++ b/Assets/Graphics/Tools/Pencil.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Pencil.png-4773a7bb0c8d739928689bb2cb1b3ac2.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Pencil.png" +dest_files=[ "res://.import/Pencil.png-4773a7bb0c8d739928689bb2cb1b3ac2.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 diff --git a/Assets/Graphics/Tools/Pencil_l.png b/Assets/Graphics/Tools/Pencil_l.png new file mode 100644 index 000000000..007ad282a Binary files /dev/null and b/Assets/Graphics/Tools/Pencil_l.png differ diff --git a/Assets/Graphics/Tools/Pencil_l.png.import b/Assets/Graphics/Tools/Pencil_l.png.import new file mode 100644 index 000000000..af9707238 --- /dev/null +++ b/Assets/Graphics/Tools/Pencil_l.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Pencil_l.png-f8ec98a3bc962b36c6f18db2218025e5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Pencil_l.png" +dest_files=[ "res://.import/Pencil_l.png-f8ec98a3bc962b36c6f18db2218025e5.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 diff --git a/Assets/Graphics/Tools/Pencil_l_r.png b/Assets/Graphics/Tools/Pencil_l_r.png new file mode 100644 index 000000000..90fff5372 Binary files /dev/null and b/Assets/Graphics/Tools/Pencil_l_r.png differ diff --git a/Assets/Graphics/Tools/Pencil_l_r.png.import b/Assets/Graphics/Tools/Pencil_l_r.png.import new file mode 100644 index 000000000..a2b2fc2aa --- /dev/null +++ b/Assets/Graphics/Tools/Pencil_l_r.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Pencil_l_r.png-25bb5efc2ba4216b34b07dd937620eaf.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Pencil_l_r.png" +dest_files=[ "res://.import/Pencil_l_r.png-25bb5efc2ba4216b34b07dd937620eaf.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 diff --git a/Assets/Graphics/Tools/Pencil_r.png b/Assets/Graphics/Tools/Pencil_r.png new file mode 100644 index 000000000..90940b4d2 Binary files /dev/null and b/Assets/Graphics/Tools/Pencil_r.png differ diff --git a/Assets/Graphics/Tools/Pencil_r.png.import b/Assets/Graphics/Tools/Pencil_r.png.import new file mode 100644 index 000000000..94e1aff91 --- /dev/null +++ b/Assets/Graphics/Tools/Pencil_r.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Pencil_r.png-5a7c06624a52807af4e411f156eba554.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/Pencil_r.png" +dest_files=[ "res://.import/Pencil_r.png-5a7c06624a52807af4e411f156eba554.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 diff --git a/Assets/Graphics/Tools/RectSelect.png b/Assets/Graphics/Tools/RectSelect.png new file mode 100644 index 000000000..e8c0371d1 Binary files /dev/null and b/Assets/Graphics/Tools/RectSelect.png differ diff --git a/Assets/Graphics/Tools/RectSelect.png.import b/Assets/Graphics/Tools/RectSelect.png.import new file mode 100644 index 000000000..5698f6222 --- /dev/null +++ b/Assets/Graphics/Tools/RectSelect.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/RectSelect.png-61350257ef1282dbb66372dd575c0a38.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/RectSelect.png" +dest_files=[ "res://.import/RectSelect.png-61350257ef1282dbb66372dd575c0a38.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 diff --git a/Assets/Graphics/Tools/RectSelect_l.png b/Assets/Graphics/Tools/RectSelect_l.png new file mode 100644 index 000000000..6c5903e0d Binary files /dev/null and b/Assets/Graphics/Tools/RectSelect_l.png differ diff --git a/Assets/Graphics/Tools/RectSelect_l.png.import b/Assets/Graphics/Tools/RectSelect_l.png.import new file mode 100644 index 000000000..333c0813d --- /dev/null +++ b/Assets/Graphics/Tools/RectSelect_l.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/RectSelect_l.png-bb70cec1eda66e5de66e171755bf209f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/RectSelect_l.png" +dest_files=[ "res://.import/RectSelect_l.png-bb70cec1eda66e5de66e171755bf209f.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 diff --git a/Assets/Graphics/Tools/RectSelect_l_r.png b/Assets/Graphics/Tools/RectSelect_l_r.png new file mode 100644 index 000000000..b05c19aa9 Binary files /dev/null and b/Assets/Graphics/Tools/RectSelect_l_r.png differ diff --git a/Assets/Graphics/Tools/RectSelect_l_r.png.import b/Assets/Graphics/Tools/RectSelect_l_r.png.import new file mode 100644 index 000000000..9788e21a8 --- /dev/null +++ b/Assets/Graphics/Tools/RectSelect_l_r.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/RectSelect_l_r.png-850e1283a916d270bbf6c5eb9889af30.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/RectSelect_l_r.png" +dest_files=[ "res://.import/RectSelect_l_r.png-850e1283a916d270bbf6c5eb9889af30.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 diff --git a/Assets/Graphics/Tools/RectSelect_r.png b/Assets/Graphics/Tools/RectSelect_r.png new file mode 100644 index 000000000..1698c3f9c Binary files /dev/null and b/Assets/Graphics/Tools/RectSelect_r.png differ diff --git a/Assets/Graphics/Tools/RectSelect_r.png.import b/Assets/Graphics/Tools/RectSelect_r.png.import new file mode 100644 index 000000000..dbe56fad4 --- /dev/null +++ b/Assets/Graphics/Tools/RectSelect_r.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/RectSelect_r.png-e76dbc1255b176fd431a12910c93869f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Tools/RectSelect_r.png" +dest_files=[ "res://.import/RectSelect_r.png-e76dbc1255b176fd431a12910c93869f.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 diff --git a/Main.tscn b/Main.tscn index 4f0e291a3..932b0a3e0 100644 --- a/Main.tscn +++ b/Main.tscn @@ -1,133 +1,266 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=39 format=2] [ext_resource path="res://Scripts/Main.gd" type="Script" id=1] -[ext_resource path="res://Assets/Graphics/left.png" type="Texture" id=2] -[ext_resource path="res://Assets/Graphics/right.png" type="Texture" id=3] -[ext_resource path="res://Prefabs/BrushButton.tscn" type="PackedScene" id=4] -[ext_resource path="res://Prefabs/Canvas.tscn" type="PackedScene" id=5] -[ext_resource path="res://Scripts/CameraMovement.gd" type="Script" id=6] -[ext_resource path="res://Scripts/SelectionRectangle.gd" type="Script" id=7] -[ext_resource path="res://Scripts/SecondViewport.gd" type="Script" id=8] -[ext_resource path="res://Scripts/AboutDialog.gd" type="Script" id=9] +[ext_resource path="res://Assets/Graphics/Tools/RectSelect.png" type="Texture" id=2] +[ext_resource path="res://Assets/Graphics/Tools/Pencil_l.png" type="Texture" id=3] +[ext_resource path="res://Assets/Graphics/Tools/Eraser_r.png" type="Texture" id=4] +[ext_resource path="res://Assets/Graphics/Tools/Bucket.png" type="Texture" id=5] +[ext_resource path="res://Assets/Graphics/Tools/LightenDarken.png" type="Texture" id=6] +[ext_resource path="res://Prefabs/BrushButton.tscn" type="PackedScene" id=7] +[ext_resource path="res://Assets/Graphics/left.png" type="Texture" id=8] +[ext_resource path="res://Assets/Graphics/right.png" type="Texture" id=9] +[ext_resource path="res://Scripts/HorizontalRuler.gd" type="Script" id=10] +[ext_resource path="res://Scripts/VerticalRuler.gd" type="Script" id=11] +[ext_resource path="res://Prefabs/Canvas.tscn" type="PackedScene" id=12] +[ext_resource path="res://Scripts/CameraMovement.gd" type="Script" id=13] +[ext_resource path="res://Scripts/SelectionRectangle.gd" type="Script" id=14] +[ext_resource path="res://Scripts/SecondViewport.gd" type="Script" id=15] +[ext_resource path="res://Assets/Graphics/Timeline/Go_To_First_Frame.png" type="Texture" id=16] +[ext_resource path="res://Assets/Graphics/Timeline/Previous_Frame.png" type="Texture" id=17] +[ext_resource path="res://Assets/Graphics/Timeline/Play Backwards.png" type="Texture" id=18] +[ext_resource path="res://Assets/Graphics/Timeline/Pause.png" type="Texture" id=19] +[ext_resource path="res://Assets/Graphics/Timeline/Play.png" type="Texture" id=20] +[ext_resource path="res://Assets/Graphics/Timeline/Next_Frame.png" type="Texture" id=21] +[ext_resource path="res://Assets/Graphics/Timeline/Go_To_Last_Frame.png" type="Texture" id=22] +[ext_resource path="res://Assets/Graphics/Timeline/Loop_None.png" type="Texture" id=23] +[ext_resource path="res://Assets/Graphics/Timeline/New_Frame.png" type="Texture" id=24] +[ext_resource path="res://Assets/Graphics/Layers/new_layer.png" type="Texture" id=25] +[ext_resource path="res://Assets/Graphics/Layers/delete_layer.png" type="Texture" id=26] +[ext_resource path="res://Assets/Graphics/Layers/delete_layer_disabled.png" type="Texture" id=27] +[ext_resource path="res://Assets/Graphics/Layers/move_up.png" type="Texture" id=28] +[ext_resource path="res://Assets/Graphics/Layers/move_up_disabled.png" type="Texture" id=29] +[ext_resource path="res://Assets/Graphics/Layers/move_down.png" type="Texture" id=30] +[ext_resource path="res://Assets/Graphics/Layers/move_down_disabled.png" type="Texture" id=31] +[ext_resource path="res://Assets/Graphics/Layers/clone_layer.png" type="Texture" id=32] +[ext_resource path="res://Assets/Graphics/Layers/merge_down.png" type="Texture" id=33] +[ext_resource path="res://Assets/Graphics/Layers/merge_down_disabled.png" type="Texture" id=34] +[ext_resource path="res://Scripts/AboutDialog.gd" type="Script" id=35] + +[sub_resource type="StyleBoxFlat" id=1] +bg_color = Color( 0.223529, 0.223529, 0.243137, 1 ) + +[sub_resource type="StyleBoxFlat" id=2] +bg_color = Color( 0.0862745, 0.0862745, 0.0862745, 1 ) + +[sub_resource type="StyleBoxFlat" id=3] +bg_color = Color( 0.0862745, 0.0862745, 0.0862745, 1 ) [node name="Control" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 +mouse_default_cursor_shape = 16 script = ExtResource( 1 ) +__meta__ = { +"_edit_horizontal_guides_": [ ], +"_edit_vertical_guides_": [ ] +} -[node name="UI" type="HBoxContainer" parent="."] +[node name="MenuAndUI" type="VBoxContainer" parent="."] editor/display_folded = true anchor_right = 1.0 anchor_bottom = 1.0 -size_flags_horizontal = 3 custom_constants/separation = 0 -[node name="ToolPanel" type="Panel" parent="UI"] -editor/display_folded = true -margin_right = 230.0 -margin_bottom = 600.0 -rect_min_size = Vector2( 230, 0 ) -size_flags_vertical = 3 +[node name="MenuContainer" type="Panel" parent="MenuAndUI"] +margin_right = 1152.0 +margin_bottom = 28.0 +rect_min_size = Vector2( 0, 28 ) +custom_styles/panel = SubResource( 1 ) -[node name="Tools" type="VBoxContainer" parent="UI/ToolPanel"] -editor/display_folded = true -anchor_right = 1.0 -anchor_bottom = 1.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 - -[node name="MenusAndTools" type="VBoxContainer" parent="UI/ToolPanel/Tools"] -editor/display_folded = true -margin_right = 230.0 -margin_bottom = 224.0 -size_flags_vertical = 3 - -[node name="MenuItems" type="HBoxContainer" parent="UI/ToolPanel/Tools/MenusAndTools"] -editor/display_folded = true -margin_right = 230.0 +[node name="MenuItems" type="HBoxContainer" parent="MenuAndUI/MenuContainer"] +margin_left = 2.0 +margin_top = 6.0 +margin_right = 1010.0 margin_bottom = 20.0 -[node name="FileMenu" type="MenuButton" parent="UI/ToolPanel/Tools/MenusAndTools/MenuItems"] +[node name="FileMenu" type="MenuButton" parent="MenuAndUI/MenuContainer/MenuItems"] margin_right = 35.0 margin_bottom = 20.0 mouse_default_cursor_shape = 2 text = "File" -[node name="EditMenu" type="MenuButton" parent="UI/ToolPanel/Tools/MenusAndTools/MenuItems"] +[node name="EditMenu" type="MenuButton" parent="MenuAndUI/MenuContainer/MenuItems"] margin_left = 39.0 margin_right = 75.0 margin_bottom = 20.0 mouse_default_cursor_shape = 2 text = "Edit" -[node name="ViewMenu" type="MenuButton" parent="UI/ToolPanel/Tools/MenusAndTools/MenuItems"] +[node name="ViewMenu" type="MenuButton" parent="MenuAndUI/MenuContainer/MenuItems"] margin_left = 79.0 margin_right = 121.0 margin_bottom = 20.0 mouse_default_cursor_shape = 2 text = "View" -[node name="HelpMenu" type="MenuButton" parent="UI/ToolPanel/Tools/MenusAndTools/MenuItems"] +[node name="HelpMenu" type="MenuButton" parent="MenuAndUI/MenuContainer/MenuItems"] margin_left = 125.0 margin_right = 167.0 margin_bottom = 20.0 mouse_default_cursor_shape = 2 text = "Help" -[node name="PaintToolsContainer" type="HBoxContainer" parent="UI/ToolPanel/Tools/MenusAndTools"] +[node name="HBoxContainer" type="HBoxContainer" parent="MenuAndUI/MenuContainer"] editor/display_folded = true -margin_top = 24.0 -margin_right = 230.0 -margin_bottom = 44.0 +anchor_left = 0.5 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -65.5 +margin_right = 65.5 -[node name="Pencil" type="Button" parent="UI/ToolPanel/Tools/MenusAndTools/PaintToolsContainer"] -margin_right = 51.0 -margin_bottom = 20.0 +[node name="ZoomLevel" type="Label" parent="MenuAndUI/MenuContainer/HBoxContainer"] +margin_top = 7.0 +margin_right = 80.0 +margin_bottom = 21.0 +text = "Zoom: x7.81" + +[node name="CursorPosition" type="Label" parent="MenuAndUI/MenuContainer/HBoxContainer"] +margin_left = 84.0 +margin_top = 7.0 +margin_right = 131.0 +margin_bottom = 21.0 +text = "[64x64]" +align = 2 + +[node name="UI" type="HBoxContainer" parent="MenuAndUI"] +editor/display_folded = true +margin_top = 28.0 +margin_right = 1152.0 +margin_bottom = 648.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +custom_constants/separation = 0 + +[node name="ToolPanel" type="Panel" parent="MenuAndUI/UI"] +margin_right = 242.0 +margin_bottom = 620.0 +rect_min_size = Vector2( 242, 0 ) +size_flags_vertical = 3 + +[node name="Tools" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel"] +editor/display_folded = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 8.0 +margin_top = 8.0 +margin_right = -8.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="MenusAndTools" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools"] +margin_right = 226.0 +margin_bottom = 230.0 +size_flags_vertical = 3 +custom_constants/separation = 17 + +[node name="SelectionTools" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools"] +margin_right = 226.0 +margin_bottom = 54.0 + +[node name="VBoxContainer" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/SelectionTools"] +margin_right = 226.0 +margin_bottom = 18.0 +custom_constants/separation = 0 + +[node name="SelectionTools" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/SelectionTools/VBoxContainer"] +margin_right = 226.0 +margin_bottom = 14.0 +text = "Selection Tools" + +[node name="HSeparator6" type="HSeparator" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/SelectionTools/VBoxContainer"] +margin_top = 14.0 +margin_right = 226.0 +margin_bottom = 18.0 + +[node name="SelectionToolsContainer2" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/SelectionTools"] +margin_top = 22.0 +margin_right = 226.0 +margin_bottom = 54.0 + +[node name="RectSelect" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/SelectionTools/SelectionToolsContainer2"] +margin_right = 32.0 +margin_bottom = 32.0 +hint_tooltip = "R for left mouse button +Alt + R for right mouse button +Press Shift to move the content" +mouse_default_cursor_shape = 2 +button_mask = 3 +texture_normal = ExtResource( 2 ) + +[node name="DrawTools" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools"] +margin_top = 71.0 +margin_right = 226.0 +margin_bottom = 125.0 + +[node name="VBoxContainer" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/DrawTools"] +margin_right = 226.0 +margin_bottom = 18.0 +custom_constants/separation = 0 + +[node name="DrawTools" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/DrawTools/VBoxContainer"] +margin_right = 226.0 +margin_bottom = 14.0 +text = "Draw Tools" + +[node name="HSeparator5" type="HSeparator" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/DrawTools/VBoxContainer"] +margin_top = 14.0 +margin_right = 226.0 +margin_bottom = 18.0 + +[node name="PaintToolsContainer" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/DrawTools"] +margin_top = 22.0 +margin_right = 226.0 +margin_bottom = 54.0 + +[node name="Pencil" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/DrawTools/PaintToolsContainer"] +margin_right = 32.0 +margin_bottom = 32.0 hint_tooltip = "P for left mouse button Alt + P for right mouse button Hold Shift to make a line" mouse_default_cursor_shape = 2 button_mask = 3 -text = "Pencil" +texture_normal = ExtResource( 3 ) -[node name="LeftIndicator" type="Sprite" parent="UI/ToolPanel/Tools/MenusAndTools/PaintToolsContainer/Pencil"] -texture = ExtResource( 2 ) -centered = false -offset = Vector2( 0, -10 ) - -[node name="Eraser" type="Button" parent="UI/ToolPanel/Tools/MenusAndTools/PaintToolsContainer"] -margin_left = 55.0 -margin_right = 106.0 -margin_bottom = 20.0 +[node name="Eraser" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/DrawTools/PaintToolsContainer"] +margin_left = 36.0 +margin_right = 68.0 +margin_bottom = 32.0 hint_tooltip = "E for left mouse button Alt + E for right mouse button Hold Shift to make a line" mouse_default_cursor_shape = 2 button_mask = 3 -text = "Eraser" +texture_normal = ExtResource( 4 ) -[node name="RightIndicator" type="Sprite" parent="UI/ToolPanel/Tools/MenusAndTools/PaintToolsContainer/Eraser"] -texture = ExtResource( 3 ) -centered = false -offset = Vector2( 35, -10 ) - -[node name="Fill" type="Button" parent="UI/ToolPanel/Tools/MenusAndTools/PaintToolsContainer"] -margin_left = 110.0 -margin_right = 166.0 -margin_bottom = 20.0 +[node name="Bucket" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/DrawTools/PaintToolsContainer"] +margin_left = 72.0 +margin_right = 104.0 +margin_bottom = 32.0 hint_tooltip = "B for left mouse button Alt + B for right mouse button" mouse_default_cursor_shape = 2 button_mask = 3 -text = "Bucket" +texture_normal = ExtResource( 5 ) -[node name="ColorToolsContainer" type="HBoxContainer" parent="UI/ToolPanel/Tools/MenusAndTools"] -editor/display_folded = true -margin_top = 48.0 -margin_right = 230.0 -margin_bottom = 68.0 +[node name="LightenDarken" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/DrawTools/PaintToolsContainer"] +margin_left = 108.0 +margin_right = 140.0 +margin_bottom = 32.0 +hint_tooltip = "U for left mouse button +Alt + U for right mouse button +Ctrl to Darken" +mouse_default_cursor_shape = 2 +button_mask = 3 +texture_normal = ExtResource( 6 ) -[node name="PaintAllPixelsSameColor" type="Button" parent="UI/ToolPanel/Tools/MenusAndTools/ColorToolsContainer"] +[node name="ColorToolsContainer" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools"] +visible = false +margin_top = 142.0 +margin_right = 226.0 +margin_bottom = 162.0 + +[node name="PaintAllPixelsSameColor" type="Button" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools/ColorToolsContainer"] margin_right = 112.0 margin_bottom = 20.0 hint_tooltip = "Paint all pixels of the same color @@ -137,65 +270,39 @@ mouse_default_cursor_shape = 2 button_mask = 3 text = "PaintSameColor" -[node name="LightenDarken" type="Button" parent="UI/ToolPanel/Tools/MenusAndTools/ColorToolsContainer"] -margin_left = 116.0 -margin_right = 225.0 -margin_bottom = 20.0 -hint_tooltip = "U for left mouse button -Alt + U for right mouse button -Ctrl to Darken" -mouse_default_cursor_shape = 2 -button_mask = 3 -text = "Lighten/Darken" +[node name="HSeparator" type="HSeparator" parent="MenuAndUI/UI/ToolPanel/Tools"] +margin_top = 234.0 +margin_right = 226.0 +margin_bottom = 238.0 -[node name="SelectionToolsContainer2" type="HBoxContainer" parent="UI/ToolPanel/Tools/MenusAndTools"] -margin_top = 72.0 -margin_right = 230.0 -margin_bottom = 92.0 - -[node name="RectSelect" type="Button" parent="UI/ToolPanel/Tools/MenusAndTools/SelectionToolsContainer2"] -margin_right = 79.0 -margin_bottom = 20.0 -hint_tooltip = "R for left mouse button -Alt + R for right mouse button -Press Shift to move the content" -mouse_default_cursor_shape = 2 -button_mask = 3 -text = "RectSelect" - -[node name="HSeparator" type="HSeparator" parent="UI/ToolPanel/Tools"] -margin_top = 228.0 -margin_right = 230.0 -margin_bottom = 232.0 - -[node name="ToolOptions" type="HBoxContainer" parent="UI/ToolPanel/Tools"] +[node name="ToolOptions" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools"] editor/display_folded = true -margin_top = 236.0 -margin_right = 230.0 -margin_bottom = 460.0 +margin_top = 242.0 +margin_right = 226.0 +margin_bottom = 472.0 size_flags_vertical = 3 custom_constants/separation = 0 -[node name="LeftToolOptions" type="VBoxContainer" parent="UI/ToolPanel/Tools/ToolOptions"] -margin_right = 113.0 -margin_bottom = 224.0 +[node name="LeftToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions"] +margin_right = 109.0 +margin_bottom = 230.0 size_flags_horizontal = 3 -[node name="LeftLabel" type="Label" parent="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] -margin_right = 113.0 +[node name="LeftLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] +margin_right = 109.0 margin_bottom = 14.0 text = "Left tool options" -[node name="LeftIndicatorCheckbox" type="CheckBox" parent="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] +[node name="LeftIndicatorCheckbox" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] margin_top = 18.0 -margin_right = 113.0 +margin_right = 109.0 margin_bottom = 42.0 hint_tooltip = "Show left mouse indicator when drawing" mouse_default_cursor_shape = 2 pressed = true text = "Left cursor" -[node name="LeftColorPickerButton" type="ColorPickerButton" parent="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] +[node name="LeftColorPickerButton" type="ColorPickerButton" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] margin_top = 46.0 margin_right = 36.0 margin_bottom = 78.0 @@ -205,90 +312,91 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 0 -[node name="BrushSizeLabel" type="Label" parent="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] +[node name="BrushSizeLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] margin_top = 82.0 -margin_right = 113.0 +margin_right = 109.0 margin_bottom = 96.0 text = "Brush size: " -[node name="LeftBrushSizeEdit" type="SpinBox" parent="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] +[node name="LeftBrushSizeEdit" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] margin_top = 100.0 -margin_right = 113.0 +margin_right = 109.0 margin_bottom = 124.0 mouse_default_cursor_shape = 2 min_value = 1.0 value = 1.0 suffix = "px" -[node name="ColorComesFrom" type="Label" parent="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] +[node name="ColorComesFrom" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] margin_top = 128.0 -margin_right = 113.0 +margin_right = 109.0 margin_bottom = 142.0 text = "Brush color from" -[node name="InterpolateColor" type="HBoxContainer" parent="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] -editor/display_folded = true +[node name="InterpolateColor" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] margin_top = 146.0 -margin_right = 113.0 +margin_right = 109.0 margin_bottom = 162.0 -[node name="BrushColorLabel" type="Label" parent="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/InterpolateColor"] +[node name="BrushColorLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/InterpolateColor"] margin_top = 1.0 margin_right = 9.0 margin_bottom = 15.0 rect_pivot_offset = Vector2( -90, -47 ) text = "B" -[node name="LeftInterpolateFactor" type="HSlider" parent="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/InterpolateColor"] +[node name="LeftInterpolateFactor" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/InterpolateColor"] margin_left = 13.0 -margin_right = 101.0 +margin_right = 97.0 margin_bottom = 16.0 hint_tooltip = "Choose if the brush's color should come from the brush itself (left), or the currently selected color (right)" size_flags_horizontal = 3 max_value = 1.0 step = 0.01 -value = 0.5 +value = 1.0 ticks_on_borders = true -[node name="SelectedColorLabel" type="Label" parent="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/InterpolateColor"] -margin_left = 105.0 +[node name="SelectedColorLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/InterpolateColor"] +margin_left = 101.0 margin_top = 1.0 -margin_right = 113.0 +margin_right = 109.0 margin_bottom = 15.0 rect_pivot_offset = Vector2( -90, -47 ) text = "C" -[node name="LeftHorizontalMirroring" type="CheckBox" parent="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] +[node name="LeftHorizontalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] margin_top = 166.0 -margin_right = 113.0 +margin_right = 109.0 margin_bottom = 190.0 hint_tooltip = "Enable horizontal mirrored drawing for the left tool" +mouse_default_cursor_shape = 2 text = "Horiz. Mirror" -[node name="LeftVerticalMirroring" type="CheckBox" parent="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] +[node name="LeftVerticalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions"] margin_top = 194.0 -margin_right = 113.0 +margin_right = 109.0 margin_bottom = 218.0 hint_tooltip = "Enable vertical mirrored drawing for the left tool" +mouse_default_cursor_shape = 2 text = "Vert. Mirror" -[node name="VSeparator" type="VSeparator" parent="UI/ToolPanel/Tools/ToolOptions"] -margin_left = 113.0 -margin_right = 117.0 -margin_bottom = 224.0 +[node name="VSeparator" type="VSeparator" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions"] +margin_left = 109.0 +margin_right = 113.0 +margin_bottom = 230.0 -[node name="RightToolOptions" type="VBoxContainer" parent="UI/ToolPanel/Tools/ToolOptions"] -margin_left = 117.0 -margin_right = 230.0 -margin_bottom = 224.0 +[node name="RightToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions"] +margin_left = 113.0 +margin_right = 226.0 +margin_bottom = 230.0 size_flags_horizontal = 3 -[node name="RightLabel" type="Label" parent="UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] +[node name="RightLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] margin_right = 113.0 margin_bottom = 14.0 text = "Right tool options" -[node name="RightIndicatorCheckbox" type="CheckBox" parent="UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] +[node name="RightIndicatorCheckbox" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] margin_top = 18.0 margin_right = 113.0 margin_bottom = 42.0 @@ -296,7 +404,7 @@ hint_tooltip = "Show right mouse indicator when drawing" mouse_default_cursor_shape = 2 text = "Right cursor" -[node name="RightColorPickerButton" type="ColorPickerButton" parent="UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] +[node name="RightColorPickerButton" type="ColorPickerButton" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] margin_top = 46.0 margin_right = 36.0 margin_bottom = 78.0 @@ -306,13 +414,13 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 0 -[node name="BrushSizeLabel" type="Label" parent="UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] +[node name="BrushSizeLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] margin_top = 82.0 margin_right = 113.0 margin_bottom = 96.0 text = "Brush size: " -[node name="RightBrushSizeEdit" type="SpinBox" parent="UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] +[node name="RightBrushSizeEdit" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] margin_top = 100.0 margin_right = 113.0 margin_bottom = 124.0 @@ -321,26 +429,25 @@ min_value = 1.0 value = 1.0 suffix = "px" -[node name="ColorComesFrom" type="Label" parent="UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] +[node name="ColorComesFrom" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] margin_top = 128.0 margin_right = 113.0 margin_bottom = 142.0 text = "Brush color from" -[node name="InterpolateColor" type="HBoxContainer" parent="UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] -editor/display_folded = true +[node name="InterpolateColor" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] margin_top = 146.0 margin_right = 113.0 margin_bottom = 162.0 -[node name="BrushColorLabel" type="Label" parent="UI/ToolPanel/Tools/ToolOptions/RightToolOptions/InterpolateColor"] +[node name="BrushColorLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/InterpolateColor"] margin_top = 1.0 margin_right = 9.0 margin_bottom = 15.0 rect_pivot_offset = Vector2( -90, -47 ) text = "B" -[node name="RightInterpolateFactor" type="HSlider" parent="UI/ToolPanel/Tools/ToolOptions/RightToolOptions/InterpolateColor"] +[node name="RightInterpolateFactor" type="HSlider" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/InterpolateColor"] margin_left = 13.0 margin_right = 101.0 margin_bottom = 16.0 @@ -348,10 +455,10 @@ hint_tooltip = "Choose if the brush's color should come from the brush itself (l size_flags_horizontal = 3 max_value = 1.0 step = 0.01 -value = 0.5 +value = 1.0 ticks_on_borders = true -[node name="SelectedColorLabel" type="Label" parent="UI/ToolPanel/Tools/ToolOptions/RightToolOptions/InterpolateColor"] +[node name="SelectedColorLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/InterpolateColor"] margin_left = 105.0 margin_top = 1.0 margin_right = 113.0 @@ -359,459 +466,513 @@ margin_bottom = 15.0 rect_pivot_offset = Vector2( -90, -47 ) text = "C" -[node name="RightHorizontalMirroring" type="CheckBox" parent="UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] +[node name="RightHorizontalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] margin_top = 166.0 margin_right = 113.0 margin_bottom = 190.0 hint_tooltip = "Enable horizontal mirrored drawing for the right tool" +mouse_default_cursor_shape = 2 text = "Horiz. Mirror" -[node name="RightVerticalMirroring" type="CheckBox" parent="UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] +[node name="RightVerticalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions"] margin_top = 194.0 margin_right = 113.0 margin_bottom = 218.0 hint_tooltip = "Enable vertical mirrored drawing for the right tool" +mouse_default_cursor_shape = 2 text = "Vert. Mirror" -[node name="HSeparator2" type="HSeparator" parent="UI/ToolPanel/Tools"] -margin_top = 464.0 -margin_right = 230.0 -margin_bottom = 468.0 +[node name="HSeparator2" type="HSeparator" parent="MenuAndUI/UI/ToolPanel/Tools"] +margin_top = 476.0 +margin_right = 226.0 +margin_bottom = 480.0 -[node name="FileBrushes" type="Label" parent="UI/ToolPanel/Tools"] -margin_top = 472.0 -margin_right = 230.0 -margin_bottom = 486.0 +[node name="FileBrushes" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools"] +margin_top = 484.0 +margin_right = 226.0 +margin_bottom = 498.0 text = "Brushes From Files" -[node name="BrushesContainer" type="ScrollContainer" parent="UI/ToolPanel/Tools"] -margin_top = 490.0 -margin_right = 230.0 -margin_bottom = 526.0 +[node name="BrushesContainer" type="ScrollContainer" parent="MenuAndUI/UI/ToolPanel/Tools"] +margin_top = 502.0 +margin_right = 226.0 +margin_bottom = 538.0 size_flags_horizontal = 3 scroll_vertical_enabled = false -[node name="BrushHBoxContainer" type="HBoxContainer" parent="UI/ToolPanel/Tools/BrushesContainer"] +[node name="BrushHBoxContainer" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/BrushesContainer"] editor/display_folded = true margin_right = 36.0 margin_bottom = 36.0 -[node name="PixelBrushButton" parent="UI/ToolPanel/Tools/BrushesContainer/BrushHBoxContainer" instance=ExtResource( 4 )] +[node name="PixelBrushButton" parent="MenuAndUI/UI/ToolPanel/Tools/BrushesContainer/BrushHBoxContainer" instance=ExtResource( 7 )] hint_tooltip = "Pixel brush" -[node name="LeftBrushIndicator" type="Sprite" parent="UI/ToolPanel/Tools/BrushesContainer/BrushHBoxContainer/PixelBrushButton"] +[node name="LeftBrushIndicator" type="Sprite" parent="MenuAndUI/UI/ToolPanel/Tools/BrushesContainer/BrushHBoxContainer/PixelBrushButton"] scale = Vector2( 0.8, 0.8 ) -texture = ExtResource( 2 ) +texture = ExtResource( 8 ) centered = false -[node name="RightBrushIndicator" type="Sprite" parent="UI/ToolPanel/Tools/BrushesContainer/BrushHBoxContainer/PixelBrushButton"] +[node name="RightBrushIndicator" type="Sprite" parent="MenuAndUI/UI/ToolPanel/Tools/BrushesContainer/BrushHBoxContainer/PixelBrushButton"] scale = Vector2( 0.8, 0.8 ) -texture = ExtResource( 3 ) +texture = ExtResource( 9 ) centered = false offset = Vector2( 28, 0 ) -[node name="HSeparator3" type="HSeparator" parent="UI/ToolPanel/Tools"] -margin_top = 530.0 -margin_right = 230.0 -margin_bottom = 534.0 +[node name="HSeparator3" type="HSeparator" parent="MenuAndUI/UI/ToolPanel/Tools"] +margin_top = 542.0 +margin_right = 226.0 +margin_bottom = 546.0 -[node name="ProjectBrushes" type="Label" parent="UI/ToolPanel/Tools"] -margin_top = 538.0 -margin_right = 230.0 -margin_bottom = 552.0 +[node name="ProjectBrushes" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools"] +margin_top = 550.0 +margin_right = 226.0 +margin_bottom = 564.0 text = "Custom Project Brushes" -[node name="CustomBrushesContainer" type="ScrollContainer" parent="UI/ToolPanel/Tools"] -margin_top = 556.0 -margin_right = 230.0 -margin_bottom = 592.0 +[node name="CustomBrushesContainer" type="ScrollContainer" parent="MenuAndUI/UI/ToolPanel/Tools"] +margin_top = 568.0 +margin_right = 226.0 +margin_bottom = 604.0 rect_min_size = Vector2( 0, 36 ) size_flags_horizontal = 3 scroll_vertical_enabled = false -[node name="CustomBrushHBoxContainer" type="HBoxContainer" parent="UI/ToolPanel/Tools/CustomBrushesContainer"] +[node name="CustomBrushHBoxContainer" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/CustomBrushesContainer"] -[node name="HSeparator4" type="HSeparator" parent="UI/ToolPanel/Tools"] -margin_top = 596.0 -margin_right = 230.0 -margin_bottom = 600.0 +[node name="HSeparator4" type="HSeparator" parent="MenuAndUI/UI/ToolPanel/Tools"] +margin_top = 608.0 +margin_right = 226.0 +margin_bottom = 612.0 -[node name="CanvasAndTimeline" type="VBoxContainer" parent="UI"] +[node name="CanvasAndTimeline" type="VBoxContainer" parent="MenuAndUI/UI"] editor/display_folded = true -margin_left = 230.0 -margin_right = 864.0 -margin_bottom = 600.0 +margin_left = 242.0 +margin_right = 928.0 +margin_bottom = 620.0 size_flags_horizontal = 3 +custom_constants/separation = 0 -[node name="HViewportContainer" type="HBoxContainer" parent="UI/CanvasAndTimeline"] -margin_right = 634.0 -margin_bottom = 464.0 +[node name="HViewportContainer" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline"] +margin_right = 686.0 +margin_bottom = 478.0 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="ViewportContainer" type="ViewportContainer" parent="UI/CanvasAndTimeline/HViewportContainer"] -margin_right = 634.0 -margin_bottom = 464.0 -mouse_default_cursor_shape = 3 +[node name="ViewportAndRulers" type="VBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer"] +margin_right = 686.0 +margin_bottom = 478.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +custom_constants/separation = 0 + +[node name="HorizontalRuler" type="Panel" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers"] +margin_right = 686.0 +margin_bottom = 16.0 +rect_min_size = Vector2( 0, 16 ) +custom_styles/panel = SubResource( 2 ) +script = ExtResource( 10 ) + +[node name="ViewportandVerticalRuler" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers"] +margin_top = 16.0 +margin_right = 686.0 +margin_bottom = 478.0 +size_flags_vertical = 3 +custom_constants/separation = 0 + +[node name="VerticalRuler" type="Panel" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler"] +margin_right = 16.0 +margin_bottom = 462.0 +rect_min_size = Vector2( 16, 0 ) +size_flags_horizontal = 0 +size_flags_vertical = 3 +custom_styles/panel = SubResource( 3 ) +script = ExtResource( 11 ) + +[node name="ViewportContainer" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler"] +margin_left = 16.0 +margin_right = 686.0 +margin_bottom = 462.0 size_flags_horizontal = 3 size_flags_vertical = 3 stretch = true -[node name="Viewport" type="Viewport" parent="UI/CanvasAndTimeline/HViewportContainer/ViewportContainer"] -size = Vector2( 634, 464 ) +[node name="Viewport" type="Viewport" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/ViewportContainer"] +size = Vector2( 670, 462 ) handle_input_locally = false render_target_update_mode = 3 -[node name="Canvas" parent="UI/CanvasAndTimeline/HViewportContainer/ViewportContainer/Viewport" instance=ExtResource( 5 )] +[node name="Canvas" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 12 )] -[node name="Camera2D" type="Camera2D" parent="UI/CanvasAndTimeline/HViewportContainer/ViewportContainer/Viewport"] +[node name="Camera2D" type="Camera2D" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/ViewportContainer/Viewport"] current = true zoom = Vector2( 0.15, 0.15 ) -script = ExtResource( 6 ) +script = ExtResource( 13 ) -[node name="SelectionRectangle" type="Polygon2D" parent="UI/CanvasAndTimeline/HViewportContainer/ViewportContainer/Viewport"] +[node name="SelectionRectangle" type="Polygon2D" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/ViewportContainer/Viewport"] z_index = 1 color = Color( 0.0823529, 0.694118, 0.623529, 0.592157 ) polygon = PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0 ) -script = ExtResource( 7 ) +script = ExtResource( 14 ) -[node name="ViewportSeparator" type="VSeparator" parent="UI/CanvasAndTimeline/HViewportContainer"] +[node name="ViewportSeparator" type="VSeparator" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer"] visible = false margin_left = 315.0 margin_right = 319.0 margin_bottom = 464.0 -[node name="ViewportContainer2" type="ViewportContainer" parent="UI/CanvasAndTimeline/HViewportContainer"] +[node name="ViewportContainer2" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer"] editor/display_folded = true visible = false margin_left = 319.0 margin_right = 634.0 margin_bottom = 464.0 -mouse_default_cursor_shape = 3 size_flags_horizontal = 3 size_flags_vertical = 3 stretch = true -[node name="Viewport" type="Viewport" parent="UI/CanvasAndTimeline/HViewportContainer/ViewportContainer2"] +[node name="Viewport" type="Viewport" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportContainer2"] size = Vector2( 315, 464 ) handle_input_locally = false render_target_update_mode = 0 -script = ExtResource( 8 ) +script = ExtResource( 15 ) -[node name="Camera2D2" type="Camera2D" parent="UI/CanvasAndTimeline/HViewportContainer/ViewportContainer2/Viewport"] +[node name="Camera2D2" type="Camera2D" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportContainer2/Viewport"] current = true zoom = Vector2( 0.15, 0.15 ) -script = ExtResource( 6 ) +script = ExtResource( 13 ) -[node name="AnimationTimeline" type="Panel" parent="UI/CanvasAndTimeline"] +[node name="AnimationTimeline" type="Panel" parent="MenuAndUI/UI/CanvasAndTimeline"] editor/display_folded = true -margin_top = 468.0 -margin_right = 634.0 -margin_bottom = 600.0 -rect_min_size = Vector2( 0, 132 ) +margin_top = 478.0 +margin_right = 686.0 +margin_bottom = 620.0 +rect_min_size = Vector2( 0, 142 ) size_flags_horizontal = 3 -[node name="TimelineContainer" type="VBoxContainer" parent="UI/CanvasAndTimeline/AnimationTimeline"] +[node name="VSeparator" type="VSeparator" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline"] +anchor_top = 0.5 +anchor_bottom = 0.5 +margin_top = -71.0 +margin_right = 4.0 +margin_bottom = 71.0 + +[node name="AnimationContainer" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline"] +editor/display_folded = true anchor_right = 1.0 anchor_bottom = 1.0 +margin_left = 15.0 +margin_top = 4.0 + +[node name="TimelineContainer" type="VBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer"] +margin_right = 525.0 +margin_bottom = 138.0 size_flags_horizontal = 3 -[node name="ButtonContainer" type="CenterContainer" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer"] -margin_right = 634.0 +[node name="AnimationButtons" type="Control" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer"] +margin_right = 525.0 margin_bottom = 24.0 +rect_min_size = Vector2( 0, 24 ) -[node name="AnimationButtons" type="HBoxContainer" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/ButtonContainer"] -margin_left = 139.0 -margin_right = 495.0 -margin_bottom = 24.0 +[node name="CurrentFrame" type="Label" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons"] +anchor_top = 0.5 +anchor_bottom = 0.5 +margin_top = -7.0 +margin_right = 224.0 +margin_bottom = 7.0 +text = "Current frame: 1/1" -[node name="LoopLabel" type="Label" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/ButtonContainer/AnimationButtons"] -margin_top = 5.0 -margin_right = 35.0 -margin_bottom = 19.0 -text = "Loop:" +[node name="PlaybackButtons" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -70.0 +margin_top = -10.0 +margin_right = 70.0 +margin_bottom = 10.0 +size_flags_horizontal = 0 -[node name="LoopAnim" type="Button" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/ButtonContainer/AnimationButtons"] -margin_left = 39.0 -margin_right = 69.0 -margin_bottom = 24.0 -hint_tooltip = "No: Animation doesn't loop -Cycle: Animation plays again when it reaches the last frame -Ping-pong: Animation plays again but backwards when it reaches the last frame" +[node name="FirstFrame" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons"] +margin_right = 20.0 +margin_bottom = 20.0 mouse_default_cursor_shape = 2 -text = "No" +texture_normal = ExtResource( 16 ) -[node name="PlayBackwards" type="Button" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/ButtonContainer/AnimationButtons"] -margin_left = 73.0 -margin_right = 182.0 -margin_bottom = 24.0 +[node name="PreviousFrame" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons"] +margin_left = 24.0 +margin_right = 44.0 +margin_bottom = 20.0 +mouse_default_cursor_shape = 2 +texture_normal = ExtResource( 17 ) + +[node name="PlayBackwards" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons"] +margin_left = 48.0 +margin_right = 68.0 +margin_bottom = 20.0 hint_tooltip = "Play the animation backwards (from end to beggining)" mouse_default_cursor_shape = 2 toggle_mode = true -text = "Play Backwards" +texture_normal = ExtResource( 18 ) +texture_pressed = ExtResource( 19 ) -[node name="PlayForward" type="Button" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/ButtonContainer/AnimationButtons"] -margin_left = 186.0 -margin_right = 278.0 -margin_bottom = 24.0 +[node name="PlayForward" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons"] +margin_left = 72.0 +margin_right = 92.0 +margin_bottom = 20.0 hint_tooltip = "Play the animation forward (from beggining to end)" mouse_default_cursor_shape = 2 size_flags_horizontal = 0 toggle_mode = true -text = "Play Forward" +texture_normal = ExtResource( 20 ) +texture_pressed = ExtResource( 19 ) -[node name="FPSValue" type="SpinBox" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/ButtonContainer/AnimationButtons"] -margin_left = 282.0 -margin_right = 356.0 +[node name="NextFrame" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons"] +margin_left = 96.0 +margin_right = 116.0 +margin_bottom = 20.0 +mouse_default_cursor_shape = 2 +texture_normal = ExtResource( 21 ) + +[node name="LastFrame" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons"] +margin_left = 120.0 +margin_right = 140.0 +margin_bottom = 20.0 +mouse_default_cursor_shape = 2 +texture_normal = ExtResource( 22 ) + +[node name="LoopButtons" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons"] +anchor_left = 1.0 +anchor_top = 0.5 +anchor_right = 1.0 +anchor_bottom = 0.5 +margin_left = -98.0 +margin_top = -11.0 +margin_bottom = 12.0 +size_flags_horizontal = 8 + +[node name="FPSValue" type="SpinBox" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons"] +margin_right = 74.0 margin_bottom = 24.0 hint_tooltip = "How many frames per second should the animation preview be? The more FPS, the faster the animation plays." mouse_default_cursor_shape = 2 min_value = 0.1 step = 0.1 -value = 1.0 +value = 6.0 suffix = "FPS" -[node name="HSeparator" type="HSeparator" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer"] +[node name="LoopAnim" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons"] +margin_left = 78.0 +margin_right = 98.0 +margin_bottom = 24.0 +hint_tooltip = "No: Animation doesn't loop +Cycle: Animation plays again when it reaches the last frame +Ping-pong: Animation plays again but backwards when it reaches the last frame" +mouse_default_cursor_shape = 2 +texture_normal = ExtResource( 23 ) + +[node name="HSeparator" type="HSeparator" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer"] margin_top = 28.0 -margin_right = 634.0 +margin_right = 525.0 margin_bottom = 32.0 -[node name="CenterContainer" type="CenterContainer" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer"] -editor/display_folded = true +[node name="CenterContainer" type="CenterContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer"] margin_top = 36.0 -margin_right = 634.0 -margin_bottom = 56.0 +margin_right = 525.0 +margin_bottom = 36.0 -[node name="FrameButtons" type="HBoxContainer" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/CenterContainer"] -margin_left = 258.0 -margin_right = 375.0 -margin_bottom = 20.0 +[node name="FrameButtons" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/CenterContainer"] +margin_left = 262.0 +margin_right = 262.0 -[node name="AddFrame" type="Button" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/CenterContainer/FrameButtons"] -margin_right = 20.0 -margin_bottom = 20.0 -hint_tooltip = "Add a new frame" -mouse_default_cursor_shape = 2 -size_flags_horizontal = 0 -text = "+" +[node name="HSeparator2" type="HSeparator" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer"] +margin_top = 40.0 +margin_right = 525.0 +margin_bottom = 44.0 -[node name="RemoveFrame" type="Button" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/CenterContainer/FrameButtons"] -margin_left = 24.0 -margin_right = 41.0 -margin_bottom = 20.0 -hint_tooltip = "Remove selected frame" -mouse_default_cursor_shape = 8 -disabled = true -text = "-" - -[node name="MoveFrameLeft" type="Button" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/CenterContainer/FrameButtons"] -margin_left = 45.0 -margin_right = 65.0 -margin_bottom = 20.0 -hint_tooltip = "Move selected frame to the left" -mouse_default_cursor_shape = 8 -disabled = true -text = "<" - -[node name="MoveFrameRight" type="Button" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/CenterContainer/FrameButtons"] -margin_left = 69.0 -margin_right = 89.0 -margin_bottom = 20.0 -hint_tooltip = "Move selected frame to the right" -mouse_default_cursor_shape = 8 -disabled = true -text = ">" - -[node name="CloneFrame" type="Button" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/CenterContainer/FrameButtons"] -margin_left = 93.0 -margin_right = 117.0 -margin_bottom = 20.0 -hint_tooltip = "Clone current frame" -mouse_default_cursor_shape = 2 -size_flags_horizontal = 0 -text = "Cl" - -[node name="HSeparator2" type="HSeparator" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer"] -margin_top = 60.0 -margin_right = 634.0 -margin_bottom = 64.0 - -[node name="ScrollContainer" type="ScrollContainer" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer"] -margin_top = 68.0 -margin_right = 634.0 -margin_bottom = 132.0 +[node name="ScrollContainer" type="ScrollContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer"] +margin_top = 48.0 +margin_right = 525.0 +margin_bottom = 138.0 size_flags_horizontal = 3 size_flags_vertical = 3 scroll_vertical_enabled = false -[node name="FrameContainer" type="HBoxContainer" parent="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/ScrollContainer"] +[node name="FrameAndButtonContainer" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/ScrollContainer"] +margin_right = 40.0 +margin_bottom = 36.0 -[node name="LayerPanel" type="Panel" parent="UI"] +[node name="AddFrame" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/ScrollContainer/FrameAndButtonContainer"] +margin_right = 36.0 +margin_bottom = 36.0 +hint_tooltip = "Add a new frame" +mouse_default_cursor_shape = 2 +size_flags_horizontal = 0 +texture_normal = ExtResource( 24 ) + +[node name="FrameContainer" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/ScrollContainer/FrameAndButtonContainer"] +margin_left = 40.0 +margin_right = 40.0 +margin_bottom = 36.0 + +[node name="VSeparator" type="VSeparator" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer"] +margin_left = 529.0 +margin_right = 533.0 +margin_bottom = 138.0 + +[node name="OnionSkinningButtons" type="VBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer"] +margin_left = 537.0 +margin_right = 663.0 +margin_bottom = 138.0 + +[node name="OnionSkinning" type="Label" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons"] +margin_right = 126.0 +margin_bottom = 31.0 +text = "Onion Skinning: +Past Steps" + +[node name="PastOnionSkinning" type="SpinBox" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons"] +margin_top = 35.0 +margin_right = 126.0 +margin_bottom = 59.0 +mouse_default_cursor_shape = 2 + +[node name="OnionSkinningFuture" type="Label" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons"] +margin_top = 63.0 +margin_right = 126.0 +margin_bottom = 77.0 +text = "Future Steps" + +[node name="FutureOnionSkinning" type="SpinBox" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons"] +margin_top = 81.0 +margin_right = 126.0 +margin_bottom = 105.0 +mouse_default_cursor_shape = 2 + +[node name="BlueRedMode" type="CheckBox" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons"] +margin_top = 109.0 +margin_right = 126.0 +margin_bottom = 133.0 +mouse_default_cursor_shape = 2 +text = "Blue-Red Mode" + +[node name="VSeparator2" type="VSeparator" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer"] +margin_left = 667.0 +margin_right = 671.0 +margin_bottom = 138.0 + +[node name="LayerPanel" type="Panel" parent="MenuAndUI/UI"] editor/display_folded = true -margin_left = 864.0 -margin_right = 1024.0 -margin_bottom = 600.0 -rect_min_size = Vector2( 160, 0 ) +margin_left = 928.0 +margin_right = 1152.0 +margin_bottom = 620.0 +rect_min_size = Vector2( 224, 0 ) -[node name="LayersAndMisc" type="VBoxContainer" parent="UI/LayerPanel"] +[node name="LayersAndMisc" type="VBoxContainer" parent="MenuAndUI/UI/LayerPanel"] +editor/display_folded = true anchor_right = 1.0 anchor_bottom = 1.0 +margin_top = 8.0 custom_constants/separation = 3 -[node name="ScrollContainer" type="ScrollContainer" parent="UI/LayerPanel/LayersAndMisc"] -margin_right = 160.0 -margin_bottom = 382.0 +[node name="ScrollContainer" type="ScrollContainer" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc"] +margin_right = 224.0 +margin_bottom = 612.0 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="VBoxLayerContainer" type="VBoxContainer" parent="UI/LayerPanel/LayersAndMisc/ScrollContainer"] -editor/display_folded = true -margin_right = 160.0 -margin_bottom = 38.0 +[node name="VBoxLayerContainer" type="VBoxContainer" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer"] +margin_right = 224.0 +margin_bottom = 58.0 size_flags_horizontal = 3 -[node name="LayerLabel" type="Label" parent="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer"] -margin_right = 160.0 +[node name="LayerLabel" type="Label" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer"] +margin_right = 224.0 margin_bottom = 14.0 size_flags_horizontal = 3 size_flags_vertical = 0 text = "Layers" align = 1 -[node name="CenterContainer" type="CenterContainer" parent="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer"] +[node name="HSeparator" type="HSeparator" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer"] margin_top = 18.0 -margin_right = 160.0 -margin_bottom = 38.0 +margin_right = 224.0 +margin_bottom = 22.0 -[node name="LayerButtons" type="HBoxContainer" parent="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer"] -margin_left = 7.0 -margin_right = 153.0 -margin_bottom = 20.0 +[node name="CenterContainer" type="CenterContainer" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer"] +editor/display_folded = true +margin_top = 26.0 +margin_right = 224.0 +margin_bottom = 58.0 -[node name="AddLayerButton" type="Button" parent="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons"] -margin_right = 20.0 -margin_bottom = 20.0 +[node name="LayerButtons" type="HBoxContainer" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer"] +editor/display_folded = true +margin_left = 6.0 +margin_right = 218.0 +margin_bottom = 32.0 + +[node name="AddLayerButton" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons"] +margin_right = 32.0 +margin_bottom = 32.0 hint_tooltip = "Create a new layer" mouse_default_cursor_shape = 2 -text = "+" +texture_normal = ExtResource( 25 ) -[node name="RemoveLayerButton" type="Button" parent="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons"] -margin_left = 24.0 -margin_right = 44.0 -margin_bottom = 20.0 +[node name="RemoveLayerButton" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons"] +margin_left = 36.0 +margin_right = 68.0 +margin_bottom = 32.0 hint_tooltip = "Remove current layer" mouse_default_cursor_shape = 8 disabled = true -text = "X" +texture_normal = ExtResource( 26 ) +texture_disabled = ExtResource( 27 ) -[node name="MoveUpLayer" type="Button" parent="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons"] -margin_left = 48.0 -margin_right = 67.0 -margin_bottom = 20.0 +[node name="MoveUpLayer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons"] +margin_left = 72.0 +margin_right = 104.0 +margin_bottom = 32.0 hint_tooltip = "Move up the current layer" mouse_default_cursor_shape = 8 disabled = true -text = "^" +texture_normal = ExtResource( 28 ) +texture_disabled = ExtResource( 29 ) -[node name="MoveDownLayer" type="Button" parent="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons"] -margin_left = 71.0 -margin_right = 90.0 -margin_bottom = 20.0 +[node name="MoveDownLayer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons"] +margin_left = 108.0 +margin_right = 140.0 +margin_bottom = 32.0 hint_tooltip = "Move down the current layer" mouse_default_cursor_shape = 8 disabled = true -text = "v" +texture_normal = ExtResource( 30 ) +texture_disabled = ExtResource( 31 ) -[node name="CloneLayer" type="Button" parent="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons"] -margin_left = 94.0 -margin_right = 118.0 -margin_bottom = 20.0 +[node name="CloneLayer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons"] +margin_left = 144.0 +margin_right = 176.0 +margin_bottom = 32.0 hint_tooltip = "Clone current layer" mouse_default_cursor_shape = 2 -text = "Cl" +texture_normal = ExtResource( 32 ) -[node name="MergeDownLayer" type="Button" parent="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons"] -margin_left = 122.0 -margin_right = 146.0 -margin_bottom = 20.0 +[node name="MergeDownLayer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons"] +margin_left = 180.0 +margin_right = 212.0 +margin_bottom = 32.0 hint_tooltip = "Merge down current layer" mouse_default_cursor_shape = 8 disabled = true -text = "M" - -[node name="HSeparator" type="HSeparator" parent="UI/LayerPanel/LayersAndMisc"] -margin_top = 385.0 -margin_right = 160.0 -margin_bottom = 389.0 - -[node name="OnionSkinningButtons" type="VBoxContainer" parent="UI/LayerPanel/LayersAndMisc"] -editor/display_folded = true -margin_top = 392.0 -margin_right = 160.0 -margin_bottom = 525.0 - -[node name="OnionSkinning" type="Label" parent="UI/LayerPanel/LayersAndMisc/OnionSkinningButtons"] -margin_right = 160.0 -margin_bottom = 31.0 -text = "Onion Skinning: -Past Steps" - -[node name="PastOnionSkinning" type="SpinBox" parent="UI/LayerPanel/LayersAndMisc/OnionSkinningButtons"] -margin_top = 35.0 -margin_right = 160.0 -margin_bottom = 59.0 - -[node name="OnionSkinningFuture" type="Label" parent="UI/LayerPanel/LayersAndMisc/OnionSkinningButtons"] -margin_top = 63.0 -margin_right = 160.0 -margin_bottom = 77.0 -text = "Future Steps" - -[node name="FutureOnionSkinning" type="SpinBox" parent="UI/LayerPanel/LayersAndMisc/OnionSkinningButtons"] -margin_top = 81.0 -margin_right = 160.0 -margin_bottom = 105.0 - -[node name="BlueRedMode" type="CheckBox" parent="UI/LayerPanel/LayersAndMisc/OnionSkinningButtons"] -margin_top = 109.0 -margin_right = 160.0 -margin_bottom = 133.0 -text = "Blue-Red Mode" - -[node name="HSeparator2" type="HSeparator" parent="UI/LayerPanel/LayersAndMisc"] -margin_top = 528.0 -margin_right = 160.0 -margin_bottom = 532.0 - -[node name="CursorPosition" type="Label" parent="UI/LayerPanel/LayersAndMisc"] -margin_top = 535.0 -margin_right = 160.0 -margin_bottom = 549.0 -text = "[64x64]" - -[node name="ZoomLevel" type="Label" parent="UI/LayerPanel/LayersAndMisc"] -margin_top = 552.0 -margin_right = 160.0 -margin_bottom = 566.0 -text = "Zoom: x7.81" - -[node name="CurrentFrame" type="Label" parent="UI/LayerPanel/LayersAndMisc"] -margin_top = 569.0 -margin_right = 160.0 -margin_bottom = 583.0 -text = "Current frame: 1/1" - -[node name="EmptyLabel" type="Label" parent="UI/LayerPanel/LayersAndMisc"] -margin_top = 586.0 -margin_right = 160.0 -margin_bottom = 600.0 +texture_normal = ExtResource( 33 ) +texture_disabled = ExtResource( 34 ) [node name="SplitScreenButton" type="Button" parent="."] anchor_left = 1.0 anchor_right = 1.0 -margin_left = -184.0 -margin_right = -164.0 -margin_bottom = 20.0 +margin_left = -244.0 +margin_top = 45.0 +margin_right = -224.0 +margin_bottom = 65.0 size_flags_vertical = 0 toggle_mode = true text = "<" @@ -1026,7 +1187,7 @@ editor/display_folded = true margin_right = 284.0 margin_bottom = 186.0 window_title = "About Pixelorama" -script = ExtResource( 9 ) +script = ExtResource( 35 ) [node name="AboutUI" type="VBoxContainer" parent="AboutDialog"] margin_left = 8.0 @@ -1091,44 +1252,44 @@ Copyright 2019 - Orama Interactive" align = 1 [node name="AnimationTimer" type="Timer" parent="."] -[connection signal="toggled" from="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftIndicatorCheckbox" to="." method="_on_LeftIndicatorCheckbox_toggled"] -[connection signal="color_changed" from="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftColorPickerButton" to="." method="_on_LeftColorPickerButton_color_changed"] -[connection signal="popup_closed" from="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftColorPickerButton" to="." method="_can_draw_true"] -[connection signal="pressed" from="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftColorPickerButton" to="." method="_can_draw_false"] -[connection signal="value_changed" from="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftBrushSizeEdit" to="." method="_on_LeftBrushSizeEdit_value_changed"] -[connection signal="value_changed" from="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/InterpolateColor/LeftInterpolateFactor" to="." method="_on_LeftInterpolateFactor_value_changed"] -[connection signal="toggled" from="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftHorizontalMirroring" to="." method="_on_LeftHorizontalMirroring_toggled"] -[connection signal="toggled" from="UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftVerticalMirroring" to="." method="_on_LeftVerticalMirroring_toggled"] -[connection signal="toggled" from="UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightIndicatorCheckbox" to="." method="_on_RightIndicatorCheckbox_toggled"] -[connection signal="color_changed" from="UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightColorPickerButton" to="." method="_on_RightColorPickerButton_color_changed"] -[connection signal="popup_closed" from="UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightColorPickerButton" to="." method="_can_draw_true"] -[connection signal="pressed" from="UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightColorPickerButton" to="." method="_can_draw_false"] -[connection signal="value_changed" from="UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightBrushSizeEdit" to="." method="_on_RightBrushSizeEdit_value_changed"] -[connection signal="value_changed" from="UI/ToolPanel/Tools/ToolOptions/RightToolOptions/InterpolateColor/RightInterpolateFactor" to="." method="_on_RightInterpolateFactor_value_changed"] -[connection signal="toggled" from="UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightHorizontalMirroring" to="." method="_on_RightHorizontalMirroring_toggled"] -[connection signal="toggled" from="UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightVerticalMirroring" to="." method="_on_RightVerticalMirroring_toggled"] -[connection signal="mouse_entered" from="UI/CanvasAndTimeline/HViewportContainer/ViewportContainer" to="." method="_on_ViewportContainer_mouse_entered"] -[connection signal="mouse_exited" from="UI/CanvasAndTimeline/HViewportContainer/ViewportContainer" to="." method="_on_ViewportContainer_mouse_exited"] -[connection signal="mouse_entered" from="UI/CanvasAndTimeline/HViewportContainer/ViewportContainer2" to="." method="_on_ViewportContainer_mouse_entered"] -[connection signal="mouse_exited" from="UI/CanvasAndTimeline/HViewportContainer/ViewportContainer2" to="." method="_on_ViewportContainer_mouse_exited"] -[connection signal="pressed" from="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/ButtonContainer/AnimationButtons/LoopAnim" to="." method="_on_LoopAnim_pressed"] -[connection signal="toggled" from="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/ButtonContainer/AnimationButtons/PlayBackwards" to="." method="_on_PlayBackwards_toggled"] -[connection signal="toggled" from="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/ButtonContainer/AnimationButtons/PlayForward" to="." method="_on_PlayForward_toggled"] -[connection signal="value_changed" from="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/ButtonContainer/AnimationButtons/FPSValue" to="." method="_on_FPSValue_value_changed"] -[connection signal="pressed" from="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/CenterContainer/FrameButtons/AddFrame" to="." method="add_frame"] -[connection signal="pressed" from="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/CenterContainer/FrameButtons/RemoveFrame" to="." method="_on_RemoveFrame_pressed"] -[connection signal="pressed" from="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/CenterContainer/FrameButtons/MoveFrameLeft" to="." method="change_frame_order" binds= [ -1 ]] -[connection signal="pressed" from="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/CenterContainer/FrameButtons/MoveFrameRight" to="." method="change_frame_order" binds= [ 1 ]] -[connection signal="pressed" from="UI/CanvasAndTimeline/AnimationTimeline/TimelineContainer/CenterContainer/FrameButtons/CloneFrame" to="." method="add_frame" binds= [ false ]] -[connection signal="pressed" from="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons/AddLayerButton" to="." method="add_layer"] -[connection signal="pressed" from="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons/RemoveLayerButton" to="." method="_on_RemoveLayerButton_pressed"] -[connection signal="pressed" from="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons/MoveUpLayer" to="." method="change_layer_order" binds= [ 1 ]] -[connection signal="pressed" from="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons/MoveDownLayer" to="." method="change_layer_order" binds= [ -1 ]] -[connection signal="pressed" from="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons/CloneLayer" to="." method="add_layer" binds= [ false ]] -[connection signal="pressed" from="UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons/MergeDownLayer" to="." method="_on_MergeLayer_pressed"] -[connection signal="value_changed" from="UI/LayerPanel/LayersAndMisc/OnionSkinningButtons/PastOnionSkinning" to="." method="_on_PastOnionSkinning_value_changed"] -[connection signal="value_changed" from="UI/LayerPanel/LayersAndMisc/OnionSkinningButtons/FutureOnionSkinning" to="." method="_on_FutureOnionSkinning_value_changed"] -[connection signal="toggled" from="UI/LayerPanel/LayersAndMisc/OnionSkinningButtons/BlueRedMode" to="." method="_on_BlueRedMode_toggled"] +[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftIndicatorCheckbox" to="." method="_on_LeftIndicatorCheckbox_toggled"] +[connection signal="color_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftColorPickerButton" to="." method="_on_LeftColorPickerButton_color_changed"] +[connection signal="popup_closed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftColorPickerButton" to="." method="_can_draw_true"] +[connection signal="pressed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftColorPickerButton" to="." method="_can_draw_false"] +[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftBrushSizeEdit" to="." method="_on_LeftBrushSizeEdit_value_changed"] +[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/InterpolateColor/LeftInterpolateFactor" to="." method="_on_LeftInterpolateFactor_value_changed"] +[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftHorizontalMirroring" to="." method="_on_LeftHorizontalMirroring_toggled"] +[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/LeftToolOptions/LeftVerticalMirroring" to="." method="_on_LeftVerticalMirroring_toggled"] +[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightIndicatorCheckbox" to="." method="_on_RightIndicatorCheckbox_toggled"] +[connection signal="color_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightColorPickerButton" to="." method="_on_RightColorPickerButton_color_changed"] +[connection signal="popup_closed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightColorPickerButton" to="." method="_can_draw_true"] +[connection signal="pressed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightColorPickerButton" to="." method="_can_draw_false"] +[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightBrushSizeEdit" to="." method="_on_RightBrushSizeEdit_value_changed"] +[connection signal="value_changed" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/InterpolateColor/RightInterpolateFactor" to="." method="_on_RightInterpolateFactor_value_changed"] +[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightHorizontalMirroring" to="." method="_on_RightHorizontalMirroring_toggled"] +[connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ToolOptions/RightToolOptions/RightVerticalMirroring" to="." method="_on_RightVerticalMirroring_toggled"] +[connection signal="mouse_entered" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/ViewportContainer" to="." method="_on_ViewportContainer_mouse_entered"] +[connection signal="mouse_exited" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/ViewportContainer" to="." method="_on_ViewportContainer_mouse_exited"] +[connection signal="mouse_entered" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportContainer2" to="." method="_on_ViewportContainer_mouse_entered"] +[connection signal="mouse_exited" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportContainer2" to="." method="_on_ViewportContainer_mouse_exited"] +[connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/FirstFrame" to="." method="_on_FirstFrame_pressed"] +[connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PreviousFrame" to="." method="_on_PreviousFrame_pressed"] +[connection signal="toggled" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PlayBackwards" to="." method="_on_PlayBackwards_toggled"] +[connection signal="toggled" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PlayForward" to="." method="_on_PlayForward_toggled"] +[connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/NextFrame" to="." method="_on_NextFrame_pressed"] +[connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/LastFrame" to="." method="_on_LastFrame_pressed"] +[connection signal="value_changed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons/FPSValue" to="." method="_on_FPSValue_value_changed"] +[connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons/LoopAnim" to="." method="_on_LoopAnim_pressed"] +[connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/ScrollContainer/FrameAndButtonContainer/AddFrame" to="." method="add_frame"] +[connection signal="value_changed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons/PastOnionSkinning" to="." method="_on_PastOnionSkinning_value_changed"] +[connection signal="value_changed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons/FutureOnionSkinning" to="." method="_on_FutureOnionSkinning_value_changed"] +[connection signal="toggled" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons/BlueRedMode" to="." method="_on_BlueRedMode_toggled"] +[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons/AddLayerButton" to="." method="add_layer"] +[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons/RemoveLayerButton" to="." method="_on_RemoveLayerButton_pressed"] +[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons/MoveUpLayer" to="." method="change_layer_order" binds= [ 1 ]] +[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons/MoveDownLayer" to="." method="change_layer_order" binds= [ -1 ]] +[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons/CloneLayer" to="." method="add_layer" binds= [ false ]] +[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/ScrollContainer/VBoxLayerContainer/CenterContainer/LayerButtons/MergeDownLayer" to="." method="_on_MergeLayer_pressed"] [connection signal="toggled" from="SplitScreenButton" to="." method="_on_SplitScreenButton_toggled"] [connection signal="confirmed" from="CreateNewImage" to="." method="_on_CreateNewImage_confirmed"] [connection signal="popup_hide" from="CreateNewImage" to="." method="_can_draw_true"] diff --git a/Prefabs/FrameButton.tscn b/Prefabs/FrameButton.tscn index 6f62bbf4e..10ec74759 100644 --- a/Prefabs/FrameButton.tscn +++ b/Prefabs/FrameButton.tscn @@ -14,6 +14,7 @@ mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 0 toggle_mode = true +button_mask = 3 script = ExtResource( 1 ) [node name="FrameTexture" type="TextureRect" parent="FrameButton"] @@ -26,6 +27,12 @@ size_flags_horizontal = 0 size_flags_vertical = 0 expand = true +[node name="PopupMenu" type="PopupMenu" parent="FrameButton"] +margin_right = 20.0 +margin_bottom = 20.0 +mouse_default_cursor_shape = 2 +items = [ "Remove Frame", null, 0, false, true, -1, 0, null, "", false, "Clone Frame", null, 0, false, false, -1, 0, null, "", false, "Move Left", null, 0, false, true, -1, 0, null, "", false, "Move Right", null, 0, false, true, -1, 0, null, "", false ] + [node name="FrameID" type="Label" parent="."] margin_top = 40.0 margin_right = 36.0 @@ -33,3 +40,4 @@ margin_bottom = 54.0 text = "0" align = 1 [connection signal="pressed" from="FrameButton" to="FrameButton" method="_on_FrameButton_pressed"] +[connection signal="id_pressed" from="FrameButton/PopupMenu" to="FrameButton" method="_on_PopupMenu_id_pressed"] diff --git a/Prefabs/LayerContainer.tscn b/Prefabs/LayerContainer.tscn index ab79dec8b..be14508f8 100644 --- a/Prefabs/LayerContainer.tscn +++ b/Prefabs/LayerContainer.tscn @@ -1,39 +1,46 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://Scripts/LayerContainer.gd" type="Script" id=1] +[ext_resource path="res://Assets/Graphics/Layers/layer_visible.png" type="Texture" id=2] + [node name="LayerContainer" type="Button"] -margin_right = 159.0 -margin_bottom = 46.0 -rect_min_size = Vector2( 0, 42 ) +margin_left = -0.540344 +margin_right = 11.4597 +margin_bottom = 42.0 +rect_min_size = Vector2( 160, 42 ) toggle_mode = true script = ExtResource( 1 ) [node name="HBoxContainer" type="HBoxContainer" parent="."] -margin_left = 7.0 -margin_top = 5.0 -margin_right = 152.0 -margin_bottom = 37.0 +anchor_top = 0.5 +anchor_right = 1.0 +anchor_bottom = 0.5 +margin_left = 4.0 +margin_top = -16.0 +margin_bottom = 16.0 mouse_default_cursor_shape = 2 -[node name="VisibilityButton" type="Button" parent="HBoxContainer"] -margin_right = 20.0 +[node name="VisibilityButton" type="TextureButton" parent="HBoxContainer"] +margin_right = 32.0 margin_bottom = 32.0 hint_tooltip = "Toggle layer's visibility" mouse_default_cursor_shape = 2 -text = "V" +size_flags_horizontal = 0 +size_flags_vertical = 4 +texture_normal = ExtResource( 2 ) [node name="TextureRect" type="TextureRect" parent="HBoxContainer"] -margin_left = 24.0 -margin_right = 56.0 +margin_left = 36.0 +margin_right = 68.0 margin_bottom = 32.0 rect_min_size = Vector2( 32, 32 ) expand = true [node name="Label" type="Label" parent="HBoxContainer"] -margin_left = 60.0 +margin_left = 72.0 margin_top = 9.0 -margin_right = 106.0 +margin_right = 118.0 margin_bottom = 23.0 text = "Layer 0" align = 1 diff --git a/Scripts/Canvas.gd b/Scripts/Canvas.gd index e0346f464..fae9f743b 100644 --- a/Scripts/Canvas.gd +++ b/Scripts/Canvas.gd @@ -54,9 +54,6 @@ func _ready() -> void: camera_zoom() func camera_zoom() -> void: - #Set camera offset to the center of canvas - Global.camera.offset = size / 2 - Global.camera2.offset = size / 2 #Set camera zoom based on the sprite size var bigger = max(size.x, size.y) var zoom_max := Vector2(bigger, bigger) * 0.01 @@ -70,6 +67,12 @@ func camera_zoom() -> void: Global.camera2.zoom = Vector2(bigger, bigger) * 0.002 Global.zoom_level_label.text = "Zoom: x%s" % [stepify(1 / Global.camera.zoom.x, 0.01)] + #Set camera offset to the center of canvas + Global.camera.offset = size / 2 + #Global.camera.offset.x = size.x / 2 + Global.main_viewport.rect_size.x / 2 * -Global.camera.zoom.x + #Global.camera.offset.y = size.y / 2 + Global.main_viewport.rect_size.y / 2 * -Global.camera.zoom.y + Global.camera2.offset = size / 2 + # warning-ignore:unused_argument func _process(delta) -> void: sprite_changed_this_frame = false @@ -131,7 +134,7 @@ func _process(delta) -> void: pencil_and_eraser(mouse_pos, current_color, current_mouse_button) "Eraser": pencil_and_eraser(mouse_pos, Color(0, 0, 0, 0), current_mouse_button) - "Fill": + "Bucket": if mouse_in_canvas && Global.can_draw && Global.has_focus && Global.current_frame == frame: var current_color : Color var horizontal_mirror := false @@ -244,9 +247,8 @@ func _process(delta) -> void: func handle_undo(action : String) -> void: var canvases := [] - var animation_timer := $"../../../../../../AnimationTimer" var layer_index := -1 - if animation_timer.is_stopped(): #if we're not animating, store only the current canvas + if Global.animation_timer.is_stopped(): #if we're not animating, store only the current canvas canvases = [self] layer_index = current_layer_index else: #If we're animating, store all canvases @@ -270,9 +272,8 @@ func handle_redo(action : String) -> void: if Global.undos < Global.undo_redo.get_version(): return var canvases := [] - var animation_timer := $"../../../../../../AnimationTimer" var layer_index := -1 - if animation_timer.is_stopped(): + if Global.animation_timer.is_stopped(): canvases = [self] layer_index = current_layer_index else: diff --git a/Scripts/FrameButton.gd b/Scripts/FrameButton.gd index 810f85d76..709b409f2 100644 --- a/Scripts/FrameButton.gd +++ b/Scripts/FrameButton.gd @@ -1,6 +1,122 @@ extends Button var frame := 0 +onready var popup_menu := $PopupMenu func _on_FrameButton_pressed() -> void: - Global.current_frame = frame + if Input.is_action_just_released("left_mouse"): + Global.current_frame = frame + else: + if Global.canvases.size() == 1: + popup_menu.set_item_disabled(0, true) + popup_menu.set_item_disabled(2, true) + popup_menu.set_item_disabled(3, true) + else: + popup_menu.set_item_disabled(0, false) + if frame > 0: + popup_menu.set_item_disabled(2, false) + if frame < Global.canvases.size() - 1: + popup_menu.set_item_disabled(3, false) + popup_menu.popup(Rect2(get_global_mouse_position(), Vector2.ONE)) + pressed = !pressed + +func _on_PopupMenu_id_pressed(ID : int) -> void: + match ID: + 0: #Remove Frame + var canvas : Canvas = Global.canvases[frame] + var new_canvases := Global.canvases.duplicate() + new_canvases.erase(canvas) + var new_hidden_canvases := Global.hidden_canvases.duplicate() + new_hidden_canvases.append(canvas) + var current_frame := Global.current_frame + if current_frame > 0 && current_frame == new_canvases.size(): #If it's the last frame + current_frame -= 1 + + Global.undos += 1 + Global.undo_redo.create_action("Remove Frame") + + Global.undo_redo.add_do_property(Global, "canvases", new_canvases) + Global.undo_redo.add_do_property(Global, "hidden_canvases", new_hidden_canvases) + Global.undo_redo.add_do_property(Global, "canvas", new_canvases[current_frame]) + Global.undo_redo.add_do_property(Global, "current_frame", current_frame) + + for i in range(frame, new_canvases.size()): + var c : Canvas = new_canvases[i] + Global.undo_redo.add_do_property(c, "frame", i) + Global.undo_redo.add_undo_property(c, "frame", c.frame) + + Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases) + Global.undo_redo.add_undo_property(Global, "hidden_canvases", Global.hidden_canvases) + Global.undo_redo.add_undo_property(Global, "canvas", canvas) + Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame) + + Global.undo_redo.add_do_method(Global, "redo", [canvas]) + Global.undo_redo.add_undo_method(Global, "undo", [canvas]) + Global.undo_redo.commit_action() + + 1: #Clone Layer + var canvas : Canvas = Global.canvases[frame] + var new_canvas : Canvas = load("res://Prefabs/Canvas.tscn").instance() + new_canvas.size = Global.canvas.size + new_canvas.frame = Global.canvases.size() + + var new_canvases := Global.canvases.duplicate() + new_canvases.append(new_canvas) + var new_hidden_canvases := Global.hidden_canvases.duplicate() + new_hidden_canvases.append(new_canvas) + + for layer in canvas.layers: #Copy every layer + var sprite := Image.new() + sprite.copy_from(layer[0]) + sprite.lock() + var tex := ImageTexture.new() + tex.create_from_image(sprite, 0) + new_canvas.layers.append([sprite, tex, layer[2], layer[3]]) + + Global.undos += 1 + Global.undo_redo.create_action("Add Frame") + Global.undo_redo.add_do_method(Global, "redo", [new_canvas]) + Global.undo_redo.add_undo_method(Global, "undo", [new_canvas]) + + Global.undo_redo.add_do_property(Global, "canvases", new_canvases) + Global.undo_redo.add_do_property(Global, "hidden_canvases", Global.hidden_canvases) + Global.undo_redo.add_do_property(Global, "canvas", new_canvas) + Global.undo_redo.add_do_property(Global, "current_frame", new_canvases.size() - 1) + for child in Global.frame_container.get_children(): + var frame_button = child.get_node("FrameButton") + Global.undo_redo.add_do_property(frame_button, "pressed", false) + Global.undo_redo.add_undo_property(frame_button, "pressed", frame_button.pressed) + for c in Global.canvases: + Global.undo_redo.add_do_property(c, "visible", false) + Global.undo_redo.add_undo_property(c, "visible", c.visible) + + Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases) + Global.undo_redo.add_undo_property(Global, "hidden_canvases", new_hidden_canvases) + Global.undo_redo.add_undo_property(Global, "canvas", Global.canvas) + Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame) + Global.undo_redo.commit_action() + + 2: #Move Left + change_frame_order(-1) + 3: #Move Right + change_frame_order(1) + +func change_frame_order(rate : int) -> void: + var change = frame + rate + var new_canvases := Global.canvases.duplicate() + var temp = new_canvases[frame] + new_canvases[frame] = new_canvases[change] + new_canvases[change] = temp + + Global.undo_redo.create_action("Change Frame Order") + Global.undo_redo.add_do_property(Global, "canvases", new_canvases) + Global.undo_redo.add_do_property(Global.canvases[frame], "frame", change) + Global.undo_redo.add_do_property(Global.canvases[change], "frame", frame) + + Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases) + Global.undo_redo.add_undo_property(Global.canvases[frame], "frame", frame) + Global.undo_redo.add_undo_property(Global.canvases[change], "frame", change) + + Global.undo_redo.add_undo_method(Global, "undo", [Global.canvases[frame]]) + Global.undo_redo.add_do_method(Global, "redo", [Global.canvases[frame]]) + Global.undo_redo.commit_action() \ No newline at end of file diff --git a/Scripts/Global.gd b/Scripts/Global.gd index 254c102f6..42213d69f 100644 --- a/Scripts/Global.gd +++ b/Scripts/Global.gd @@ -23,6 +23,7 @@ var hidden_canvases := [] var control : Node var canvas : Canvas var canvas_parent : Node +var main_viewport : ViewportContainer var second_viewport : ViewportContainer var viewport_separator : VSeparator var split_screen_button : Button @@ -41,8 +42,6 @@ var file_menu : MenuButton var edit_menu : MenuButton var view_menu : MenuButton var help_menu : MenuButton -var left_indicator : Sprite -var right_indicator : Sprite var left_color_picker : ColorPickerButton var right_color_picker : ColorPickerButton var left_brush_size_edit : SpinBox @@ -52,18 +51,16 @@ var right_interpolate_slider : HSlider var left_brush_indicator : Sprite var right_brush_indicator : Sprite -var loop_animation_button : Button -var play_forward : Button -var play_backwards : Button +var loop_animation_button : BaseButton +var play_forward : BaseButton +var play_backwards : BaseButton var frame_container : HBoxContainer -var remove_frame_button : Button -var move_left_frame_button : Button -var move_right_frame_button : Button var vbox_layer_container : VBoxContainer -var remove_layer_button : Button -var move_up_layer_button : Button -var move_down_layer_button : Button -var merge_down_layer_button : Button +var remove_layer_button : BaseButton +var move_up_layer_button : BaseButton +var move_down_layer_button : BaseButton +var merge_down_layer_button : BaseButton +var animation_timer : Timer var cursor_position_label : Label var zoom_level_label : Label var current_frame_label : Label @@ -114,11 +111,12 @@ func _ready() -> void: canvas = find_node_by_name(root, "Canvas") canvases.append(canvas) canvas_parent = canvas.get_parent() + main_viewport = find_node_by_name(root, "ViewportContainer") second_viewport = find_node_by_name(root, "ViewportContainer2") viewport_separator = find_node_by_name(root, "ViewportSeparator") split_screen_button = find_node_by_name(root, "SplitScreenButton") camera = find_node_by_name(canvas_parent, "Camera2D") - camera2 = find_node_by_name(canvas_parent.get_parent().get_parent(), "Camera2D2") + camera2 = find_node_by_name(root, "Camera2D2") selection_rectangle = find_node_by_name(root, "SelectionRectangle") image_clipboard = Image.new() @@ -127,8 +125,6 @@ func _ready() -> void: edit_menu = find_node_by_name(root, "EditMenu") view_menu = find_node_by_name(root, "ViewMenu") help_menu = find_node_by_name(root, "HelpMenu") - left_indicator = find_node_by_name(root, "LeftIndicator") - right_indicator = find_node_by_name(root, "RightIndicator") left_color_picker = find_node_by_name(root, "LeftColorPickerButton") right_color_picker = find_node_by_name(root, "RightColorPickerButton") left_brush_size_edit = find_node_by_name(root, "LeftBrushSizeEdit") @@ -143,14 +139,12 @@ func _ready() -> void: play_forward = find_node_by_name(root, "PlayForward") play_backwards = find_node_by_name(root, "PlayBackwards") frame_container = find_node_by_name(root, "FrameContainer") - remove_frame_button = find_node_by_name(root, "RemoveFrame") - move_left_frame_button = find_node_by_name(root, "MoveFrameLeft") - move_right_frame_button = find_node_by_name(root, "MoveFrameRight") vbox_layer_container = find_node_by_name(root, "VBoxLayerContainer") remove_layer_button = find_node_by_name(root, "RemoveLayerButton") move_up_layer_button = find_node_by_name(root, "MoveUpLayer") move_down_layer_button = find_node_by_name(root, "MoveDownLayer") merge_down_layer_button = find_node_by_name(root, "MergeDownLayer") + animation_timer = find_node_by_name(root, "AnimationTimer") cursor_position_label = find_node_by_name(root, "CursorPosition") zoom_level_label = find_node_by_name(root, "ZoomLevel") current_frame_label = find_node_by_name(root, "CurrentFrame") @@ -204,11 +198,9 @@ func undo(_canvases : Array, layer_index : int = -1) -> void: canvas_parent.move_child(_canvases[0], _canvases[0].frame) frame_container.add_child(_canvases[0].frame_button) frame_container.move_child(_canvases[0].frame_button, _canvases[0].frame) - remove_frame_button.disabled = false - remove_frame_button.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND elif action_name == "Change Frame Order": - frame_container.move_child(_canvases[0].frame_button, current_frame) - canvas_parent.move_child(_canvases[0], current_frame) + frame_container.move_child(_canvases[0].frame_button, _canvases[0].frame) + canvas_parent.move_child(_canvases[0], _canvases[0].frame) notification_label("Undo: %s" % action_name) @@ -238,17 +230,12 @@ func redo(_canvases : Array, layer_index : int = -1) -> void: canvas_parent.add_child(_canvases[0]) if !Global.frame_container.is_a_parent_of(_canvases[0].frame_button): Global.frame_container.add_child(_canvases[0].frame_button) - remove_frame_button.disabled = false - remove_frame_button.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND elif action_name == "Remove Frame": canvas_parent.remove_child(_canvases[0]) frame_container.remove_child(_canvases[0].frame_button) - if len(canvases) == 1: - remove_frame_button.disabled = true - remove_frame_button.mouse_default_cursor_shape = Control.CURSOR_FORBIDDEN elif action_name == "Change Frame Order": - frame_container.move_child(_canvases[0].frame_button, current_frame) - canvas_parent.move_child(_canvases[0], current_frame) + frame_container.move_child(_canvases[0].frame_button, _canvases[0].frame) + canvas_parent.move_child(_canvases[0], _canvases[0].frame) if control.redone: notification_label("Redo: %s" % action_name) @@ -268,20 +255,6 @@ func frame_changed(value : int) -> void: #Make only the current frame button pressed canvas.frame_button.get_node("FrameButton").pressed = true - if current_frame == 0: - move_left_frame_button.disabled = true - move_left_frame_button.mouse_default_cursor_shape = Control.CURSOR_FORBIDDEN - else: - move_left_frame_button.disabled = false - move_left_frame_button.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND - - if current_frame == canvases.size() - 1: - move_right_frame_button.disabled = true - move_right_frame_button.mouse_default_cursor_shape = Control.CURSOR_FORBIDDEN - else: - move_right_frame_button.disabled = false - move_right_frame_button.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND - func create_brush_button(brush_img : Image, brush_type := BRUSH_TYPES.CUSTOM) -> void: var hbox_container : HBoxContainer diff --git a/Scripts/HorizontalRuler.gd b/Scripts/HorizontalRuler.gd index 5c20cc0ba..854b8c0b9 100644 --- a/Scripts/HorizontalRuler.gd +++ b/Scripts/HorizontalRuler.gd @@ -9,6 +9,7 @@ var minor_subdivision := 5 var first : Vector2 var last : Vector2 +# warning-ignore:unused_argument func _process(delta) -> void: update() diff --git a/Scripts/LayerContainer.gd b/Scripts/LayerContainer.gd index 8f0f7a820..0f2b65f68 100644 --- a/Scripts/LayerContainer.gd +++ b/Scripts/LayerContainer.gd @@ -58,10 +58,10 @@ func changed_selection() -> void: func _on_VisibilityButton_pressed() -> void: if Global.canvas.layers[i][3]: Global.canvas.layers[i][3] = false - get_child(0).get_child(0).text = "I" + get_child(0).get_child(0).texture_normal = preload("res://Assets/Graphics/Layers/layer_invisible.png") else: Global.canvas.layers[i][3] = true - get_child(0).get_child(0).text = "V" + get_child(0).get_child(0).texture_normal = preload("res://Assets/Graphics/Layers/layer_visible.png") func _on_LineEdit_text_changed(new_text : String) -> void: Global.canvas.layers[i][2] = new_text diff --git a/Scripts/Main.gd b/Scripts/Main.gd index 1b434a901..d56af8d01 100644 --- a/Scripts/Main.gd +++ b/Scripts/Main.gd @@ -10,7 +10,7 @@ var export_all_frames : CheckBox var export_as_single_file : CheckBox var export_vertical_spritesheet : CheckBox var redone := false -var fps := 1.0 +var fps := 6.0 var animation_loop := 0 #0 is no loop, 1 is cycle loop, 2 is ping-pong loop var animation_forward := true @@ -19,7 +19,7 @@ func _ready() -> void: OS.set_window_title("Pixelorama %s" % ProjectSettings.get_setting("application/config/Version")) # Set a minimum window size to prevent UI elements from collapsing on each other. # This property is only available in 3.2alpha or later, so use `set()` to fail gracefully if it doesn't exist. - OS.set("min_window_size", Vector2(1024, 600)) + OS.set("min_window_size", Vector2(1152, 648)) var file_menu_items := { "New..." : KEY_MASK_CTRL + KEY_N, @@ -78,7 +78,7 @@ func _ready() -> void: #Node, left mouse shortcut, right mouse shortcut tools.append([Global.find_node_by_name(root, "Pencil"), "left_pencil_tool", "right_pencil_tool"]) tools.append([Global.find_node_by_name(root, "Eraser"), "left_eraser_tool", "right_eraser_tool"]) - tools.append([Global.find_node_by_name(root, "Fill"), "left_fill_tool", "right_fill_tool"]) + tools.append([Global.find_node_by_name(root, "Bucket"), "left_fill_tool", "right_fill_tool"]) tools.append([Global.find_node_by_name(root, "PaintAllPixelsSameColor"), "left_paint_all_tool", "right_paint_all_tool"]) tools.append([Global.find_node_by_name(root, "LightenDarken"), "left_lightdark_tool", "right_lightdark_tool"]) tools.append([Global.find_node_by_name(root, "RectSelect"), "left_rectangle_select_tool", "right_rectangle_select_tool"]) @@ -550,12 +550,21 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le var current_action := tool_pressed.name if (mouse_press && Input.is_action_just_released("left_mouse")) || (!mouse_press && key_for_left): Global.current_left_tool = current_action - Global.left_indicator.get_parent().remove_child(Global.left_indicator) - tool_pressed.add_child(Global.left_indicator) elif (mouse_press && Input.is_action_just_released("right_mouse")) || (!mouse_press && !key_for_left): Global.current_right_tool = current_action - Global.right_indicator.get_parent().remove_child(Global.right_indicator) - tool_pressed.add_child(Global.right_indicator) + + for t in tools: + var tool_name : String = t[0].name + if tool_name == "PaintAllPixelsSameColor": + continue + if tool_name == Global.current_left_tool && tool_name == Global.current_right_tool: + t[0].texture_normal = load("res://Assets/Graphics/Tools/%s_l_r.png" % tool_name) + elif tool_name == Global.current_left_tool: + t[0].texture_normal = load("res://Assets/Graphics/Tools/%s_l.png" % tool_name) + elif tool_name == Global.current_right_tool: + t[0].texture_normal = load("res://Assets/Graphics/Tools/%s_r.png" % tool_name) + else: + t[0].texture_normal = load("res://Assets/Graphics/Tools/%s.png" % tool_name) func _on_LeftIndicatorCheckbox_toggled(button_pressed) -> void: Global.left_square_indicator_visible = button_pressed @@ -643,33 +652,24 @@ func _on_MergeLayer_pressed() -> void: Global.undo_redo.add_do_method(Global, "redo", [Global.canvas]) Global.undo_redo.commit_action() -func add_frame(is_new := true) -> void: - var canvas : Canvas = load("res://Prefabs/Canvas.tscn").instance() - canvas.size = Global.canvas.size - canvas.frame = Global.canvases.size() +func add_frame() -> void: + var new_canvas : Canvas = load("res://Prefabs/Canvas.tscn").instance() + new_canvas.size = Global.canvas.size + new_canvas.frame = Global.canvases.size() var new_canvases := Global.canvases.duplicate() - new_canvases.append(canvas) + new_canvases.append(new_canvas) var new_hidden_canvases := Global.hidden_canvases.duplicate() - new_hidden_canvases.append(canvas) - - if !is_new: #If we're cloning - for layer in Global.canvas.layers: #Copy every layer - var sprite := Image.new() - sprite.copy_from(layer[0]) - sprite.lock() - var tex := ImageTexture.new() - tex.create_from_image(sprite, 0) - canvas.layers.append([sprite, tex, layer[2], layer[3]]) + new_hidden_canvases.append(new_canvas) Global.undos += 1 Global.undo_redo.create_action("Add Frame") - Global.undo_redo.add_do_method(Global, "redo", [canvas]) - Global.undo_redo.add_undo_method(Global, "undo", [canvas]) + Global.undo_redo.add_do_method(Global, "redo", [new_canvas]) + Global.undo_redo.add_undo_method(Global, "undo", [new_canvas]) Global.undo_redo.add_do_property(Global, "canvases", new_canvases) Global.undo_redo.add_do_property(Global, "hidden_canvases", Global.hidden_canvases) - Global.undo_redo.add_do_property(Global, "canvas", canvas) + Global.undo_redo.add_do_property(Global, "canvas", new_canvas) Global.undo_redo.add_do_property(Global, "current_frame", new_canvases.size() - 1) for child in Global.frame_container.get_children(): var frame_button = child.get_node("FrameButton") @@ -685,102 +685,55 @@ func add_frame(is_new := true) -> void: Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame) Global.undo_redo.commit_action() -func _on_RemoveFrame_pressed() -> void: - var new_canvases := Global.canvases.duplicate() - new_canvases.erase(Global.canvas) - var new_hidden_canvases := Global.hidden_canvases.duplicate() - new_hidden_canvases.append(Global.canvas) - var current_frame := Global.current_frame - if current_frame > 0 && current_frame == new_canvases.size(): - current_frame -= 1 - - Global.undos += 1 - Global.undo_redo.create_action("Remove Frame") - Global.undo_redo.add_undo_method(Global, "undo", [Global.canvas]) - - Global.undo_redo.add_do_property(Global, "canvases", new_canvases) - Global.undo_redo.add_do_property(Global, "hidden_canvases", new_hidden_canvases) - Global.undo_redo.add_do_property(Global, "canvas", new_canvases[current_frame]) - Global.undo_redo.add_do_property(Global, "current_frame", current_frame) - - var i := 0 - for canvas in new_canvases: - Global.undo_redo.add_do_property(canvas, "frame", i) - Global.undo_redo.add_undo_property(canvas, "frame", canvas.frame) - i += 1 - - Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases) - Global.undo_redo.add_undo_property(Global, "hidden_canvases", Global.hidden_canvases) - Global.undo_redo.add_undo_property(Global, "canvas", Global.canvas) - Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame) - - Global.undo_redo.add_do_method(Global, "redo", [Global.canvas]) - Global.undo_redo.commit_action() - -func change_frame_order(rate : int) -> void: - var change = Global.current_frame + rate - - var new_canvases := Global.canvases.duplicate() - var temp = new_canvases[Global.current_frame] - new_canvases[Global.current_frame] = new_canvases[change] - new_canvases[change] = temp - - Global.undo_redo.create_action("Change Frame Order") - Global.undo_redo.add_do_property(Global, "canvases", new_canvases) - Global.undo_redo.add_do_property(Global.canvas, "frame", change) - Global.undo_redo.add_do_property(Global.canvases[change], "frame", Global.current_frame) - Global.undo_redo.add_do_property(Global, "current_frame", change) - - Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases) - Global.undo_redo.add_undo_property(Global.canvas, "frame", Global.current_frame) - Global.undo_redo.add_undo_property(Global.canvases[change], "frame", change) - Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame) - - Global.undo_redo.add_undo_method(Global, "undo", [Global.canvas]) - Global.undo_redo.add_do_method(Global, "redo", [Global.canvas]) - Global.undo_redo.commit_action() - func _on_LoopAnim_pressed() -> void: - match Global.loop_animation_button.text: - "No": + match Global.loop_animation_button.texture_normal.resource_path: + "res://Assets/Graphics/Timeline/Loop_None.png": #Make it loop animation_loop = 1 - Global.loop_animation_button.text = "Cycle" - "Cycle": + Global.loop_animation_button.texture_normal = preload("res://Assets/Graphics/Timeline/Loop.png") + "res://Assets/Graphics/Timeline/Loop.png": #Make it ping-pong animation_loop = 2 - Global.loop_animation_button.text = "Ping-Pong" - "Ping-Pong": + Global.loop_animation_button.texture_normal = preload("res://Assets/Graphics/Timeline/Loop_PingPong.png") + "res://Assets/Graphics/Timeline/Loop_PingPong.png": #Make it stop animation_loop = 0 - Global.loop_animation_button.text = "No" + Global.loop_animation_button.texture_normal = preload("res://Assets/Graphics/Timeline/Loop_None.png") func _on_PlayForward_toggled(button_pressed) -> void: Global.play_backwards.pressed = false - Global.play_backwards.text = "Play Backwards" if button_pressed: - Global.play_forward.text = "Stop" $AnimationTimer.wait_time = 1 / fps $AnimationTimer.start() animation_forward = true else: - Global.play_forward.text = "Play Forward" $AnimationTimer.stop() func _on_PlayBackwards_toggled(button_pressed) -> void: Global.play_forward.pressed = false - Global.play_forward.text = "Play Forward" if button_pressed: - Global.play_backwards.text = "Stop" $AnimationTimer.wait_time = 1 / fps $AnimationTimer.start() animation_forward = false else: - Global.play_backwards.text = "Play Backwards" $AnimationTimer.stop() +func _on_NextFrame_pressed() -> void: + if Global.current_frame < Global.canvases.size() - 1: + Global.current_frame += 1 + +func _on_PreviousFrame_pressed() -> void: + if Global.current_frame > 0: + Global.current_frame -= 1 + +func _on_LastFrame_pressed() -> void: + Global.current_frame = Global.canvases.size() - 1 + +func _on_FirstFrame_pressed() -> void: + Global.current_frame = 0 + func _on_AnimationTimer_timeout() -> void: if animation_forward: if Global.current_frame < Global.canvases.size() - 1: @@ -789,9 +742,7 @@ func _on_AnimationTimer_timeout() -> void: match animation_loop: 0: #No loop Global.play_forward.pressed = false - Global.play_forward.text = "Play Forward" Global.play_backwards.pressed = false - Global.play_backwards.text = "Play Backwards" $AnimationTimer.stop() 1: #Cycle loop Global.current_frame = 0 @@ -806,9 +757,7 @@ func _on_AnimationTimer_timeout() -> void: match animation_loop: 0: #No loop Global.play_backwards.pressed = false - Global.play_backwards.text = "Play Backwards" Global.play_forward.pressed = false - Global.play_forward.text = "Play Forward" $AnimationTimer.stop() 1: #Cycle loop Global.current_frame = Global.canvases.size() - 1 diff --git a/Scripts/NotificationLabel.gd b/Scripts/NotificationLabel.gd index 7db0c4984..77cb82883 100644 --- a/Scripts/NotificationLabel.gd +++ b/Scripts/NotificationLabel.gd @@ -1,8 +1,5 @@ extends Label -# 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() -> void: diff --git a/Scripts/SecondViewport.gd b/Scripts/SecondViewport.gd index 6ccbac208..d283f4366 100644 --- a/Scripts/SecondViewport.gd +++ b/Scripts/SecondViewport.gd @@ -2,4 +2,4 @@ extends Viewport # Called when the node enters the scene tree for the first time. func _ready() -> void: - world_2d = $"../../ViewportContainer/Viewport".world_2d + world_2d = Global.canvas.get_parent().world_2d diff --git a/Scripts/SelectionRectangle.gd b/Scripts/SelectionRectangle.gd index c2b1411f9..9c8fb86c9 100644 --- a/Scripts/SelectionRectangle.gd +++ b/Scripts/SelectionRectangle.gd @@ -56,7 +56,7 @@ func _process(delta) -> void: tex.create_from_image(img, 0) update() else: - get_parent().get_parent().mouse_default_cursor_shape = Input.CURSOR_CROSS + get_parent().get_parent().mouse_default_cursor_shape = Input.CURSOR_ARROW if is_dragging: if (Global.current_left_tool == "RectSelect" && Input.is_action_pressed("left_mouse")) || (Global.current_right_tool == "RectSelect" && Input.is_action_pressed("right_mouse")): diff --git a/Scripts/VerticalRuler.gd b/Scripts/VerticalRuler.gd index 8225f187b..1cc924eb2 100644 --- a/Scripts/VerticalRuler.gd +++ b/Scripts/VerticalRuler.gd @@ -9,6 +9,7 @@ var minor_subdivision := 5 var first : Vector2 var last : Vector2 +# warning-ignore:unused_argument func _process(delta) -> void: update() diff --git a/icon.png b/icon.png index 916277470..62e85a40e 100644 Binary files a/icon.png and b/icon.png differ diff --git a/project.godot b/project.godot index ebda5c73e..f34cd579f 100644 --- a/project.godot +++ b/project.godot @@ -40,6 +40,34 @@ Global="*res://Scripts/Global.gd" gdscript/warnings/narrowing_conversion=false gdscript/warnings/return_value_discarded=false +[display] + +window/size/width=1152 +window/size/height=648 + +[importer_defaults] + +texture={ +"compress/bptc_ldr": 0, +"compress/hdr_mode": 0, +"compress/lossy_quality": 0.7, +"compress/mode": 0, +"compress/normal_map": 0, +"detect_3d": true, +"flags/anisotropic": false, +"flags/filter": false, +"flags/mipmaps": false, +"flags/repeat": 0, +"flags/srgb": 2, +"process/HDR_as_SRGB": false, +"process/fix_alpha_border": true, +"process/invert_color": false, +"process/premult_alpha": false, +"size_limit": 0, +"stream": false, +"svg/scale": 1.0 +} + [input] zoom_in={