Bellsworne/splunk
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge multiplayer_spawner and lobby-map into develop #3

Merged
chrisbell merged 19 commits from multiplayer_spawner into develop 2025-08-10 01:33:58 +00:00
Conversation 0 Commits 19 Files Changed 32 +4 -181
16 changed files with 4 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 144bd3d2af - Show all commits

BIN
splunk/addons/godotsteam/win64/~libgodotsteam.windows.template_debug.x86_64.dll Normal file
View File

Binary file not shown.

BIN
splunk/levels/lobby-scene/lobby-terrain.blend
View File

Binary file not shown.

BIN
splunk/levels/lobby-scene/lobby-terrain/lobby-terrain.blend Normal file
View File

Binary file not shown.

6
splunk/levels/lobby-scene/lobby-terrain.blend.import → splunk/levels/lobby-scene/lobby-terrain/lobby-terrain.blend.import
View File

@@ -4,12 +4,12 @@ importer="scene"
importer_version=1 importer_version=1
type="PackedScene" type="PackedScene"
uid="uid://b5xb0fsfpn7r3" uid="uid://b5xb0fsfpn7r3"
path="res://.godot/imported/lobby-terrain.blend-1020d7f6f6a9a581e1b1682b5ac8d125.scn" path="res://.godot/imported/lobby-terrain.blend-a6c0be77548df4815861d8f088c594f5.scn"
[deps] [deps]
source_file="res://levels/lobby-scene/lobby-terrain.blend" source_file="res://levels/lobby-scene/lobby-terrain/lobby-terrain.blend"
dest_files=["res://.godot/imported/lobby-terrain.blend-1020d7f6f6a9a581e1b1682b5ac8d125.scn"] dest_files=["res://.godot/imported/lobby-terrain.blend-a6c0be77548df4815861d8f088c594f5.scn"]
[params] [params]

BIN
splunk/levels/lobby-scene/lobby-terrain/lobby-terrain.blend1 Normal file
View File

Binary file not shown.

2
splunk/levels/lobby-scene/lobby.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=9 format=3 uid="uid://bj52j4ew2lfr6"] [gd_scene load_steps=9 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://5vggmy1srgxb" path="res://tools/human-height-reference.tscn" id="1_yyu2g"]
[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/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://c4cew4af3h306" path="res://levels/lobby-scene/tent/tent.blend" id="4_qjimh"] [ext_resource type="PackedScene" uid="uid://c4cew4af3h306" path="res://levels/lobby-scene/tent/tent.blend" id="4_qjimh"]
[ext_resource type="PackedScene" uid="uid://wcsd1tb0quj3" path="res://levels/lobby-scene/campfire/campfire.tscn" id="5_qjimh"] [ext_resource type="PackedScene" uid="uid://wcsd1tb0quj3" path="res://levels/lobby-scene/campfire/campfire.tscn" id="5_qjimh"]

BIN
splunk/levels/lobby-scene/textures/line.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

36
splunk/levels/lobby-scene/textures/line.png.import
View File

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

BIN
splunk/levels/lobby-scene/textures/pins.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 125 KiB

36
splunk/levels/lobby-scene/textures/pins.png.import
View File

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

BIN
splunk/levels/lobby-scene/textures/rocky_terrain_02_diff_1k.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 823 KiB

35
splunk/levels/lobby-scene/textures/rocky_terrain_02_diff_1k.jpg.import
View File

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

BIN
splunk/levels/lobby-scene/textures/rocky_terrain_02_spec_1k.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 MiB

34
splunk/levels/lobby-scene/textures/rocky_terrain_02_spec_1k.png.import
View File

@@ -1,34 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://c31rlthxjvvbp"
path="res://.godot/imported/rocky_terrain_02_spec_1k.png-79c9d42463680422048e46f05a653dfb.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://levels/lobby-scene/textures/rocky_terrain_02_spec_1k.png"
dest_files=["res://.godot/imported/rocky_terrain_02_spec_1k.png-79c9d42463680422048e46f05a653dfb.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

BIN
splunk/levels/lobby-scene/textures/tent-canvas.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 92 KiB

36
splunk/levels/lobby-scene/textures/tent-canvas.png.import
View File

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