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

Merge multiplayer to dev branch #2

Merged
chrisbell merged 21 commits from multiplayer into develop 2025-08-07 22:06:02 +00:00
Conversation 1 Commits 21 Files Changed 87 +13 -1
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fe647b432b - Show all commits

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

@@ -35,7 +35,7 @@ func _ready() -> void:
multiplayer.connection_failed.connect(_on_connection_failed) multiplayer.connection_failed.connect(_on_connection_failed)
multiplayer.server_disconnected.connect(_on_server_disconnected) multiplayer.server_disconnected.connect(_on_server_disconnected)
create_lobby() check_command_line()
func _process(delta): func _process(delta):

4
splunk/ui/multiplayer-debug-ui/multiplayer-debug-ui.tscn
View File

@@ -40,6 +40,10 @@ layout_mode = 2
theme_override_constants/separation = 10 theme_override_constants/separation = 10
alignment = 1 alignment = 1
[node name="Host" type="Button" parent="HBoxContainer/VBoxContainer"]
layout_mode = 2
text = "HOST"
[node name="InviteButton" type="Button" parent="HBoxContainer/VBoxContainer"] [node name="InviteButton" type="Button" parent="HBoxContainer/VBoxContainer"]
layout_mode = 2 layout_mode = 2
text = "INVITE" text = "INVITE"

8
splunk/ui/multiplayer-debug-ui/multiplayer_debug_ui.gd
View File

@@ -5,6 +5,14 @@ extends Control
@export var playername_array: Array[String] = [] @export var playername_array: Array[String] = []
func _ready() -> void:
$HBoxContainer/VBoxContainer/Host.pressed.connect(host_game)
func host_game():
SteamManager.create_lobby()
func add_new_player(playername: String, total_player_count: int): func add_new_player(playername: String, total_player_count: int):
var new_playername_label = Label.new() var new_playername_label = Label.new()
new_playername_label.text = playername new_playername_label.text = playername