diff --git a/assets/core/enviroment/dev-level/dev-level.tscn b/assets/core/enviroment/dev-level/dev-level.tscn index c59136d..0818b7f 100644 --- a/assets/core/enviroment/dev-level/dev-level.tscn +++ b/assets/core/enviroment/dev-level/dev-level.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=11 format=3 uid="uid://ewovs6ns5y3k"] +[gd_scene load_steps=10 format=3 uid="uid://ewovs6ns5y3k"] -[ext_resource type="Script" path="res://assets/core/networking/old/old_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"] [ext_resource type="PackedScene" uid="uid://c7mtmmke1anxp" path="res://assets/core/ships/test-ship/test-ship.tscn" id="4_feinw"] @@ -30,10 +29,6 @@ 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") diff --git a/assets/core/enviroment/dev-level/dev8E3A.tmp b/assets/core/enviroment/dev-level/dev8E3A.tmp new file mode 100644 index 0000000..0818b7f --- /dev/null +++ b/assets/core/enviroment/dev-level/dev8E3A.tmp @@ -0,0 +1,54 @@ +[gd_scene load_steps=10 format=3 uid="uid://ewovs6ns5y3k"] + +[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"] +[ext_resource type="PackedScene" uid="uid://c7mtmmke1anxp" path="res://assets/core/ships/test-ship/test-ship.tscn" id="4_feinw"] + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_yg2er"] +sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) +ground_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) + +[sub_resource type="Sky" id="Sky_roqfl"] +sky_material = SubResource("ProceduralSkyMaterial_yg2er") + +[sub_resource type="Environment" id="Environment_nyust"] +background_mode = 2 +sky = SubResource("Sky_roqfl") +tonemap_mode = 2 +glow_enabled = true + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8ttyg"] +albedo_texture = ExtResource("1_l0osb") +uv1_triplanar = true + +[sub_resource type="PlaneMesh" id="PlaneMesh_v66gr"] +lightmap_size_hint = Vector2i(102, 102) +size = Vector2(20, 20) + +[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_4238x"] + +[node name="DevLevel" type="Node3D"] + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_nyust") + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(-0.866023, -0.433016, 0.250001, 0, 0.499998, 0.866027, -0.500003, 0.749999, -0.43301, 0, 0, 0) +shadow_enabled = true + +[node name="StaticBody3D" type="StaticBody3D" parent="."] + +[node name="MeshInstance3D" type="MeshInstance3D" parent="StaticBody3D"] +material_override = SubResource("StandardMaterial3D_8ttyg") +mesh = SubResource("PlaneMesh_v66gr") +skeleton = NodePath("../..") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"] +shape = SubResource("WorldBoundaryShape3D_4238x") + +[node name="Player" parent="." instance=ExtResource("2_q510b")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) +joystick_camera_sens_multiplier = 5.0 + +[node name="TestShip" parent="." instance=ExtResource("4_feinw")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.24218, 0.563903, 0) diff --git a/assets/core/player-controller/scripts/player.gd b/assets/core/player-controller/scripts/player.gd index 9ee4950..a9eb3c4 100644 --- a/assets/core/player-controller/scripts/player.gd +++ b/assets/core/player-controller/scripts/player.gd @@ -1,6 +1,5 @@ class_name Player extends CharacterBody3D -var network_manager: OldnetworkManager var player_tag: Label3D var username: String = "" var is_piloting: bool = false @@ -30,16 +29,6 @@ var current_ship: Ship 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.my_username - player_tag.text = username - else: - player_tag.text = "Player" func _unhandled_input(event: InputEvent) -> void: diff --git a/godot-jolt/windows/~godot-jolt_windows-x64_editor.dll b/godot-jolt/windows/~godot-jolt_windows-x64_editor.dll new file mode 100644 index 0000000..c05d288 Binary files /dev/null and b/godot-jolt/windows/~godot-jolt_windows-x64_editor.dll differ