Merge branch 'spencer'

godot/.import/squirrel_model.glb-2c1a2100b1c43bc022d0d3aa1c26d89f.md5

@@ -0,0 +1,3 @@
+source_md5="c2947071cca030ba27be6cd7a1c95703"
+dest_md5="3003cc99a6a4aeb443aef53782102c68"
+

godot/assets/meat_bore/level.tscn

@@ -19,6 +19,7 @@ background_mode = 2
 ambient_light_color = Color( 0.329412, 0.231373, 0.231373, 1 )
 ambient_light_energy = 1.5
 ambient_light_sky_contribution = 0.0
+fog_enabled = true
 fog_color = Color( 0.0117647, 0.0156863, 0.0156863, 1 )
 fog_sun_color = Color( 0.639216, 0.541176, 0.345098, 1 )
 fog_depth_begin = 0.0

godot/assets/meat_bore/meat_module/level_wally.tscn

@@ -1,10 +1,26 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_4.png" type="Texture" id=2]
+[ext_resource path="res://assets/meat_bore/npcs/inherited/wally.tscn" type="PackedScene" id=3]
+[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=4]
+[ext_resource path="res://assets/meat_bore/bridge.tscn" type="PackedScene" id=5]
+[ext_resource path="res://assets/models/gj/squirrel_model.tscn" type="PackedScene" id=6]
 
 [node name="level_wally" type="Spatial"]
 
 [node name="meat_module_4" parent="." instance=ExtResource( 1 )]
 transform = Transform( 0.882693, 0, 0.469949, 0, 1, 0, -0.469949, 0, 0.882693, 0, -344.433, 0 )
 texture = ExtResource( 2 )
+
+[node name="bridge" parent="." instance=ExtResource( 5 )]
+transform = Transform( 0.930046, 0, -0.367443, 0, 1, 0, 0.367443, 0, 0.930046, 7.31136, -410.338, 21.682 )
+
+[node name="wally" parent="." instance=ExtResource( 3 )]
+transform = Transform( 0.0286718, 0, -0.999589, 0, 1, 0, 0.999589, 0, 0.0286718, 23.155, -406.953, -12.1973 )
+
+[node name="dialogue_platform" parent="." instance=ExtResource( 4 )]
+transform = Transform( -4.24089e-08, -0.970203, 0.242294, 1, -4.37114e-08, 0, 1.0591e-08, 0.242294, 0.970203, 23.5906, -407.725, -12.33 )
+
+[node name="egg" parent="." instance=ExtResource( 6 )]
+transform = Transform( -0.00222995, 0, 0.0097482, 0, 0.01, 0, -0.0097482, 0, -0.00222995, 23.9331, -407.714, -12.5777 )

godot/assets/models/gj/squirrel_model.tscn

@@ -0,0 +1,5 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://assets/models/gj/squirrel_model.glb" type="PackedScene" id=1]
+
+[node name="squirrel_model" instance=ExtResource( 1 )]

godot/effects/grainy_shader.tscn

@@ -42,3 +42,4 @@ volume_db = 15.0
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 5 )
+volume_db = -20.0