gilgamesh
/
liblast
forked from unfa/liblast
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed crash when opening any menu

unbroken
Jan Heemstra 2021-09-11 14:38:45 +02:00
parent 55fe11328a
commit 4059c47c31
7 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Game/Assets/HUD/Theme.tres
View File

@ -1,38 +1,38 @@
[gd_resource type="Theme" load_steps=10 format=3 uid="uid://ddtu7o1dbp0s8"] [gd_resource type="Theme" load_steps=10 format=3 uid="uid://ddtu7o1dbp0s8"]
[ext_resource type="FontData" uid="uid://bvp75f670ewmh" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Italic.ttf" id="1"] [ext_resource type="FontData" uid="uid://sv606h1wylsm" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Italic.ttf" id="1"]
[ext_resource type="FontData" uid="uid://bu513u0hckm6v" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Bold.ttf" id="2"] [ext_resource type="FontData" uid="uid://dedcmqi18s2mk" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Bold.ttf" id="2"]
[ext_resource type="FontData" uid="uid://c1efeg0l6epya" path="res://Assets/Fonts/Liberation Sans/LiberationMono-Regular.ttf" id="3"] [ext_resource type="FontData" uid="uid://vokxbnewve4p" path="res://Assets/Fonts/Liberation Sans/LiberationMono-Regular.ttf" id="3"]
[ext_resource type="FontData" uid="uid://dm2ua4ixk71jw" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Regular.ttf" id="4"] [ext_resource type="FontData" uid="uid://y4ub4mqw3ok4" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Regular.ttf" id="4"]
[sub_resource type="Font" id="1"] [sub_resource type="Font" id="Font_prcom"]
variation_coordinates = { variation_coordinates = {
} }
data/0 = ExtResource( "2" ) data/0 = ExtResource( "2" )
[sub_resource type="Font" id="2"] [sub_resource type="Font" id="Font_o6jis"]
variation_coordinates = { variation_coordinates = {
} }
data/0 = ExtResource( "1" ) data/0 = ExtResource( "1" )
[sub_resource type="Font" id="3"] [sub_resource type="Font" id="Font_xvs2n"]
variation_coordinates = { variation_coordinates = {
} }
data/0 = ExtResource( "1" ) data/0 = ExtResource( "1" )
[sub_resource type="Font" id="4"] [sub_resource type="Font" id="Font_i54w7"]
variation_coordinates = { variation_coordinates = {
} }
data/0 = ExtResource( "3" ) data/0 = ExtResource( "3" )
[sub_resource type="Font" id="5"] [sub_resource type="Font" id="Font_px26m"]
variation_coordinates = { variation_coordinates = {
} }
data/0 = ExtResource( "4" ) data/0 = ExtResource( "4" )
[resource] [resource]
RichTextLabel/fonts/bold_font = SubResource( "1" ) RichTextLabel/fonts/bold_font = SubResource( "Font_prcom" )
RichTextLabel/fonts/bold_italics_font = SubResource( "2" ) RichTextLabel/fonts/bold_italics_font = SubResource( "Font_o6jis" )
RichTextLabel/fonts/italics_font = SubResource( "3" ) RichTextLabel/fonts/italics_font = SubResource( "Font_xvs2n" )
RichTextLabel/fonts/mono_font = SubResource( "4" ) RichTextLabel/fonts/mono_font = SubResource( "Font_i54w7" )
RichTextLabel/fonts/normal_font = SubResource( "5" ) RichTextLabel/fonts/normal_font = SubResource( "Font_px26m" )

18
Game/Assets/UI/GUI.tscn
View File

@ -1,24 +1,24 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=4 format=3 uid="uid://b856vwmg8a6o4"]
[ext_resource path="res://Assets/UI/MenuButton.tscn" type="PackedScene" id=1] [ext_resource type="PackedScene" path="res://Assets/UI/MenuButton.tscn" id="1"]
[ext_resource path="res://Assets/UI/Menu.tscn" type="PackedScene" id=2] [ext_resource type="PackedScene" path="res://Assets/UI/Menu.tscn" id="2"]
[ext_resource path="res://Assets/UI/GUI.gd" type="Script" id=3] [ext_resource type="Script" path="res://Assets/UI/GUI.gd" id="3"]
[node name="GUI" type="CenterContainer"] [node name="GUI" type="CenterContainer"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
script = ExtResource( 3 ) script = ExtResource( "3" )
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="Menu" parent="." instance=ExtResource( 2 )] [node name="Menu" parent="." instance=ExtResource( "2" )]
offset_left = 477.0 offset_left = 477.0
offset_top = 252.0 offset_top = 252.0
offset_right = 547.0 offset_right = 547.0
offset_bottom = 347.0 offset_bottom = 347.0
[node name="Options" parent="Menu" instance=ExtResource( 1 )] [node name="Options" parent="Menu" instance=ExtResource( "1" )]
anchor_right = 0.0 anchor_right = 0.0
anchor_bottom = 0.0 anchor_bottom = 0.0
offset_top = 33.0 offset_top = 33.0
@ -27,7 +27,7 @@ offset_bottom = 62.0
text = "options" text = "options"
label = "options" label = "options"
[node name="Quit" parent="Menu" instance=ExtResource( 1 )] [node name="Quit" parent="Menu" instance=ExtResource( "1" )]
anchor_right = 0.0 anchor_right = 0.0
anchor_bottom = 0.0 anchor_bottom = 0.0
offset_top = 66.0 offset_top = 66.0
@ -36,5 +36,5 @@ offset_bottom = 95.0
text = "quit" text = "quit"
label = "quit" label = "quit"
[connection signal="pressed" from="Menu/Options" to="Menu" method="open_menu" binds= ["res://OptionsMenu.tscn"]] [connection signal="pressed" from="Menu/Options" to="Menu" method="open_menu" binds= ["res://Assets/UI/OptionsMenu.tscn"]]
[connection signal="pressed" from="Menu/Quit" to="." method="quit_game"] [connection signal="pressed" from="Menu/Quit" to="." method="quit_game"]

2
Game/Assets/UI/GraphicsMenu.gd
View File

@ -1,4 +1,4 @@
extends "res://Menu.gd" extends "res://Assets/UI/Menu.gd"
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():

2
Game/Assets/UI/MenuCheckButton.gd
View File

@ -1,4 +1,4 @@
extends "res://MenuData.gd" extends "res://Assets/UI/MenuData.gd"
func on_label_changed(): func on_label_changed():
self.text = label self.text = label

2
Game/Assets/UI/MenuData.gd
View File

@ -1,4 +1,4 @@
extends "res://MenuItem.gd" extends "res://Assets/UI/MenuItem.gd"
signal data_changed(data) signal data_changed(data)

16
Game/Assets/UI/OptionsMenu.tscn
View File

@ -1,11 +1,11 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=3 uid="uid://d37bped35n16j"]
[ext_resource path="res://Assets/UI/Menu.tscn" type="PackedScene" id=1] [ext_resource type="PackedScene" path="res://Assets/UI/Menu.tscn" id="1"]
[ext_resource path="res://Assets/UI/MenuButton.tscn" type="PackedScene" id=2] [ext_resource type="PackedScene" path="res://Assets/UI/MenuButton.tscn" id="2"]
[node name="OptionsMenu" instance=ExtResource( 1 )] [node name="OptionsMenu" instance=ExtResource( "1" )]
[node name="Graphics" parent="." index="0" instance=ExtResource( 2 )] [node name="Graphics" parent="." index="0" instance=ExtResource( "2" )]
anchor_right = 0.0 anchor_right = 0.0
anchor_bottom = 0.0 anchor_bottom = 0.0
offset_right = 77.0 offset_right = 77.0
@ -13,7 +13,7 @@ offset_bottom = 29.0
text = "graphics" text = "graphics"
label = "graphics" label = "graphics"
[node name="Controls" parent="." index="1" instance=ExtResource( 2 )] [node name="Controls" parent="." index="1" instance=ExtResource( "2" )]
anchor_right = 0.0 anchor_right = 0.0
anchor_bottom = 0.0 anchor_bottom = 0.0
offset_top = 33.0 offset_top = 33.0
@ -27,5 +27,5 @@ offset_top = 66.0
offset_right = 77.0 offset_right = 77.0
offset_bottom = 95.0 offset_bottom = 95.0
[connection signal="pressed" from="Graphics" to="." method="open_menu" binds= [ "res://GraphicsMenu.tscn" ]] [connection signal="pressed" from="Graphics" to="." method="open_menu" binds= ["res://Assets/UI/GraphicsMenu.tscn"]]
[connection signal="pressed" from="Controls" to="." method="open_menu" binds= [ "res://ControlsMenu.tscn" ]] [connection signal="pressed" from="Controls" to="." method="open_menu" binds= ["res://Assets/UI/ControlsMenu.tscn"]]

2
Game/Main.tscn
View File

@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=3 uid="uid://o68cawatyat2"] [gd_scene load_steps=5 format=3 uid="uid://o68cawatyat2"]
[ext_resource type="PackedScene" uid="uid://b1078bn8gy2qf" path="res://Map.tscn" id="1"] [ext_resource type="PackedScene" uid="uid://b1078bn8gy2qf" path="res://Map.tscn" id="1"]
[ext_resource type="PackedScene" path="res://Assets/UI/GUI.tscn" id="2"] [ext_resource type="PackedScene" uid="uid://b856vwmg8a6o4" path="res://Assets/UI/GUI.tscn" id="2"]
[ext_resource type="Script" path="res://Main.gd" id="3"] [ext_resource type="Script" path="res://Main.gd" id="3"]
[ext_resource type="PackedScene" uid="uid://bff5uslrxesjx" path="res://Assets/HUD/HUD.tscn" id="4"] [ext_resource type="PackedScene" uid="uid://bff5uslrxesjx" path="res://Assets/HUD/HUD.tscn" id="4"]