diff --git a/content/system/keyboard/keyboard.tscn b/content/system/keyboard/keyboard.tscn index de7c3c9..86db653 100644 --- a/content/system/keyboard/keyboard.tscn +++ b/content/system/keyboard/keyboard.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=8 format=3 uid="uid://lrehk38exd5n"] +[gd_scene load_steps=9 format=3 uid="uid://lrehk38exd5n"] [ext_resource type="Script" path="res://content/system/keyboard/keyboard.gd" id="1_maojw"] [ext_resource type="PackedScene" uid="uid://bsjqdvkt0u87c" path="res://content/ui/components/button/button.tscn" id="1_xdpwr"] [ext_resource type="Script" path="res://content/ui/menu/grid.gd" id="3_mx544"] [ext_resource type="Script" path="res://content/functions/movable.gd" id="4_86fct"] [ext_resource type="Material" uid="uid://bnwimm214q67g" path="res://assets/materials/sec-500.material" id="5_8c8rc"] +[ext_resource type="Script" path="res://content/functions/occludable.gd" id="6_y4sdl"] [sub_resource type="BoxShape3D" id="BoxShape3D_k5ib7"] size = Vector3(0.79, 0.01, 0.26) @@ -55,3 +56,6 @@ shape = SubResource("BoxShape3D_k5ib7") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.300719, -0.009645, 0.0928761) material_override = ExtResource("5_8c8rc") mesh = SubResource("BoxMesh_7rntc") + +[node name="Occludable" type="Node" parent="."] +script = ExtResource("6_y4sdl") diff --git a/content/system/room/room.gd b/content/system/room/room.gd index 9f441d6..aa1e171 100644 --- a/content/system/room/room.gd +++ b/content/system/room/room.gd @@ -11,7 +11,7 @@ const wall_edge_scene = preload("./wall_edge.tscn") @onready var ground = $Ground/Clickable var moving = null -var editable := true: +var editable := false: set(value): if value == editable: return @@ -197,6 +197,8 @@ func _save(): } func _load(data): + await ready + for corner in data["corners"]: add_corner(corner) diff --git a/content/system/room/walls.tres b/content/system/room/walls.tres index 6d784b1..b0ebc48 100644 --- a/content/system/room/walls.tres +++ b/content/system/room/walls.tres @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44ea33f724141838db4ace01175c71088af8994891a20c7fdc9bb3ac36dac9aa -size 160 +oid sha256:fe7c098cfc9adadb447df0230eba8a81f1825dd3c0cf4e654ebf98ca2314c8cc +size 151 diff --git a/content/ui/menu/edit/edit_menu.tscn b/content/ui/menu/edit/edit_menu.tscn index db65995..0c1c898 100644 --- a/content/ui/menu/edit/edit_menu.tscn +++ b/content/ui/menu/edit/edit_menu.tscn @@ -16,7 +16,6 @@ size = Vector3(0.24, 0.1, 0.1) [node name="PageNumberLabel" type="Label3D" parent="."] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.26, 0.01, 0.27) pixel_size = 0.001 -modulate = Color(0, 0, 0, 1) text = "0 / 0" font_size = 18 outline_size = 0 @@ -25,12 +24,10 @@ outline_size = 0 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.19, 0.01, 0.27) [node name="NextPageButton" parent="Buttons" instance=ExtResource("4_tvimg")] -focusable = true label = "navigate_next" icon = true [node name="PreviousPageButton" parent="Buttons" instance=ExtResource("4_tvimg")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.08, 0, 0) -focusable = true label = "navigate_before" icon = true diff --git a/content/ui/menu/room/room_menu.tscn b/content/ui/menu/room/room_menu.tscn index 88da1c8..e1df0ee 100644 --- a/content/ui/menu/room/room_menu.tscn +++ b/content/ui/menu/room/room_menu.tscn @@ -29,7 +29,6 @@ script = ExtResource("2_elugy") [node name="Label3D" type="Label3D" parent="Interface"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.13, -1.86265e-09, 0.05) pixel_size = 0.001 -modulate = Color(0, 0, 0, 1) text = "Edit Room" font_size = 18 outline_size = 0 @@ -37,7 +36,6 @@ outline_size = 0 [node name="CreateBlur" type="Label3D" parent="."] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.15, 0.01, 0.261858) pixel_size = 0.001 -modulate = Color(0, 0, 0, 1) text = "Fake Windows" font_size = 18 outline_size = 0 diff --git a/content/ui/menu/settings/settings_menu.tscn b/content/ui/menu/settings/settings_menu.tscn index 8657ecb..195e69c 100644 --- a/content/ui/menu/settings/settings_menu.tscn +++ b/content/ui/menu/settings/settings_menu.tscn @@ -25,7 +25,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.007, 0) [node name="Label3D" type="Label3D" parent="Content"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.134377, 0, 0.253575) pixel_size = 0.001 -modulate = Color(0, 0, 0, 1) text = "Spawn Ball" font_size = 18 outline_size = 0 @@ -41,7 +40,6 @@ script = ExtResource("3_qmg6q") [node name="ConnectionStatus" type="Label3D" parent="Content"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.250698, 0, 0.151303) pixel_size = 0.001 -modulate = Color(0, 0, 0, 1) text = "Disconnected" font_size = 8 outline_size = 0 @@ -49,7 +47,6 @@ outline_size = 0 [node name="LabelURL" type="Label3D" parent="Content"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.01, 0, 0.03) pixel_size = 0.001 -modulate = Color(0, 0, 0, 1) text = "url: " font_size = 18 @@ -63,7 +60,6 @@ text = "ws://192.168.0.1:8123" [node name="LabelToken" type="Label3D" parent="Content"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.01, 0, 0.07) pixel_size = 0.001 -modulate = Color(0, 0, 0, 1) text = "token:" font_size = 18 outline_size = 0 @@ -76,7 +72,6 @@ text = "..." [node name="LabelConnect" type="Label3D" parent="Content"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.14, 0, 0.12) pixel_size = 0.001 -modulate = Color(0, 0, 0, 1) text = "Connect" font_size = 18 outline_size = 0 @@ -97,7 +92,6 @@ shape = SubResource("BoxShape3D_3qdps") [node name="Label" type="Label3D" parent="Content/Credits"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.26, 0.0102286, 0.29) pixel_size = 0.001 -modulate = Color(0, 0, 0, 1) text = "credits" font_size = 12 outline_size = 0