Bellsworne/splunk
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge multiplayer_spawner and lobby-map into develop #3

Merged
chrisbell merged 19 commits from multiplayer_spawner into develop 2025-08-10 01:33:58 +00:00
Conversation 0 Commits 19 Files Changed 32 +2 -2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5f65fde280 - Show all commits

2
splunk/game-logic/game_manager.gd
View File

@@ -9,7 +9,7 @@ var debug_ui_instance
func _ready() -> void: func _ready() -> void:
get_tree().root.get_node("Lobby/PlayerSpawner") as MultiplayerSpawner player_spawner = get_tree().root.get_node("Lobby/PlayerSpawner") as MultiplayerSpawner
debug_ui_instance = debug_ui.instantiate() debug_ui_instance = debug_ui.instantiate()
get_tree().root.add_child.call_deferred(debug_ui_instance) get_tree().root.add_child.call_deferred(debug_ui_instance)

2
splunk/networking/player_spawner.gd
View File

@@ -12,7 +12,7 @@ func spawn_player(data: Dictionary) -> Player:
var peer_id = str(data["peer_id"]) var peer_id = str(data["peer_id"])
new_player.set_multiplayer_authority(peer_id, true) new_player.set_multiplayer_authority(int(peer_id), true)
new_player.set_player_name = peer_id new_player.set_player_name = peer_id
new_player.position = Vector3.UP new_player.position = Vector3.UP