diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-06-28 00:12:54 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-06-28 00:12:54 +0200 |
| commit | d3f8dd31f27d2677f4a96af490c94e5530c6214c (patch) | |
| tree | 37212f1749030a767896575940ce2f7253b8bf84 /client | |
| parent | f483c8bd3a7c8beb806d140629d0b36c359bb24b (diff) | |
| download | hurrycurry-d3f8dd31f27d2677f4a96af490c94e5530c6214c.tar hurrycurry-d3f8dd31f27d2677f4a96af490c94e5530c6214c.tar.bz2 hurrycurry-d3f8dd31f27d2677f4a96af490c94e5530c6214c.tar.zst | |
fix overlay z order
Diffstat (limited to 'client')
| -rw-r--r-- | client/game.tscn | 12 | ||||
| -rw-r--r-- | client/map/map.tscn | 1 | ||||
| -rw-r--r-- | client/player/controllable_player.gd | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/client/game.tscn b/client/game.tscn index eab73acc..1d51e224 100644 --- a/client/game.tscn +++ b/client/game.tscn @@ -6,7 +6,7 @@ [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"] [ext_resource type="PackedScene" uid="uid://b4gone8fu53r7" path="res://map/map.tscn" id="6_prg6t"] -[ext_resource type="PackedScene" uid="uid://bpikve6wlsjfl" path="res://menu/overlay.tscn" id="7_7xrr6"] +[ext_resource type="PackedScene" path="res://menu/overlay.tscn" id="7_7xrr6"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_py7px"] ground_bottom_color = Color(0.0826605, 0.065772, 0.0461518, 1) @@ -43,10 +43,12 @@ shadow_enabled = true [node name="Marker" parent="." instance=ExtResource("4_igl0o")] visible = false -[node name="SceneTransition" parent="." instance=ExtResource("5_yg6cl")] -ingame = true -auto_fade_in = false - [node name="Map" parent="." instance=ExtResource("6_prg6t")] [node name="Overlay" parent="." instance=ExtResource("7_7xrr6")] +offset_left = -280.0 +offset_bottom = 102.0 + +[node name="SceneTransition" parent="." instance=ExtResource("5_yg6cl")] +ingame = true +auto_fade_in = false diff --git a/client/map/map.tscn b/client/map/map.tscn index 0f8e4702..cd08e416 100644 --- a/client/map/map.tscn +++ b/client/map/map.tscn @@ -13,6 +13,5 @@ script = ExtResource("1_3en0a") one_shot = true [node name="VoxelGI" type="VoxelGI" parent="."] -visible = false camera_attributes = SubResource("CameraAttributesPractical_kwk4i") data = SubResource("VoxelGIData_m5j5n") diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd index 8b2da8c2..007b10db 100644 --- a/client/player/controllable_player.gd +++ b/client/player/controllable_player.gd @@ -115,7 +115,7 @@ func collide(dt: float): func aabb_point_distance(mi: Vector2, ma: Vector2, p: Vector2) -> float: return (p - p.clamp(mi, ma)).length() -func update_position(new_position: Vector2, _new_rotation: float): +func update_position(_new_position: Vector2, _new_rotation: float): pass func submit_message(text: String): |