diff --git a/.vscode/settings.json b/.vscode/settings.json index b3c7bde..b5a50dd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { - "godotTools.editorPath.godot4": "/home/sascha/Godot/Godot_v4.5-dev4_linux.x86_64", + "godotTools.editorPath.godot4": "c:\\Program Files\\Godot\\Godot_v4.5-dev5_win64.exe", "git.alwaysShowStagedChangesResourceGroup": false, "git.enableCommitSigning": true } \ No newline at end of file diff --git a/project.godot b/project.godot index 492841d..cd21d93 100644 --- a/project.godot +++ b/project.godot @@ -113,6 +113,7 @@ interact={ [physics] +3d/run_on_separate_thread=true 3d/physics_engine="Jolt Physics" [rendering] diff --git a/resources/floors_mesh_library.tres b/resources/floors_mesh_library.tres index 52b3c7d..fc72fc4 100644 --- a/resources/floors_mesh_library.tres +++ b/resources/floors_mesh_library.tres @@ -1,6 +1,6 @@ [gd_resource type="MeshLibrary" load_steps=61 format=4 uid="uid://dje66fxvu4hnm"] -[ext_resource type="Material" uid="uid://necdpoannnkr" path="res://resources/models/dungeon/Textures/texture.tres" id="1_h3coj"] +[ext_resource type="Material" uid="uid://necdpoannnkr" path="res://resources/models/dungeon/textures/texture.tres" id="1_h3coj"] [sub_resource type="ArrayMesh" id="ArrayMesh_1j13a"] _surfaces = [{ diff --git a/resources/level_mesh_library.tres b/resources/level_mesh_library.tres index 213b82e..998ebb0 100644 --- a/resources/level_mesh_library.tres +++ b/resources/level_mesh_library.tres @@ -1,7 +1,7 @@ [gd_resource type="MeshLibrary" load_steps=84 format=4 uid="uid://bs0yqy7xhugol"] -[ext_resource type="Material" uid="uid://necdpoannnkr" path="res://resources/models/dungeon/Textures/texture.tres" id="1_7wu0l"] -[ext_resource type="Texture2D" uid="uid://3i63817g50qe" path="res://resources/models/dungeon/Textures/dungeon_texture.png" id="1_liv3e"] +[ext_resource type="Material" uid="uid://necdpoannnkr" path="res://resources/models/dungeon/textures/texture.tres" id="1_7wu0l"] +[ext_resource type="Texture2D" uid="uid://3i63817g50qe" path="res://resources/models/dungeon/textures/dungeon_texture.png" id="1_liv3e"] [sub_resource type="ArrayMesh" id="ArrayMesh_alv7x"] _surfaces = [{ diff --git a/scenes/game.tscn b/scenes/game.tscn index 375ec77..b5635df 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -105,7 +105,7 @@ script = ExtResource("15_y5174") script = ExtResource("8_ovkga") enemies_ui_container = NodePath("../UI/Enemies_UI/VBoxContainer") -[node name="Player" parent="." groups=["player"] instance=ExtResource("14_bpicj")] +[node name="Player" parent="." instance=ExtResource("14_bpicj")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19.1405, 6.08565, 7.3696) maximum_health = 25 maximum_stamina = 100