Feat/10 adding multiplayer fundamentals #14

Merged
Dotts merged 16 commits from feat/10-adding-multiplayer-fundamentals into main 2026-06-06 19:31:25 -07:00
2 changed files with 6 additions and 0 deletions
Showing only changes of commit 31336fe870 - Show all commits
+5
View File
@@ -208,6 +208,11 @@ func _build_dust2_layout() -> void:
add_child(combat_area) add_child(combat_area)
func _build_dust2_dummies() -> void: func _build_dust2_dummies() -> void:
# Do not spawn dummies in real multiplayer matches
var nm = get_node_or_null("/root/NetworkManager")
if nm and nm.multiplayer.multiplayer_peer is ENetMultiplayerPeer:
return
var spawn_dummy = func(pos: Vector3, rot_y: float): var spawn_dummy = func(pos: Vector3, rot_y: float):
var dummy = load("res://entities/killable_dummy.gd").new() var dummy = load("res://entities/killable_dummy.gd").new()
dummy.position = pos dummy.position = pos
+1
View File
@@ -684,6 +684,7 @@ func _show_return_dialog() -> void:
func _return_to_main_menu() -> void: func _return_to_main_menu() -> void:
_resume() # Reset pause state and cursor mode _resume() # Reset pause state and cursor mode
NetworkManager.disconnect_game()
get_tree().change_scene_to_file("res://ui/main_menu/main_menu.tscn") get_tree().change_scene_to_file("res://ui/main_menu/main_menu.tscn")
func _show_main_menu() -> void: func _show_main_menu() -> void: