Merge multiplayer to dev branch #2

Merged
chrisbell merged 21 commits from multiplayer into develop 2025-08-07 22:06:02 +00:00
Showing only changes of commit 63a7762206 - Show all commits

View File

@@ -87,6 +87,20 @@ func setup_multiplayer_peer(is_host: bool = false) -> void:
multiplayer.multiplayer_peer = peer multiplayer.multiplayer_peer = peer
func setup_multiplayer_peer_client() -> void:
if lobby_id == 0:
return
var host_id = Steam.getLobbyOwner(lobby_id)
var err = peer.create_client(host_id)
if err != OK:
print("Failed to create client, error: %s" % err)
return
multiplayer.multiplayer_peer = peer
print("Client created, connecting to host: %s" % host_id)
func create_lobby(): func create_lobby():
if lobby_id == 0: if lobby_id == 0:
print("Creating lobby...") print("Creating lobby...")
@@ -122,10 +136,6 @@ func _on_lobby_joined(this_lobby_id: int, permissions: int, locked: bool, respon
setup_multiplayer_peer_client() setup_multiplayer_peer_client()
func setup_multiplayer_peer_client() -> void:
pass
func get_lobby_members() -> void: func get_lobby_members() -> void:
lobby_members.clear() lobby_members.clear()
var num_members = Steam.getNumLobbyMembers(lobby_id) var num_members = Steam.getNumLobbyMembers(lobby_id)
@@ -140,7 +150,6 @@ func get_lobby_members() -> void:
print("Lobby member: %s (%s)" % [member_name, member_id]) print("Lobby member: %s (%s)" % [member_name, member_id])
func _on_lobby_data_update(success: int) -> void: func _on_lobby_data_update(success: int) -> void:
pass pass