Merge branch 'develop' into feature/enemies

This commit is contained in:
Chris Cromer 2022-07-23 13:47:05 -04:00
commit d50d5063b8
Signed by: cromer
GPG Key ID: FA91071797BEEEC2

View File

@ -121,8 +121,15 @@ size_flags_vertical = 3
unique_name_in_owner = true
margin_right = 480.0
margin_bottom = 20.0
focus_neighbour_left = NodePath("../../../CenterContainer3/Button")
focus_neighbour_top = NodePath("../../../CenterContainer3/Button")
focus_neighbour_right = NodePath("../Rut")
focus_neighbour_bottom = NodePath("../Rut")
focus_next = NodePath("../Rut")
focus_previous = NodePath("../../../CenterContainer3/Button")
custom_fonts/font = SubResource( 14 )
custom_styles/normal = SubResource( 13 )
max_length = 256
context_menu_enabled = false
clear_button_enabled = true
placeholder_text = "Nombre Completo"
@ -133,8 +140,16 @@ unique_name_in_owner = true
margin_top = 24.0
margin_right = 480.0
margin_bottom = 44.0
focus_neighbour_left = NodePath("../Name")
focus_neighbour_top = NodePath("../Name")
focus_neighbour_right = NodePath("../Email")
focus_neighbour_bottom = NodePath("../Email")
focus_next = NodePath("../Email")
focus_previous = NodePath("../Name")
custom_fonts/font = SubResource( 14 )
custom_styles/normal = SubResource( 13 )
max_length = 12
context_menu_enabled = false
clear_button_enabled = true
placeholder_text = "RUT"
caret_blink = true
@ -145,8 +160,16 @@ unique_name_in_owner = true
margin_top = 48.0
margin_right = 480.0
margin_bottom = 68.0
focus_neighbour_left = NodePath("../Rut")
focus_neighbour_top = NodePath("../Rut")
focus_neighbour_right = NodePath("../../../CenterContainer3/Button")
focus_neighbour_bottom = NodePath("../../../CenterContainer3/Button")
focus_next = NodePath("../../../CenterContainer3/Button")
focus_previous = NodePath("../Rut")
custom_fonts/font = SubResource( 14 )
custom_styles/normal = SubResource( 13 )
max_length = 256
context_menu_enabled = false
clear_button_enabled = true
placeholder_text = "Email"
caret_blink = true
@ -164,11 +187,15 @@ margin_left = 197.0
margin_top = 34.0
margin_right = 314.0
margin_bottom = 61.0
focus_mode = 0
focus_neighbour_left = NodePath("../../CenterContainer2/VBoxContainer2/Email")
focus_neighbour_top = NodePath("../../CenterContainer2/VBoxContainer2/Email")
focus_neighbour_right = NodePath("../../CenterContainer2/VBoxContainer2/Name")
focus_neighbour_bottom = NodePath("../../CenterContainer2/VBoxContainer2/Name")
focus_next = NodePath("../../CenterContainer2/VBoxContainer2/Name")
focus_previous = NodePath("../../CenterContainer2/VBoxContainer2/Email")
custom_fonts/font = SubResource( 11 )
custom_styles/normal = SubResource( 12 )
shortcut_in_tooltip = false
enabled_focus_mode = 0
shortcut = SubResource( 18 )
text = "Ingresar"
script = ExtResource( 5 )