oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main

Browse Source
This commit is contained in:
Oier Bravo
2023-02-24 18:20:42 +01:00
parent 8cc48d620d e75c41ff9b
commit b4c2806cce
29 changed files with 136 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn
View File

@@ -7,9 +7,6 @@
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}
slot_ui_scene = ExtResource( 2 )
[node name="Panel" type="Panel" parent="."]
@@ -32,7 +29,7 @@ __meta__ = {
[node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer"]
margin_right = 623.0
margin_bottom = 336.0
margin_bottom = 276.0
size_flags_vertical = 3
scroll_horizontal_enabled = false
__meta__ = {
@@ -41,7 +38,7 @@ __meta__ = {
[node name="slots" type="VBoxContainer" parent="VBoxContainer/ScrollContainer"]
margin_right = 623.0
margin_bottom = 336.0
margin_bottom = 276.0
size_flags_horizontal = 3
size_flags_vertical = 3
__meta__ = {
@@ -49,9 +46,9 @@ __meta__ = {
}
[node name="back" type="Button" parent="VBoxContainer"]
margin_top = 340.0
margin_top = 280.0
margin_right = 623.0
margin_bottom = 360.0
margin_bottom = 300.0
text = "OPTIONS_BACK"
__meta__ = {
"_edit_use_anchors_": false

2
addons/escoria-core/ui_library/menus/main_menu/main_menu.gd
View File

@@ -14,7 +14,7 @@ func _on_load_game_pressed():
$load_game.show()
# Show the options panel
# Show the optiset_gui_visible trueons panel
func _on_options_pressed():
$main.hide()
$options.show()

11
addons/escoria-core/ui_library/menus/main_menu/main_menu.tscn
View File

@@ -9,9 +9,6 @@
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="load_game" parent="." instance=ExtResource( 5 )]
visible = false
@@ -44,18 +41,18 @@ __meta__ = {
}
[node name="TextureRect" type="TextureRect" parent="main/main"]
margin_top = 162.0
margin_top = 92.0
margin_right = 616.0
margin_bottom = 398.0
margin_bottom = 318.0
texture = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="buttons" type="VBoxContainer" parent="main/main"]
margin_top = 498.0
margin_top = 418.0
margin_right = 616.0
margin_bottom = 738.0
margin_bottom = 658.0
custom_constants/separation = 10
__meta__ = {
"_edit_use_anchors_": false

8
addons/escoria-core/ui_library/menus/options/options.tscn
View File

@@ -25,9 +25,9 @@ __meta__ = {
[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
margin_left = 391.0
margin_top = 340.0
margin_top = 265.0
margin_right = 888.0
margin_bottom = 535.0
margin_bottom = 460.0
size_flags_horizontal = 6
custom_constants/margin_right = 20
custom_constants/margin_top = 20
@@ -132,9 +132,9 @@ max_value = 1.0
step = 0.001
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 539.0
margin_top = 464.0
margin_right = 1280.0
margin_bottom = 559.0
margin_bottom = 484.0
custom_constants/separation = 20
alignment = 1