Merge remote-tracking branch 'upstream/master'

This commit is contained in:
CheetoHead 2019-12-21 10:50:28 -05:00
commit 5f434e7d33
329 changed files with 3050 additions and 918 deletions

View file

@ -14,7 +14,7 @@ mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 0
toggle_mode = true
button_mask = 3
button_mask = 7
script = ExtResource( 1 )
[node name="FrameTexture" type="TextureRect" parent="FrameButton"]

View file

@ -1,7 +1,8 @@
[gd_scene load_steps=3 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]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Layer_Visible.png" type="Texture" id=2]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Layer_Visible_Hover.png" type="Texture" id=3]
[node name="LayerContainer" type="Button"]
margin_right = 160.0
@ -13,7 +14,9 @@ __meta__ = {
"_edit_horizontal_guides_": [ ]
}
[node name="VisibilityButton" type="TextureButton" parent="."]
[node name="VisibilityButton" type="TextureButton" parent="." groups=[
"UIButtons",
]]
margin_left = 6.0
margin_top = 5.0
margin_right = 38.0
@ -23,6 +26,7 @@ mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 4
texture_normal = ExtResource( 2 )
texture_hover = ExtResource( 3 )
[node name="HBoxContainer" type="HBoxContainer" parent="."]
anchor_left = 0.5

View file

@ -12,10 +12,10 @@ script = ExtResource( 1 )
[node name="VBoxContainer" type="VBoxContainer" parent="."]
anchor_left = 0.5
anchor_right = 0.5
margin_left = -109.0
margin_left = -92.0
margin_top = 8.0
margin_right = 109.0
margin_bottom = 150.0
margin_right = 92.0
margin_bottom = 34.0
[node name="OptionsContainer" type="GridContainer" parent="VBoxContainer"]
margin_right = 218.0
@ -48,7 +48,7 @@ margin_top = 24.0
margin_right = 218.0
margin_bottom = 44.0
text = "Dark"
items = [ "Dark", null, false, 0, null, "Gray", null, false, 1, null, "Godot", null, false, 2, null, "Light", null, false, 3, null ]
items = [ "Dark", null, false, 0, null, "Gray", null, false, 1, null, "Godot", null, false, 2, null, "Gold", null, false, 3, null ]
selected = 0
[node name="GridOptionsLabel" type="Label" parent="VBoxContainer"]