daddy/modbison
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review feedback: Implement Godot dedicated server scene + player spawning #51

Merged
reviewer-bot merged 26 commits from agent/3bba30f838d1 into main 2026-08-21 01:00:24 +00:00
Conversation 1 Commits 26 Files Changed 13
+11 -11
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7be50e3313 - Show all commits
scenes/player.tscn
-9
View File
@@ -1,11 +1,3 @@
<<<<<<< HEAD
[gd_scene load_steps=2 format=3]
[ext_resource type="Script" path="res://scripts/player_spawner.gd" id="1"]
[node name="Player" type="CharacterBody3D"]
script = ExtResource("1")
=======
[gd_scene load_steps=3 format=3 uid="uid://player_scene_001"] [gd_scene load_steps=3 format=3 uid="uid://player_scene_001"]
[ext_resource type="Script" path="res://scripts/player.gd" id="1_player"] [ext_resource type="Script" path="res://scripts/player.gd" id="1_player"]
@@ -30,4 +22,3 @@ mesh = SubResource("CapsuleMesh1")
[node name="Camera3D" type="Camera3D" parent="."] [node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0)
current = true current = true
>>>>>>> origin/main
scenes/server.tscn
+4 -1
View File
@@ -1,3 +1,6 @@
[gd_scene load_steps=1 format=3] [gd_scene load_steps=2 format=3]
[ext_resource type="Script" path="res://scripts/server.gd" id="1_server"]
[node name="Server" type="Node"] [node name="Server" type="Node"]
script = ExtResource("1_server")
scenes/server_player.tscn
+6
View File
@@ -0,0 +1,6 @@
[gd_scene load_steps=2 format=3]
[ext_resource type="Script" path="res://scripts/player_spawner.gd" id="1"]
[node name="Player" type="CharacterBody3D"]
script = ExtResource("1")
scripts/server.gd
+1 -1
View File
@@ -37,7 +37,7 @@ var _player_scene: PackedScene
func _ready() -> void: func _ready() -> void:
# Preload the player scene once. # Preload the player scene once.
_player_scene = preload("res://scenes/player.tscn") _player_scene = preload("res://scenes/server_player.tscn")
# Create and assign the ENet server peer. # Create and assign the ENet server peer.
network_peer = _create_server_peer() network_peer = _create_server_peer()