diff options
| author | nokoe <nokoe@mailbox.org> | 2024-06-24 20:12:18 +0200 |
|---|---|---|
| committer | nokoe <nokoe@mailbox.org> | 2024-06-24 20:12:18 +0200 |
| commit | 9e0131dcf5c1d1694fc7d81faba6b3a7251ee71e (patch) | |
| tree | f173294ca3cb88a26a9cc1a3d6ccd0884cf49824 /client/game.tscn | |
| parent | 3e483fbbc2c7aa5cce7f31adc31d2cba15f9c08a (diff) | |
| parent | dbb52c813e64fbe4e733dbfec4e29889d288873e (diff) | |
| download | hurrycurry-9e0131dcf5c1d1694fc7d81faba6b3a7251ee71e.tar hurrycurry-9e0131dcf5c1d1694fc7d81faba6b3a7251ee71e.tar.bz2 hurrycurry-9e0131dcf5c1d1694fc7d81faba6b3a7251ee71e.tar.zst | |
Merge branch 'master' of ssh://codeberg.org/metamuffin/undercooked
Diffstat (limited to 'client/game.tscn')
| -rw-r--r-- | client/game.tscn | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/client/game.tscn b/client/game.tscn index 34c2fe40..a7485c1d 100644 --- a/client/game.tscn +++ b/client/game.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=8 format=3 uid="uid://c6krh36hoqfg8"] +[gd_scene load_steps=10 format=3 uid="uid://c6krh36hoqfg8"] [ext_resource type="PackedScene" uid="uid://cs8gxa22c6joh" path="res://map/map.tscn" id="1_ex12v"] [ext_resource type="Script" path="res://game.gd" id="1_sftfn"] [ext_resource type="PackedScene" uid="uid://b31mlnao6ybt8" path="res://player/follow_camera.tscn" id="2_s8y6o"] [ext_resource type="PackedScene" uid="uid://c0euiv7duqfp4" path="res://player/marker.tscn" id="4_igl0o"] +[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="5_yg6cl"] +[ext_resource type="Script" path="res://multiplayer.gd" id="6_fbxu8"] [sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_mvn2w"] @@ -17,6 +19,9 @@ sky = SubResource("Sky_ultpf") [node name="Game" type="Node3D"] script = ExtResource("1_sftfn") +[node name="Multiplayer" type="Node" parent="."] +script = ExtResource("6_fbxu8") + [node name="Map" parent="." instance=ExtResource("1_ex12v")] [node name="FollowCamera" parent="." instance=ExtResource("2_s8y6o")] @@ -30,3 +35,6 @@ transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, [node name="Marker" parent="." instance=ExtResource("4_igl0o")] visible = false + +[node name="SceneTransition" parent="." instance=ExtResource("5_yg6cl")] +ingame = true |