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 +7 -7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 83adac8b43 - Show all commits

2
splunk/networking/steam-manager.gd
View File

@@ -153,8 +153,8 @@ func spawn_player(peer_id: int):
add_child(new_player) add_child(new_player)
new_player.position = Vector3.UP new_player.position = Vector3.UP
new_player.set_player_name(player_name) new_player.set_player_name(player_name)
new_player.set_multiplayer_authority(peer_id) new_player.set_multiplayer_authority(peer_id)
new_player.setup_player()
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# UTILITY AND CALLBACKS (Unchanged) # UTILITY AND CALLBACKS (Unchanged)

14
splunk/player/player.gd
View File

@@ -8,14 +8,14 @@ class_name Player
var gravity = ProjectSettings.get_setting("physics/3d/default_gravity") var gravity = ProjectSettings.get_setting("physics/3d/default_gravity")
var camera_node: Camera3D var camera_node: Camera3D
func _ready():
if is_multiplayer_authority():
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
camera_node = $Camera3D
#$Mesh.hide()
var peer_id = int(name) func setup_player():
camera_node.current = true if is_multiplayer_authority():
print("-> [%s] Authority granted. Setting up camera and input." % name)
camera_node = $Camera3D
camera_node.make_current()
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
@rpc("any_peer", "call_local") @rpc("any_peer", "call_local")
func set_player_name(player_name: String): func set_player_name(player_name: String):