Merge branch 'master' into palette_updates

This commit is contained in:
CheetoHead 2019-12-16 20:36:06 -05:00
commit 97efa20055
5 changed files with 327 additions and 193 deletions

View file

@ -1,27 +1,7 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=3 format=2]
[ext_resource path="res://Scripts/FrameButton.gd" type="Script" id=1]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.337255, 0.32549, 0.388235, 1 )
corner_radius_top_left = 2
corner_radius_top_right = 2
corner_radius_bottom_right = 2
corner_radius_bottom_left = 2
[sub_resource type="StyleBoxFlat" id=2]
bg_color = Color( 0.211765, 0.2, 0.247059, 1 )
corner_radius_top_left = 2
corner_radius_top_right = 2
corner_radius_bottom_right = 2
corner_radius_bottom_left = 2
[sub_resource type="StyleBoxFlat" id=3]
bg_color = Color( 0.270588, 0.258824, 0.305882, 1 )
corner_radius_top_left = 2
corner_radius_top_right = 2
corner_radius_bottom_right = 2
corner_radius_bottom_left = 2
[ext_resource path="res://Themes & Styles/Main Theme.tres" type="Theme" id=1]
[ext_resource path="res://Scripts/FrameButton.gd" type="Script" id=2]
[node name="Frame" type="VBoxContainer"]
margin_right = 32.0
@ -34,12 +14,10 @@ rect_min_size = Vector2( 36, 36 )
mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 0
custom_styles/hover = SubResource( 1 )
custom_styles/pressed = SubResource( 2 )
custom_styles/normal = SubResource( 3 )
theme = ExtResource( 1 )
toggle_mode = true
button_mask = 3
script = ExtResource( 1 )
script = ExtResource( 2 )
[node name="FrameTexture" type="TextureRect" parent="FrameButton"]
margin_left = 2.0

View file

@ -1,26 +1,16 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=4 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]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.337255, 0.32549, 0.388235, 1 )
[sub_resource type="StyleBoxFlat" id=2]
bg_color = Color( 0.211765, 0.2, 0.247059, 1 )
[sub_resource type="StyleBoxFlat" id=3]
bg_color = Color( 0.270588, 0.258824, 0.305882, 1 )
[ext_resource path="res://Themes & Styles/Main Theme.tres" type="Theme" id=1]
[ext_resource path="res://Scripts/LayerContainer.gd" type="Script" id=2]
[ext_resource path="res://Assets/Graphics/Layers/layer_visible.png" type="Texture" id=3]
[node name="LayerContainer" type="Button"]
margin_right = 160.0
margin_bottom = 42.0
rect_min_size = Vector2( 160, 42 )
custom_styles/hover = SubResource( 1 )
custom_styles/pressed = SubResource( 2 )
custom_styles/normal = SubResource( 3 )
theme = ExtResource( 1 )
toggle_mode = true
script = ExtResource( 1 )
script = ExtResource( 2 )
__meta__ = {
"_edit_horizontal_guides_": [ ]
}
@ -34,7 +24,7 @@ hint_tooltip = "LAYERVISIBILITY_HT"
mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 4
texture_normal = ExtResource( 2 )
texture_normal = ExtResource( 3 )
[node name="HBoxContainer" type="HBoxContainer" parent="."]
anchor_left = 0.5
@ -57,8 +47,8 @@ stretch_mode = 6
[node name="Label" type="Label" parent="HBoxContainer"]
margin_left = 36.0
margin_top = 9.0
margin_right = 82.0
margin_top = 8.0
margin_right = 75.0
margin_bottom = 23.0
text = "Layer 0"
align = 1