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

Compare commits

base: Bellsworne:04440c03195442c8059fde58bd5baae4e160554a
Branches Tags
Bellsworne:master Bellsworne:player-character Bellsworne:lobby-system Bellsworne:develop Bellsworne:lobby-map
..
compare: Bellsworne:develop
Branches Tags
Bellsworne:player-character Bellsworne:lobby-system Bellsworne:develop Bellsworne:lobby-map Bellsworne:master

1 Commits
04440c0319 ... develop

Author SHA1 Message Date
Chris Bell
58ff747402 Merge pull request 'merge lobby-system and player-character into develop' (#4) from lobby-system into develop 
Reviewed-on: #4
 2025-08-12 23:05:41 +00:00
2 changed files with 2 additions and 7 deletions
Expand all files Collapse all files

2
splunk/levels/lobby-scene/lobby.tscn
View File

@@ -379,7 +379,7 @@ transform = Transform3D(0.689594, 0, -0.724196, 0, 1, 0, 0.724196, 0, 0.689594,
[node name="Tent" parent="Campsite/TentPlot3" instance=ExtResource("4_qjimh")] [node name="Tent" parent="Campsite/TentPlot3" instance=ExtResource("4_qjimh")]
[node name="TentPlot4" type="Marker3D" parent="Campsite"] [node name="TentPlot4" type="Marker3D" parent="Campsite"]
transform = Transform3D(-0.518758, 0, 0.854921, 0, 1, 0, -0.854921, 0, -0.518758, 6.53113, 0.334599, -2.31805) transform = Transform3D(-0.0217975, 0, 0.999762, 0, 1, 0, -0.999762, 0, -0.0217975, 6.53113, 0.334599, -2.31805)
[node name="Tent" parent="Campsite/TentPlot4" instance=ExtResource("4_qjimh")] [node name="Tent" parent="Campsite/TentPlot4" instance=ExtResource("4_qjimh")]

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

@@ -26,7 +26,6 @@ func _ready() -> void:
Steam.lobby_joined.connect(_on_lobby_joined) Steam.lobby_joined.connect(_on_lobby_joined)
Steam.lobby_chat_update.connect(_on_lobby_chat_update) Steam.lobby_chat_update.connect(_on_lobby_chat_update)
Steam.p2p_session_request.connect(_on_p2p_session_request) Steam.p2p_session_request.connect(_on_p2p_session_request)
Steam.join_requested.connect(_on_lobby_join_requested)
multiplayer.peer_connected.connect(_on_peer_connected) multiplayer.peer_connected.connect(_on_peer_connected)
multiplayer.peer_disconnected.connect(_on_peer_disconnected) multiplayer.peer_disconnected.connect(_on_peer_disconnected)
@@ -38,6 +37,7 @@ func _ready() -> void:
multiplayer.server_relay = true multiplayer.server_relay = true
func _process(delta): func _process(delta):
if not steam_initialized: if not steam_initialized:
return return
@@ -72,11 +72,6 @@ func join_lobby(this_lobby_id: int):
Steam.joinLobby(this_lobby_id) Steam.joinLobby(this_lobby_id)
func _on_lobby_join_requested(this_lobby_id: int, friend_id: int) -> void:
print("[CLIENT] 1. Attempting to join lobby (ID: %s)..." % this_lobby_id)
join_lobby(this_lobby_id)
func _on_lobby_joined(this_lobby_id: int, _p, _l, response: int): func _on_lobby_joined(this_lobby_id: int, _p, _l, response: int):
if response != Steam.CHAT_ROOM_ENTER_RESPONSE_SUCCESS: if response != Steam.CHAT_ROOM_ENTER_RESPONSE_SUCCESS:
print("[CLIENT] !!! Failed to join lobby: %s" % get_join_fail_reason(response)) print("[CLIENT] !!! Failed to join lobby: %s" % get_join_fail_reason(response))