diff --git a/splunk/addons/godotsteam/win64/~libgodotsteam.windows.template_debug.x86_64.dll b/splunk/addons/godotsteam/win64/~libgodotsteam.windows.template_debug.x86_64.dll deleted file mode 100644 index 3d02848..0000000 Binary files a/splunk/addons/godotsteam/win64/~libgodotsteam.windows.template_debug.x86_64.dll and /dev/null differ diff --git a/splunk/levels/lobby-scene/lobby-terrain/lobby-terrain.blend b/splunk/levels/lobby-scene/lobby-terrain/lobby-terrain.blend index f82f29a..3c429e9 100644 Binary files a/splunk/levels/lobby-scene/lobby-terrain/lobby-terrain.blend and b/splunk/levels/lobby-scene/lobby-terrain/lobby-terrain.blend differ diff --git a/splunk/levels/lobby-scene/lobby-terrain/lobby-terrain.blend1 b/splunk/levels/lobby-scene/lobby-terrain/lobby-terrain.blend1 index e21bfad..344b3b7 100644 Binary files a/splunk/levels/lobby-scene/lobby-terrain/lobby-terrain.blend1 and b/splunk/levels/lobby-scene/lobby-terrain/lobby-terrain.blend1 differ diff --git a/splunk/levels/lobby-scene/lobby.tscn b/splunk/levels/lobby-scene/lobby.tscn index a021042..f16dfdb 100644 --- a/splunk/levels/lobby-scene/lobby.tscn +++ b/splunk/levels/lobby-scene/lobby.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=9 format=3 uid="uid://bj52j4ew2lfr6"] +[gd_scene load_steps=10 format=3 uid="uid://bj52j4ew2lfr6"] [ext_resource type="PackedScene" uid="uid://5vggmy1srgxb" path="res://tools/human-height-reference.tscn" id="1_yyu2g"] +[ext_resource type="PackedScene" uid="uid://bhgahenvxqhec" path="res://levels/lobby-scene/tree/tree.blend" id="3_0u2wx"] [ext_resource type="PackedScene" uid="uid://b5xb0fsfpn7r3" path="res://levels/lobby-scene/lobby-terrain/lobby-terrain.blend" id="3_f73ky"] [ext_resource type="PackedScene" uid="uid://csmfxg011xisf" path="res://player/Player.tscn" id="4_0aw1h"] [ext_resource type="PackedScene" uid="uid://c4cew4af3h306" path="res://levels/lobby-scene/tent/tent.blend" id="4_qjimh"] @@ -36,6 +37,11 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.33741, 0.953, -5.00694) [node name="lobby-terrain" parent="." instance=ExtResource("3_f73ky")] +[node name="Node3D" type="Node3D" parent="lobby-terrain"] + +[node name="tree" parent="lobby-terrain/Node3D" instance=ExtResource("3_0u2wx")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.47232, 0, -12.0981) + [node name="MultiplayerSpawner" type="MultiplayerSpawner" parent="."] _spawnable_scenes = PackedStringArray("uid://csmfxg011xisf") spawn_path = NodePath("../Marker3D") @@ -51,23 +57,24 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.444747, 0.992996, -4.71496) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.724, 0, -17.6721) [node name="TentPlot1" type="Marker3D" parent="Campsite"] -transform = Transform3D(-0.998887, 0, -0.0471587, 0, 1, 0, 0.0471587, 0, -0.998887, -0.468871, 0, -6.31805) +transform = Transform3D(-0.998887, 0, -0.0471587, 0, 1, 0, 0.0471587, 0, -0.998887, -0.468871, 0.334599, -6.31805) [node name="tent" parent="Campsite/TentPlot1" instance=ExtResource("4_qjimh")] [node name="TentPlot2" type="Marker3D" parent="Campsite"] -transform = Transform3D(-0.240973, 0, -0.970532, 0, 1, 0, 0.970532, 0, -0.240973, -6.46887, 0, -2.31805) +transform = Transform3D(-0.240973, 0, -0.970532, 0, 1, 0, 0.970532, 0, -0.240973, -6.46887, 0.334599, -2.31805) [node name="tent" parent="Campsite/TentPlot2" instance=ExtResource("4_qjimh")] [node name="TentPlot3" type="Marker3D" parent="Campsite"] -transform = Transform3D(0.689594, 0, -0.724196, 0, 1, 0, 0.724196, 0, 0.689594, -4.46887, 0, 4.68195) +transform = Transform3D(0.689594, 0, -0.724196, 0, 1, 0, 0.724196, 0, 0.689594, -4.46887, 0.334599, 4.68195) [node name="tent" parent="Campsite/TentPlot3" instance=ExtResource("4_qjimh")] [node name="TentPlot4" type="Marker3D" parent="Campsite"] -transform = Transform3D(-0.0217975, 0, 0.999762, 0, 1, 0, -0.999762, 0, -0.0217975, 6.53113, 0, -2.31805) +transform = Transform3D(-0.0217975, 0, 0.999762, 0, 1, 0, -0.999762, 0, -0.0217975, 6.53113, 0.334599, -2.31805) [node name="tent" parent="Campsite/TentPlot4" instance=ExtResource("4_qjimh")] [node name="Campfire" parent="Campsite" instance=ExtResource("5_qjimh")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.392361, 0) diff --git a/splunk/levels/lobby-scene/tent/tent.blend b/splunk/levels/lobby-scene/tent/tent.blend index f57dda2..bacea3e 100644 Binary files a/splunk/levels/lobby-scene/tent/tent.blend and b/splunk/levels/lobby-scene/tent/tent.blend differ diff --git a/splunk/levels/lobby-scene/tent/tent.blend1 b/splunk/levels/lobby-scene/tent/tent.blend1 new file mode 100644 index 0000000..e0173fb Binary files /dev/null and b/splunk/levels/lobby-scene/tent/tent.blend1 differ diff --git a/splunk/levels/lobby-scene/tree/textures/leaves.png b/splunk/levels/lobby-scene/tree/textures/leaves.png new file mode 100644 index 0000000..bf983a1 Binary files /dev/null and b/splunk/levels/lobby-scene/tree/textures/leaves.png differ diff --git a/splunk/levels/lobby-scene/tree/textures/leaves.png.import b/splunk/levels/lobby-scene/tree/textures/leaves.png.import new file mode 100644 index 0000000..9e3d3ed --- /dev/null +++ b/splunk/levels/lobby-scene/tree/textures/leaves.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bd53ybrlho0d1" +path.s3tc="res://.godot/imported/leaves.png-530373898a77b84d2e3909cbed29021f.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://levels/lobby-scene/tree/textures/leaves.png" +dest_files=["res://.godot/imported/leaves.png-530373898a77b84d2e3909cbed29021f.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/splunk/levels/lobby-scene/tree/textures/trunk.png b/splunk/levels/lobby-scene/tree/textures/trunk.png new file mode 100644 index 0000000..50f2243 Binary files /dev/null and b/splunk/levels/lobby-scene/tree/textures/trunk.png differ diff --git a/splunk/levels/lobby-scene/tree/textures/trunk.png.import b/splunk/levels/lobby-scene/tree/textures/trunk.png.import new file mode 100644 index 0000000..d101762 --- /dev/null +++ b/splunk/levels/lobby-scene/tree/textures/trunk.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cxuxtdscvpcru" +path.s3tc="res://.godot/imported/trunk.png-4d6cd7f252205478b8e4bf2b892c9b44.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://levels/lobby-scene/tree/textures/trunk.png" +dest_files=["res://.godot/imported/trunk.png-4d6cd7f252205478b8e4bf2b892c9b44.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/splunk/levels/lobby-scene/tree/tree.blend b/splunk/levels/lobby-scene/tree/tree.blend new file mode 100644 index 0000000..6029d19 Binary files /dev/null and b/splunk/levels/lobby-scene/tree/tree.blend differ diff --git a/splunk/levels/lobby-scene/tree/tree.blend.import b/splunk/levels/lobby-scene/tree/tree.blend.import new file mode 100644 index 0000000..6c81377 --- /dev/null +++ b/splunk/levels/lobby-scene/tree/tree.blend.import @@ -0,0 +1,53 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bhgahenvxqhec" +path="res://.godot/imported/tree.blend-2e97b0c94b4b9f627dfe10b7f953c7fe.scn" + +[deps] + +source_file="res://levels/lobby-scene/tree/tree.blend" +dest_files=["res://.godot/imported/tree.blend-2e97b0c94b4b9f627dfe10b7f953c7fe.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +blender/nodes/visible=0 +blender/nodes/active_collection_only=false +blender/nodes/punctual_lights=true +blender/nodes/cameras=true +blender/nodes/custom_properties=true +blender/nodes/modifiers=1 +blender/meshes/colors=false +blender/meshes/uvs=true +blender/meshes/normals=true +blender/meshes/export_geometry_nodes_instances=false +blender/meshes/tangents=true +blender/meshes/skins=2 +blender/meshes/export_bones_deforming_mesh_only=false +blender/materials/unpack_enabled=true +blender/materials/export_materials=1 +blender/animation/limit_playback=true +blender/animation/always_sample=true +blender/animation/group_tracks=true diff --git a/splunk/levels/lobby-scene/tree/tree.blend1 b/splunk/levels/lobby-scene/tree/tree.blend1 new file mode 100644 index 0000000..1cdac8b Binary files /dev/null and b/splunk/levels/lobby-scene/tree/tree.blend1 differ diff --git a/splunk/levels/lobby-scene/tree/trunk.png b/splunk/levels/lobby-scene/tree/trunk.png new file mode 100644 index 0000000..831c7ba Binary files /dev/null and b/splunk/levels/lobby-scene/tree/trunk.png differ diff --git a/splunk/levels/lobby-scene/tree/trunk.png.import b/splunk/levels/lobby-scene/tree/trunk.png.import new file mode 100644 index 0000000..1be0ecb --- /dev/null +++ b/splunk/levels/lobby-scene/tree/trunk.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://chrva3l6shfhg" +path="res://.godot/imported/trunk.png-b162fd3ffcc29a857809c16bdc1c00bb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://levels/lobby-scene/tree/trunk.png" +dest_files=["res://.godot/imported/trunk.png-b162fd3ffcc29a857809c16bdc1c00bb.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1