Merge branch 'chris-dev' into devlop

Reviewed-on: https://git.bellsworne.tech/Bellsworne/steamforged-skies/pulls/3
Reviewed-by: Gary Steven Keough <gskeough@bellsworne.com>

assets/core/enviroment/dev-level/dev-level.tscn

@@ -1,5 +1,6 @@
-[gd_scene load_steps=9 format=3 uid="uid://ewovs6ns5y3k"]
+[gd_scene load_steps=10 format=3 uid="uid://ewovs6ns5y3k"]
 
+[ext_resource type="Script" path="res://assets/core/networking/NetworkManager.gd" id="1_kki4t"]
 [ext_resource type="Texture2D" uid="uid://gymb0tju4y67" path="res://addons/kennysprototypetextures/Dark/texture_black (1).png" id="1_l0osb"]
 [ext_resource type="PackedScene" uid="uid://c6w0ivy4hetrl" path="res://assets/core/player-controller/scenes/player.tscn" id="2_q510b"]
 
@@ -28,6 +29,10 @@ size = Vector2(20, 20)
 
 [node name="DevLevel" type="Node3D"]
 
+[node name="NetworkManager" type="Node" parent="."]
+unique_name_in_owner = true
+script = ExtResource("1_kki4t")
+
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_nyust")
 

assets/core/networking/NetworkManager.gd

@@ -1,3 +1,4 @@
+class_name NetworkManager
 extends Node
 
 var steamId: int

assets/core/player-controller/scenes/player.tscn

@@ -10,8 +10,18 @@ radius = 0.35
 
 [node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("camera")]
 script = ExtResource("1_bv7t4")
+speed = null
+acceleration = null
+jump_height = null
+camera_sens = null
+joystick_camera_sens_multiplier = null
 camera = NodePath("Neck/Camera3D")
 
+[node name="PlayerTag" type="Label3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.26654, 0)
+billboard = 1
+text = "username"
+
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 mesh = SubResource("CapsuleMesh_v7b3h")
 

assets/core/player-controller/scripts/player.gd

@@ -1,5 +1,9 @@
 class_name Player extends CharacterBody3D
 
+var network_manager: NetworkManager
+var player_tag: Label3D
+var username: String = ""
+
 @export_category("Player")
 @export_range(1, 35, 1) var speed: float = 10 # m/s
 @export_range(10, 400, 1) var acceleration: float = 100 # m/s^2
@@ -22,6 +26,17 @@ var jump_vel: Vector3 # Jumping velocity
 
 func _ready() -> void:
 	capture_mouse()
+	player_tag = get_node("PlayerTag")
+	init_network_manager()
+
+
+func init_network_manager() -> void:
+	network_manager = %NetworkManager
+	if network_manager != null:
+		username = network_manager.username
+		player_tag.text = username
+	else:
+		player_tag.text = "Player"
 
 
 func _unhandled_input(event: InputEvent) -> void:

assets/scenes/main.tscn

@@ -5,4 +5,5 @@
 [node name="Main" type="Node"]
 
 [node name="NetworkManager" type="Node" parent="."]
+unique_name_in_owner = true
 script = ExtResource("1_dcack")