Merge multiplayer to dev branch #2

Merged
chrisbell merged 21 commits from multiplayer into develop 2025-08-07 22:06:02 +00:00
12 changed files with 274 additions and 4 deletions
Showing only changes of commit be2f304621 - Show all commits

View File

@@ -0,0 +1,131 @@
[gd_scene load_steps=17 format=3 uid="uid://wcsd1tb0quj3"]
[ext_resource type="PackedScene" uid="uid://ceovc780lyj1r" path="res://levels/lobby-scene/campfire.blend" id="1_5k61m"]
[ext_resource type="Texture2D" uid="uid://ciegdylo5csyt" path="res://levels/lobby-scene/textures/smoke-particle-texture.png" id="2_4swet"]
[sub_resource type="Gradient" id="Gradient_5k61m"]
offsets = PackedFloat32Array(0.175439, 0.859649)
colors = PackedColorArray(0, 0, 0, 1, 0.52549, 0.180392, 0.0745098, 1)
[sub_resource type="GradientTexture1D" id="GradientTexture1D_4swet"]
gradient = SubResource("Gradient_5k61m")
[sub_resource type="Curve" id="Curve_pgdjc"]
_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.25, 1), 0.0, 0.0, 0, 0, Vector2(1, 0.393258), 0.0, 0.0, 0, 0]
point_count = 3
[sub_resource type="CurveTexture" id="CurveTexture_wwyeu"]
curve = SubResource("Curve_pgdjc")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_js7yv"]
angle_min = 1.07288e-05
angle_max = 360.0
direction = Vector3(0, 1, 0)
spread = 0.0
initial_velocity_min = 1.0
initial_velocity_max = 4.0
angular_velocity_min = -1.60933e-05
angular_velocity_max = 40.0
gravity = Vector3(0, 0, 0)
linear_accel_min = 0.999998
linear_accel_max = 5.0
scale_min = 0.1
scale_max = 0.6
scale_curve = SubResource("CurveTexture_wwyeu")
color_initial_ramp = SubResource("GradientTexture1D_4swet")
hue_variation_min = -1.0
hue_variation_max = -0.75
turbulence_enabled = true
turbulence_noise_strength = 0.1
turbulence_noise_scale = 10.0
turbulence_influence_min = 0.01
turbulence_influence_max = 0.03
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5k61m"]
transparency = 1
blend_mode = 1
shading_mode = 0
vertex_color_use_as_albedo = true
albedo_color = Color(0.352941, 0.117647, 0.0666667, 1)
billboard_mode = 3
billboard_keep_scale = true
particles_anim_h_frames = 1
particles_anim_v_frames = 1
particles_anim_loop = false
[sub_resource type="QuadMesh" id="QuadMesh_p40iq"]
material = SubResource("StandardMaterial3D_5k61m")
[sub_resource type="Gradient" id="Gradient_4swet"]
offsets = PackedFloat32Array(0.175439, 1)
[sub_resource type="GradientTexture1D" id="GradientTexture1D_pgdjc"]
gradient = SubResource("Gradient_4swet")
[sub_resource type="Curve" id="Curve_wwyeu"]
_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.25, 1), 0.0, 0.0, 0, 0, Vector2(1, 0.393258), 0.0, 0.0, 0, 0]
point_count = 3
[sub_resource type="CurveTexture" id="CurveTexture_js7yv"]
curve = SubResource("Curve_wwyeu")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_0feaq"]
angle_min = 1.07288e-05
angle_max = 360.0
direction = Vector3(0, 1, 0)
spread = 0.0
initial_velocity_min = 1.0
initial_velocity_max = 4.0
angular_velocity_min = -1.60933e-05
angular_velocity_max = 40.0
gravity = Vector3(0, 0, 0)
linear_accel_min = 0.999998
linear_accel_max = 2.0
scale_min = 0.1
scale_curve = SubResource("CurveTexture_js7yv")
color_initial_ramp = SubResource("GradientTexture1D_pgdjc")
hue_variation_min = -2.23517e-08
hue_variation_max = 0.03
turbulence_enabled = true
turbulence_noise_strength = 0.1
turbulence_noise_scale = 1.76
turbulence_influence_min = 0.01
turbulence_influence_max = 0.01
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_p40iq"]
transparency = 1
shading_mode = 0
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("2_4swet")
billboard_mode = 3
billboard_keep_scale = true
particles_anim_h_frames = 1
particles_anim_v_frames = 1
particles_anim_loop = false
[sub_resource type="QuadMesh" id="QuadMesh_8eekk"]
material = SubResource("StandardMaterial3D_p40iq")
[node name="Campfire" type="Node3D"]
[node name="campfire" parent="." instance=ExtResource("1_5k61m")]
[node name="FireParticles" type="GPUParticles3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0211215, 0.220129, -0.0153611)
amount = 500
lifetime = 0.3
explosiveness = 0.08
randomness = 1.0
draw_order = 3
process_material = SubResource("ParticleProcessMaterial_js7yv")
draw_pass_1 = SubResource("QuadMesh_p40iq")
[node name="SmokeParticles" type="GPUParticles3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0211215, 0.220129, -0.0153611)
amount = 100
lifetime = 2.0
explosiveness = 0.06
randomness = 1.0
draw_order = 3
process_material = SubResource("ParticleProcessMaterial_0feaq")
draw_pass_1 = SubResource("QuadMesh_8eekk")

View File

@@ -4,7 +4,7 @@
[ext_resource type="PackedScene" uid="uid://b5xb0fsfpn7r3" path="res://levels/lobby-scene/lobby-terrain.blend" id="3_f73ky"] [ext_resource type="PackedScene" uid="uid://b5xb0fsfpn7r3" path="res://levels/lobby-scene/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://csmfxg011xisf" path="res://player/Player.tscn" id="4_0aw1h"]
[ext_resource type="PackedScene" uid="uid://dgi81jdv7gs76" path="res://levels/lobby-scene/tent.blend" id="4_qjimh"] [ext_resource type="PackedScene" uid="uid://dgi81jdv7gs76" path="res://levels/lobby-scene/tent.blend" id="4_qjimh"]
[ext_resource type="PackedScene" uid="uid://ceovc780lyj1r" path="res://levels/lobby-scene/campfire.blend" id="5_qjimh"] [ext_resource type="PackedScene" uid="uid://wcsd1tb0quj3" path="res://levels/lobby-scene/campfire.tscn" id="5_qjimh"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_f73ky"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_f73ky"]
@@ -59,9 +59,8 @@ transform = Transform3D(0.689594, 0, -0.724196, 0, 1, 0, 0.724196, 0, 0.689594,
[node name="tent" parent="Campsite/TentPlot3" instance=ExtResource("4_qjimh")] [node name="tent" parent="Campsite/TentPlot3" instance=ExtResource("4_qjimh")]
[node name="TentPlot4" type="Marker3D" parent="Campsite"] [node name="TentPlot4" type="Marker3D" parent="Campsite"]
transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 6.53113, 0, -2.31805) transform = Transform3D(-0.0217975, 0, 0.999762, 0, 1, 0, -0.999762, 0, -0.0217975, 6.53113, 0, -2.31805)
[node name="tent" parent="Campsite/TentPlot4" instance=ExtResource("4_qjimh")] [node name="tent" parent="Campsite/TentPlot4" instance=ExtResource("4_qjimh")]
transform = Transform3D(-0.0217975, 0, 0.999762, 0, 1, 0, -0.999762, 0, -0.0217975, 0, 0, 0)
[node name="campfire" parent="Campsite" instance=ExtResource("5_qjimh")] [node name="Campfire" parent="Campsite" instance=ExtResource("5_qjimh")]

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bjlwlqwdnhyqa"
path.s3tc="res://.godot/imported/ashes.png-68bd51854b6ac7814908f72d029da481.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://levels/lobby-scene/textures/ashes.png"
dest_files=["res://.godot/imported/ashes.png-68bd51854b6ac7814908f72d029da481.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

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 KiB

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://mwhsj8t5w8u2"
path.s3tc="res://.godot/imported/log.png-d8f215f1df4e8376f24995e3581b30a1.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://levels/lobby-scene/textures/log.png"
dest_files=["res://.godot/imported/log.png-d8f215f1df4e8376f24995e3581b30a1.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

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ciegdylo5csyt"
path.s3tc="res://.godot/imported/smoke-particle-texture.png-a4ea0bec4b9e2e9d34ba16a5e9537d0b.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://levels/lobby-scene/textures/smoke-particle-texture.png"
dest_files=["res://.godot/imported/smoke-particle-texture.png-a4ea0bec4b9e2e9d34ba16a5e9537d0b.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

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 KiB

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cwwjn82mmy6oc"
path.s3tc="res://.godot/imported/stone.png-42fb815495c8c1b1d661e35d0a0319f0.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://levels/lobby-scene/textures/stone.png"
dest_files=["res://.godot/imported/stone.png-42fb815495c8c1b1d661e35d0a0319f0.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