Compare commits

..

No commits in common. "303daf9f466afbf7497c2de7f381930c88474303" and "07824adc46f5eac6362e89185335257c14d942bd" have entirely different histories.

78 changed files with 47 additions and 1610 deletions

BIN
blends/large_meat_tunnel.blend (Stored with Git LFS)

Binary file not shown.

BIN
blends/npcs.blend (Stored with Git LFS)

Binary file not shown.

View File

@ -1,3 +0,0 @@
source_md5="260a1a093b28083e3bb5d68d7d2629b2"
dest_md5="2a70da73cacfba8b61dfea4a0f3b4a30"

View File

@ -1,3 +0,0 @@
source_md5="b17ffae7870489ca9a696aeb8ddb7487"
dest_md5="2dffe71f54e52c9ab9a6113978dbbb63"

View File

@ -1,3 +0,0 @@
source_md5="167e504c80c3383fd492087194952dd5"
dest_md5="746e1c98a78e38bc06634a02f653c521"

View File

@ -1,3 +0,0 @@
source_md5="ce8c0fb5a9b452a58496702ed8d8b106"
dest_md5="25ea04b09dece54626667e1c4cf7f3a6"

View File

@ -1,3 +0,0 @@
source_md5="c2f9215094c9b6e0e01f40df581b161f"
dest_md5="918820db68e34d0b428d711973450a13"

View File

@ -1,3 +0,0 @@
source_md5="f43cbb081cc0198b6eed6a1dd7c54790"
dest_md5="cb2d1e462e765d158f4fb76c12260cf4"

View File

@ -1,3 +0,0 @@
source_md5="80971a5fb0ac7a45de6569bf6dba9be5"
dest_md5="380f50d6b96981556eee1145301306c5"

View File

@ -1,3 +0,0 @@
source_md5="55b1acbc707c7826978c85fb69655cd7"
dest_md5="25a03e0c5cc97761264715dd2ef8d9c3"

View File

@ -1,3 +0,0 @@
source_md5="2554afb5c4b4c0b3234728ec1f254bd7"
dest_md5="c587dc91132ce3516a0838c4b8706a7f"

View File

@ -1,3 +0,0 @@
source_md5="a9c30bb446ab07cab4854dbc1528ace4"
dest_md5="e67b9ce1cc2cc33c74ff1be777457e51"

File diff suppressed because one or more lines are too long

BIN
godot/assets/meat_bore/npcs/Hair.material (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,35 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/alexis_body.png-50a7c2401071de20d27ca47e90d61eeb.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/meat_bore/npcs/alexis_body.png"
dest_files=[ "res://.import/alexis_body.png-50a7c2401071de20d27ca47e90d61eeb.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

Binary file not shown.

View File

@ -1,35 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/alexis_face.png-170a790666ff3d7cd5c366f70b101d04.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/meat_bore/npcs/alexis_face.png"
dest_files=[ "res://.import/alexis_face.png-170a790666ff3d7cd5c366f70b101d04.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

BIN
godot/assets/meat_bore/npcs/clark.png (Stored with Git LFS)

Binary file not shown.

View File

@ -1,35 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/clark.png-2a746a135da1ee50a31053b96fd0de9f.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/meat_bore/npcs/clark.png"
dest_files=[ "res://.import/clark.png-2a746a135da1ee50a31053b96fd0de9f.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

BIN
godot/assets/meat_bore/npcs/female.glb (Stored with Git LFS)

Binary file not shown.

View File

@ -1,7 +0,0 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://assets/meat_bore/npcs/female.glb" type="PackedScene" id=1]
[ext_resource path="res://assets/meat_bore/npcs/npc.gd" type="Script" id=2]
[node name="female" instance=ExtResource( 1 )]
script = ExtResource( 2 )

BIN
godot/assets/meat_bore/npcs/guy.png (Stored with Git LFS)

Binary file not shown.

View File

@ -1,37 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path.s3tc="res://.import/guy.png-60fc5ef51a1bbebd65a4df17941bfaf7.s3tc.stex"
path.etc2="res://.import/guy.png-60fc5ef51a1bbebd65a4df17941bfaf7.etc2.stex"
metadata={
"imported_formats": [ "s3tc", "etc2" ],
"vram_texture": true
}
[deps]
source_file="res://assets/meat_bore/npcs/guy.png"
dest_files=[ "res://.import/guy.png-60fc5ef51a1bbebd65a4df17941bfaf7.s3tc.stex", "res://.import/guy.png-60fc5ef51a1bbebd65a4df17941bfaf7.etc2.stex" ]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=true
flags/filter=true
flags/mipmaps=true
flags/anisotropic=false
flags/srgb=1
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

View File

@ -1,2 +0,0 @@
extends NPC

View File

@ -1,12 +0,0 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://assets/meat_bore/npcs/female.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/meat_bore/npcs/inherited/alexis.gd" type="Script" id=2]
[ext_resource path="res://assets/meat_bore/npcs/alexis_face.png" type="Texture" id=3]
[ext_resource path="res://assets/meat_bore/npcs/alexis_body.png" type="Texture" id=4]
[node name="alexis" instance=ExtResource( 1 )]
script = ExtResource( 2 )
who = 5
body_texture = ExtResource( 4 )
face_texture = ExtResource( 3 )

View File

@ -1,2 +0,0 @@
extends NPC

View File

@ -1,9 +0,0 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://assets/meat_bore/npcs/male.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/meat_bore/npcs/clark.png" type="Texture" id=2]
[ext_resource path="res://assets/meat_bore/npcs/inherited/clark.gd" type="Script" id=3]
[node name="clark" instance=ExtResource( 1 )]
script = ExtResource( 3 )
body_texture = ExtResource( 2 )

View File

@ -1,2 +0,0 @@
extends NPC

View File

@ -1,10 +0,0 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://assets/meat_bore/npcs/male.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/meat_bore/npcs/guy.png" type="Texture" id=2]
[ext_resource path="res://assets/meat_bore/npcs/inherited/guy.gd" type="Script" id=3]
[node name="guy" instance=ExtResource( 1 )]
script = ExtResource( 3 )
who = 1
body_texture = ExtResource( 2 )

View File

@ -1 +0,0 @@
extends NPC

View File

@ -1,12 +0,0 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://assets/meat_bore/npcs/female.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/meat_bore/npcs/inherited/jackie.gd" type="Script" id=2]
[ext_resource path="res://assets/meat_bore/npcs/jackie_face.png" type="Texture" id=3]
[ext_resource path="res://assets/meat_bore/npcs/jackie_body.png" type="Texture" id=4]
[node name="jackie" instance=ExtResource( 1 )]
script = ExtResource( 2 )
who = 4
body_texture = ExtResource( 4 )
face_texture = ExtResource( 3 )

View File

@ -1,2 +0,0 @@
extends NPC

View File

@ -1,10 +0,0 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://assets/meat_bore/npcs/male.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/meat_bore/npcs/inherited/lee.gd" type="Script" id=2]
[ext_resource path="res://assets/meat_bore/npcs/lee.png" type="Texture" id=3]
[node name="lee" instance=ExtResource( 1 )]
script = ExtResource( 2 )
who = 2
body_texture = ExtResource( 3 )

View File

@ -1,2 +0,0 @@
extends NPC

View File

@ -1,10 +0,0 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://assets/meat_bore/npcs/male.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/meat_bore/npcs/wally.png" type="Texture" id=2]
[ext_resource path="res://assets/meat_bore/npcs/inherited/wally.gd" type="Script" id=3]
[node name="wally" instance=ExtResource( 1 )]
script = ExtResource( 3 )
who = 3
body_texture = ExtResource( 2 )

Binary file not shown.

View File

@ -1,37 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path.s3tc="res://.import/jackie_body.png-2f253b6a4688bdfa07759d7164c0e39c.s3tc.stex"
path.etc2="res://.import/jackie_body.png-2f253b6a4688bdfa07759d7164c0e39c.etc2.stex"
metadata={
"imported_formats": [ "s3tc", "etc2" ],
"vram_texture": true
}
[deps]
source_file="res://assets/meat_bore/npcs/jackie_body.png"
dest_files=[ "res://.import/jackie_body.png-2f253b6a4688bdfa07759d7164c0e39c.s3tc.stex", "res://.import/jackie_body.png-2f253b6a4688bdfa07759d7164c0e39c.etc2.stex" ]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=true
flags/filter=true
flags/mipmaps=true
flags/anisotropic=false
flags/srgb=1
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

Binary file not shown.

View File

@ -1,37 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path.s3tc="res://.import/jackie_face.png-23926688dc17a6ac289778bd580eb3f8.s3tc.stex"
path.etc2="res://.import/jackie_face.png-23926688dc17a6ac289778bd580eb3f8.etc2.stex"
metadata={
"imported_formats": [ "s3tc", "etc2" ],
"vram_texture": true
}
[deps]
source_file="res://assets/meat_bore/npcs/jackie_face.png"
dest_files=[ "res://.import/jackie_face.png-23926688dc17a6ac289778bd580eb3f8.s3tc.stex", "res://.import/jackie_face.png-23926688dc17a6ac289778bd580eb3f8.etc2.stex" ]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=true
flags/filter=true
flags/mipmaps=true
flags/anisotropic=false
flags/srgb=1
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

BIN
godot/assets/meat_bore/npcs/lee.png (Stored with Git LFS)

Binary file not shown.

View File

@ -1,35 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/lee.png-dc03e5b1d96917dbf44fe8a45ad6808d.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/meat_bore/npcs/lee.png"
dest_files=[ "res://.import/lee.png-dc03e5b1d96917dbf44fe8a45ad6808d.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

BIN
godot/assets/meat_bore/npcs/male.glb (Stored with Git LFS)

Binary file not shown.

File diff suppressed because it is too large Load Diff

BIN
godot/assets/meat_bore/npcs/male.material (Stored with Git LFS)

Binary file not shown.

View File

@ -1,7 +0,0 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://assets/meat_bore/npcs/male.glb" type="PackedScene" id=1]
[ext_resource path="res://assets/meat_bore/npcs/npc.gd" type="Script" id=2]
[node name="male" instance=ExtResource( 1 )]
script = ExtResource( 2 )

Binary file not shown.

View File

@ -1,30 +0,0 @@
extends Spatial
class_name NPC
enum Name {Clark, Guy, Lee, Wally, Jackie, Alexis}
export(Name) var who
export var body_texture: StreamTexture
export var face_texture: StreamTexture
func is_male() -> bool:
return not (who == Name.Jackie or who == Name.Alexis)
func set_material():
var body_mesh: MeshInstance
if is_male():
body_mesh = $NPC_Male_Shared/Skeleton/NPC_Male
else:
body_mesh = $NPC_female/Skeleton/NPC_Female
var mat: SpatialMaterial = body_mesh.get_active_material(0).duplicate()
body_mesh.set_surface_material(0, mat)
mat.albedo_texture = body_texture
if not is_male():
var face_mat: SpatialMaterial = body_mesh.get_active_material(1).duplicate()
body_mesh.set_surface_material(1, face_mat)
face_mat.albedo_texture = face_texture
func _ready():
set_material()

BIN
godot/assets/meat_bore/npcs/wally.png (Stored with Git LFS)

Binary file not shown.

View File

@ -1,35 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/wally.png-68a25eeb1f1c09fa83b10d334bdf1171.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/meat_bore/npcs/wally.png"
dest_files=[ "res://.import/wally.png-68a25eeb1f1c09fa83b10d334bdf1171.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@ -68,11 +68,6 @@ _global_script_classes=[ {
"class": "HistoryRow",
"language": "GDScript",
"path": "res://addons/dialogic/Example Assets/History/HistoryRow.gd"
}, {
"base": "Spatial",
"class": "NPC",
"language": "GDScript",
"path": "res://assets/meat_bore/npcs/npc.gd"
} ]
_global_script_class_icons={
"DTS": "",
@ -86,8 +81,7 @@ _global_script_class_icons={
"DialogicResources": "",
"DialogicUtil": "",
"FpsLabel": "",
"HistoryRow": "",
"NPC": ""
"HistoryRow": ""
}
[application]
@ -244,7 +238,4 @@ common/enable_pause_aware_picking=true
[rendering]
quality/filters/msaa=4
quality/filters/use_fxaa=true
quality/filters/use_debanding=true
environment/default_environment="res://default_env.tres"

BIN
godot/tests/npc/NPC_Wally.material (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/tests/npc/PlatformDialogue.material (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/tests/npc/Wally_hair.material (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,27 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://player/player.tscn" type="PackedScene" id=1]
[ext_resource path="res://tests/npc/test_scale_person.glb" type="PackedScene" id=2]
[sub_resource type="CubeMesh" id=1]
[sub_resource type="ConcavePolygonShape" id=2]
data = PoolVector3Array( -1, 1, 1, 1, 1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, 1, 1, -1, -1, 1, -1, 1, -1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, 1, 1, 1, -1, 1, 1, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, -1, -1, -1, 1, 1, -1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, -1, -1 )
[node name="Spatial" type="Spatial"]
[node name="Player" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.750395, 3.6862 )
[node name="MeshInstance" type="MeshInstance" parent="."]
transform = Transform( 4.32175, 0, 0, 0, 1, 0, 0, 0, 5.31103, 0, -1.4332, 0 )
mesh = SubResource( 1 )
skeleton = NodePath("../Player")
[node name="StaticBody" type="StaticBody" parent="MeshInstance"]
[node name="CollisionShape" type="CollisionShape" parent="MeshInstance/StaticBody"]
shape = SubResource( 2 )
[node name="test_scale_person" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.733277, 17.7222 )

View File

@ -1,46 +0,0 @@
[gd_scene load_steps=10 format=2]
[ext_resource path="res://player/player.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/meat_bore/npcs/inherited/lee.tscn" type="PackedScene" id=2]
[ext_resource path="res://assets/meat_bore/npcs/inherited/clark.tscn" type="PackedScene" id=3]
[ext_resource path="res://assets/meat_bore/npcs/inherited/guy.tscn" type="PackedScene" id=4]
[ext_resource path="res://assets/meat_bore/npcs/inherited/wally.tscn" type="PackedScene" id=5]
[ext_resource path="res://assets/meat_bore/npcs/inherited/alexis.tscn" type="PackedScene" id=6]
[ext_resource path="res://assets/meat_bore/npcs/inherited/jackie.tscn" type="PackedScene" id=7]
[sub_resource type="CubeMesh" id=1]
[sub_resource type="ConcavePolygonShape" id=2]
data = PoolVector3Array( -1, 1, 1, 1, 1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, 1, 1, -1, -1, 1, -1, 1, -1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, 1, 1, 1, -1, 1, 1, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, -1, -1, -1, 1, 1, -1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, -1, -1 )
[node name="test_npcs" type="Spatial"]
[node name="MeshInstance" type="MeshInstance" parent="."]
transform = Transform( 30, 0, 0, 0, 1, 0, 0, 0, 30, 0, -1.13833, 0 )
mesh = SubResource( 1 )
[node name="StaticBody" type="StaticBody" parent="MeshInstance"]
[node name="CollisionShape" type="CollisionShape" parent="MeshInstance/StaticBody"]
shape = SubResource( 2 )
[node name="Player" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.750395, 5.35377 )
[node name="clark" parent="." instance=ExtResource( 3 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -13.7138, 0, -1.96286 )
[node name="guy" parent="." instance=ExtResource( 4 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.91612, 0, -1.96286 )
[node name="lee" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 6.70588, 0, -1.96286 )
[node name="wally" parent="." instance=ExtResource( 5 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 13.6277, 0, -1.96286 )
[node name="alexis" parent="." instance=ExtResource( 6 )]
transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -4.07735, 0, 8.9052 )
[node name="jackie" parent="." instance=ExtResource( 7 )]
transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 5.32869, 0, 9.12295 )

BIN
godot/tests/npc/test_scale_person.glb (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -2,12 +2,12 @@
importer="scene"
type="PackedScene"
path="res://.import/female.glb-184e334086c8db7f98b43d82ca1e969b.scn"
path="res://.import/test_scale_person.glb-50d90c8cb8ea501426ad50462d75bf15.scn"
[deps]
source_file="res://assets/meat_bore/npcs/female.glb"
dest_files=[ "res://.import/female.glb-184e334086c8db7f98b43d82ca1e969b.scn" ]
source_file="res://tests/npc/test_scale_person.glb"
dest_files=[ "res://.import/test_scale_person.glb-50d90c8cb8ea501426ad50462d75bf15.scn" ]
[params]