Bellsworne/steamforged-skies
Bellsworne/steamforged-skies
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merging networking features #5

Merged
gskeough merged 27 commits from feature/godot-steam-integration into develop 2024-12-14 03:37:16 +00:00
Conversation 0 Commits 27 Files Changed 12 +11 -4
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fc8bb540db - Show all commits

11
assets/core/networking/scenes/lobby.tscn
View File

@ -1,8 +1,9 @@
[gd_scene load_steps=2 format=3 uid="uid://7t1x82gvrw8a"]
[gd_scene load_steps=3 format=3 uid="uid://7t1x82gvrw8a"]
[ext_resource type="Script" path="res://assets/core/networking/scripts/lobby.gd" id="1_o4fbq"]
[ext_resource type="PackedScene" uid="uid://biryul3n6thlw" path="res://assets/core/networking/scenes/user_box_prefab.tscn" id="2_dpthk"]
[node name="Lobby" type="Control"]
[node name="Lobby" type="Control" node_paths=PackedStringArray("host_button", "join_button", "leave_button", "lobby_id", "user_list_box")]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
@ -10,6 +11,12 @@ anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_o4fbq")
host_button = NodePath("Panel/HBoxContainer/Buttons/Host")
join_button = NodePath("Panel/HBoxContainer/Buttons/HBoxContainer/Join")
leave_button = NodePath("Panel/HBoxContainer/Buttons/Leave")
lobby_id = NodePath("Panel/HBoxContainer/Buttons/HBoxContainer/LineEdit")
user_list_box = NodePath("Panel/HBoxContainer/PlayerList")
user_box_prefab = ExtResource("2_dpthk")
[node name="Panel" type="Panel" parent="."]
layout_mode = 1

2
assets/core/networking/scripts/NetworkManager.gd
View File

@ -309,4 +309,4 @@ func get_player_avatar(user_id: int) -> ImageTexture:
if avatar_texture_cache.has(user_id):
return avatar_texture_cache[user_id]
else:
return await request_player_avatar(user_id)
return await request_player_avatar(user_id)

2
assets/core/networking/scripts/lobby.gd
View File

@ -59,4 +59,4 @@ func _on_user_left_lobby(user_id:int):
for child in user_list_box.get_children():
if child.get_node("Username").text == str(user_id):
user_list_box.remove_child(child)
break
break