Merge remote-tracking branch 'origin/master' into spencer

godot/.import/DialoguePlatform.png-68ea8c870d06d0214a9dc3cde2cfb036.md5

@@ -0,0 +1,3 @@
+source_md5="f6c77a8791735feb2c3822c6613f1cc2"
+dest_md5="6b2a9e36b540ab495dd48dba88b1964b"
+

godot/.import/MeatBeam.png-b746add5614258c7d2e86f72a919e9a5.md5

@@ -0,0 +1,3 @@
+source_md5="57cc2c4a679a96030b48b2934fbf1c4c"
+dest_md5="c181e481e2768766c0df2dd1f117e1b8"
+

godot/.import/MeatCubby.png-d62bac7c6ef41570b23b2971f1055a9e.md5

@@ -0,0 +1,3 @@
+source_md5="eddb7525cac915094c2c7b0d7ed30c31"
+dest_md5="93768fa920feb5767deb0dfd93468f96"
+

godot/.import/NPC_CLARK.png-9c960b797ba35ad7cab77105bfad837e.md5

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

godot/.import/NPC_Clothing_1.png-4a16b1020155a4ef202d1424e40baf5c.md5

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

godot/.import/NPC_Clothing_2.png-c652a4443a4707910dd91fa73a9ca11e.md5

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

godot/.import/NPC_Face_Jackie.png-2abf6b69c3554951b99d438a66ba1343.md5

@@ -0,0 +1,3 @@
+source_md5="406f5467bff722e08dcf48b3fd1c0504"
+dest_md5="dbad5ccb49ef13300b6c17de18196ba1"
+

godot/.import/NPC_Guy.png-0557dfba3751dd09bbfd9d8aa6ae12fb.md5

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

godot/.import/NPC_Wally.png-6638429ed66b6ba5bfd125b74a7e3bea.md5

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

godot/.import/NPC_face_alexis.png-53f5272afde138ae7ef5802b6bad2441.md5

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

godot/.import/death_plane.glb-576f5944fb4fe988274a79612c45876e.md5

@@ -0,0 +1,3 @@
+source_md5="2ad5e1daec3b1764b90baead57655936"
+dest_md5="4017947be5efc50d7a70998a91462a20"
+

godot/.import/dialogue_platform.glb-1aae6acef592947e73f7f663738dcb74.md5

@@ -0,0 +1,3 @@
+source_md5="ca297a3e57817cdae49e54fb591d0737"
+dest_md5="d9d30a3b1f96de3d25973bed425ac6bc"
+

godot/.import/easy_meat_spiral.glb-7697a640b98878130f02f73092633972.md5

@@ -0,0 +1,3 @@
+source_md5="0941eb2267e82649aae4c09691197d47"
+dest_md5="b38ce169b4ece5fd9fafc517a78c4a83"
+

godot/.import/meat_beams.glb-b5f5ef22792d11d4ba9168b663d26458.md5

@@ -0,0 +1,3 @@
+source_md5="ba2b4fe80ac63027ebeb29a17173cab0"
+dest_md5="48f4a3396c2e838db225f7cc7d73126f"
+

godot/.import/meat_bridge.glb-9c1b6421348759e6f029bec6ba428b54.md5

@@ -0,0 +1,3 @@
+source_md5="726d0f9bade8c75ca930c109ef8ef9db"
+dest_md5="9f84ccbb57864e877cf63184ea5ffbff"
+

godot/.import/meat_module.glb-927576d41d9d866494ee3bb85a67ecd4.md5

@@ -0,0 +1,3 @@
+source_md5="c53a6c90c8820315300a925dc3eace7e"
+dest_md5="1124fff7e337407e42df853dd7eaa30d"
+

godot/.import/meat_module.glb-c07f9420e3cc0833689573b479b581ea.md5

@@ -0,0 +1,3 @@
+source_md5="7945b33397e1eda77fa5b3ab367b3415"
+dest_md5="da1065410c8e6d8dd1ae2d28615a35b4"
+

godot/.import/meat_module_outside_walls_1.png-7a85cf8d3e38307aef2431c027683632.md5

@@ -0,0 +1,3 @@
+source_md5="66d35c939d1c59fe2e445d1222abc4b6"
+dest_md5="8f583e5056773fa2debb331b70a55467"
+

godot/.import/meat_module_outside_walls_1.png-b4b03ac874c4559e11213303b1e81a14.md5

@@ -0,0 +1,3 @@
+source_md5="66d35c939d1c59fe2e445d1222abc4b6"
+dest_md5="8f583e5056773fa2debb331b70a55467"
+

godot/.import/meat_module_outside_walls_2.png-20ce7f6df4c6dc4e2e31755d9f1b00fc.md5

@@ -0,0 +1,3 @@
+source_md5="a4dfdf2ae9e9f4e16dd55555bb69f6f5"
+dest_md5="b2536413460145fe91f134d79666d7b9"
+

godot/.import/meat_module_outside_walls_2.png-989b72419804ec77bdf5bab8e19f7b6e.md5

@@ -0,0 +1,3 @@
+source_md5="a4dfdf2ae9e9f4e16dd55555bb69f6f5"
+dest_md5="b2536413460145fe91f134d79666d7b9"
+

godot/.import/meat_module_outside_walls_3.png-96ff8fec93d654a9b747f541735e8c50.md5

@@ -0,0 +1,3 @@
+source_md5="d2b0b148f8c803af3a1b869d5b07a10d"
+dest_md5="44a67cdc61f0e48aba4256dda433c9db"
+

godot/.import/meat_module_outside_walls_3.png-afa20787fd403d8a524faaff2cf83d21.md5

@@ -0,0 +1,3 @@
+source_md5="d2b0b148f8c803af3a1b869d5b07a10d"
+dest_md5="44a67cdc61f0e48aba4256dda433c9db"
+

godot/.import/meat_module_outside_walls_4.png-1175f9e1217f0e17d3fdd165a9e0209b.md5

@@ -0,0 +1,3 @@
+source_md5="3de4f348b186e58d963637c566532ff5"
+dest_md5="66cedc82971eef112e89ddb4a02d5f09"
+

godot/.import/meat_module_outside_walls_4.png-c3f02759f229c34c8534c872d0957c0a.md5

@@ -0,0 +1,3 @@
+source_md5="3de4f348b186e58d963637c566532ff5"
+dest_md5="66cedc82971eef112e89ddb4a02d5f09"
+

godot/.import/meat_module_outside_walls_5.png-0e21905e1a4fd5039bad44fa47bf0934.md5

@@ -0,0 +1,3 @@
+source_md5="00247cd5d0c3112ee7388247e1c8bef1"
+dest_md5="cd6d98529fdc942b6a39231a0c495e3f"
+

godot/.import/meat_module_outside_walls_5.png-dfd65ea722db25b06f0543d428a83230.md5

@@ -0,0 +1,3 @@
+source_md5="00247cd5d0c3112ee7388247e1c8bef1"
+dest_md5="cd6d98529fdc942b6a39231a0c495e3f"
+

godot/.import/meat_spiral.glb-9111dcda5b6ab53564197cc5b66efe37.md5

@@ -0,0 +1,3 @@
+source_md5="1459ab548717a0220fe3347f4b24bf87"
+dest_md5="6682082f2722b1af362f66a15cc24524"
+

godot/.import/meat_surface_texture.png-92f7396c162e4dbf13fe1d56ffcc3cf3.md5

@@ -0,0 +1,3 @@
+source_md5="2b974ca5619ba0c89f5aebb07e234add"
+dest_md5="8b96640665d3cae4f7f5dd53f4693e4f"
+

godot/.import/meat_tunnel.glb-4bdf467784ccc46d8f465e25d3108310.md5

@@ -0,0 +1,3 @@
+source_md5="be4e6d6b3ed62d9280fec621efc0f056"
+dest_md5="29ef602c1a026d12ceb41208addd74e4"
+

godot/.import/meat_tunnel_top.glb-46415c8114738c337a9732db0889c2a9.md5

@@ -0,0 +1,3 @@
+source_md5="b64812640b63b683a7fcf106b23add06"
+dest_md5="03137a07d7dd8ef4f6efa7bbeed0d3d5"
+

godot/.import/meat_tunnel_top.glb-6c6de194e35dd85a788db4649e968c68.md5

@@ -0,0 +1,3 @@
+source_md5="1e17bb3365f0e711d2b1d6e4a248d9fd"
+dest_md5="9e3f4ab3ee121b1a936c846a70d99f3f"
+

godot/.import/npc_alexis.glb-481bba614aab540953e783e850bc1cd2.md5

@@ -0,0 +1,3 @@
+source_md5="80685aed067d33bfb7b12c377f70a42c"
+dest_md5="2f0aa5fcc8b2734431dd6d9d595c394d"
+

godot/.import/npc_clark.glb-3f40f85e7545e26e0da80dfe623466fe.md5

@@ -0,0 +1,3 @@
+source_md5="d72c0166c3f3b7c993818e6f251b185d"
+dest_md5="4b161553dfaf2d01f1b7f903811d7b12"
+

godot/.import/npc_guy.glb-bc926393a95979b3ce6e3b40fb02cf27.md5

@@ -0,0 +1,3 @@
+source_md5="0cb9748b5695e8bdc402c1c04a4a4005"
+dest_md5="6e1e118d159c29c243aa50440ae0e46e"
+

godot/.import/npc_jackie.glb-d1157259f1f264c54e6fb77ced1b0fd3.md5

@@ -0,0 +1,3 @@
+source_md5="b57da543342bee3b11bf128863633d8c"
+dest_md5="fb3e4c5427d7dfd2b792b1d87ad0516d"
+

godot/.import/npc_lee.glb-cfa0b4236076edde1b5ec6f2338654c4.md5

@@ -0,0 +1,3 @@
+source_md5="fc9aeedb0eb04570b0e937e8c4e3352e"
+dest_md5="938ee58c23cf7450eb65bc5395ba6628"
+

godot/.import/npc_wally.glb-904a52a1d16eaabd52aebea8d07b6e6c.md5

@@ -0,0 +1,3 @@
+source_md5="6aeb655ecabd40ec081e3f095251ff33"
+dest_md5="165b083178b83fab549852194ffba989"
+

godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres

@@ -5,7 +5,7 @@ content_margin_left = 10.0
 content_margin_right = 10.0
 content_margin_top = 10.0
 content_margin_bottom = 10.0
-bg_color = Color( 0.03, 0.21, 0.26, 1 )
+bg_color = Color( 0.2, 0.23, 0.31, 1 )
 border_width_left = 1
 border_width_top = 1
 border_width_right = 1

godot/assets/meat_bore/level.tscn

@@ -0,0 +1,74 @@
+[gd_scene load_steps=14 format=2]
+
+[ext_resource path="res://assets/meat_bore/meat_tunnel_top.tscn" type="PackedScene" id=1]
+[ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=2]
+[ext_resource path="res://player/player.tscn" type="PackedScene" id=3]
+[ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=4]
+[ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=5]
+[ext_resource path="res://assets/Starbox3.png" type="Texture" id=6]
+[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_3.png" type="Texture" id=7]
+[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_5.png" type="Texture" id=8]
+[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_1.png" type="Texture" id=9]
+[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_2.png" type="Texture" id=10]
+[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_4.png" type="Texture" id=11]
+
+[sub_resource type="PanoramaSky" id=2]
+panorama = ExtResource( 6 )
+
+[sub_resource type="Environment" id=3]
+background_mode = 2
+background_sky = SubResource( 2 )
+ambient_light_color = Color( 0.329412, 0.231373, 0.231373, 1 )
+ambient_light_energy = 1.5
+ambient_light_sky_contribution = 0.0
+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
+fog_depth_end = 73.5
+fog_depth_curve = 0.933033
+fog_transmit_enabled = true
+fog_transmit_curve = 1.03526
+auto_exposure_min_luma = 0.58
+auto_exposure_max_luma = 4.5
+auto_exposure_speed = 0.63
+ssao_enabled = true
+ssao_radius2 = 2.0
+ssao_bias = 0.05
+dof_blur_far_distance = 5.0
+dof_blur_near_enabled = true
+dof_blur_near_distance = 1.33
+dof_blur_near_amount = 0.66
+dof_blur_near_quality = 2
+glow_enabled = true
+glow_bloom = 1.0
+
+[node name="bore_level" type="Spatial"]
+
+[node name="meat_tunnel_top" parent="." instance=ExtResource( 1 )]
+
+[node name="meat_module_1" parent="." instance=ExtResource( 2 )]
+texture = ExtResource( 9 )
+
+[node name="meat_module_2" parent="." instance=ExtResource( 2 )]
+transform = Transform( 0.742409, 0, 0.669947, 0, 1, 0, -0.669947, 0, 0.742409, 0, -114.811, 0 )
+texture = ExtResource( 10 )
+
+[node name="meat_module_3" parent="." instance=ExtResource( 2 )]
+transform = Transform( -0.341905, 0, -0.939734, 0, 1, 0, 0.939734, 0, -0.341905, 0, -229.622, 0 )
+texture = ExtResource( 7 )
+
+[node name="meat_module_4" parent="." instance=ExtResource( 2 )]
+transform = Transform( 0.882693, 0, 0.469949, 0, 1, 0, -0.469949, 0, 0.882693, 0, -344.433, 0 )
+texture = ExtResource( 11 )
+
+[node name="meat_module_5" parent="." instance=ExtResource( 2 )]
+transform = Transform( -0.968942, 0, 0.247287, 0, 1, 0, -0.247287, 0, -0.968942, 0, -459.244, 0 )
+texture = ExtResource( 8 )
+
+[node name="Player" parent="." instance=ExtResource( 3 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 21.3374, 30.1915 )
+
+[node name="shader" parent="." instance=ExtResource( 5 )]
+
+[node name="LessFogWorldEnvironment" parent="." instance=ExtResource( 4 )]
+environment = SubResource( 3 )

godot/assets/meat_bore/meat_module/AnimationPlayer.gd

@@ -0,0 +1,12 @@
+extends AnimationPlayer
+
+var reversed = false
+
+
+
+func _on_AnimationPlayer_animation_finished(_anim_name):
+	if not reversed:
+		play_backwards("PulsateAction")
+	else:
+		play("PulsateAction")
+	reversed = not reversed

godot/assets/meat_bore/meat_module/MeatCubby.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/MeatCubby.png-d62bac7c6ef41570b23b2971f1055a9e.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/meat_bore/meat_module/MeatCubby.png"
+dest_files=[ "res://.import/MeatCubby.png-d62bac7c6ef41570b23b2971f1055a9e.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

godot/assets/meat_bore/meat_module/meat_module.gd

@@ -0,0 +1,7 @@
+extends Spatial
+
+export var texture: StreamTexture
+
+func _ready():
+	var mat = $MeatModule.get_active_material(0)
+	mat.albedo_texture = texture

godot/assets/meat_bore/meat_module/meat_module_outside_walls_1.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/meat_module_outside_walls_1.png-b4b03ac874c4559e11213303b1e81a14.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/meat_bore/meat_module/meat_module_outside_walls_1.png"
+dest_files=[ "res://.import/meat_module_outside_walls_1.png-b4b03ac874c4559e11213303b1e81a14.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

godot/assets/meat_bore/meat_module/meat_module_outside_walls_2.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/meat_module_outside_walls_2.png-20ce7f6df4c6dc4e2e31755d9f1b00fc.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/meat_bore/meat_module/meat_module_outside_walls_2.png"
+dest_files=[ "res://.import/meat_module_outside_walls_2.png-20ce7f6df4c6dc4e2e31755d9f1b00fc.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

godot/assets/meat_bore/meat_module/meat_module_outside_walls_3.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/meat_module_outside_walls_3.png-afa20787fd403d8a524faaff2cf83d21.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/meat_bore/meat_module/meat_module_outside_walls_3.png"
+dest_files=[ "res://.import/meat_module_outside_walls_3.png-afa20787fd403d8a524faaff2cf83d21.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

godot/assets/meat_bore/meat_module/meat_module_outside_walls_4.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/meat_module_outside_walls_4.png-1175f9e1217f0e17d3fdd165a9e0209b.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/meat_bore/meat_module/meat_module_outside_walls_4.png"
+dest_files=[ "res://.import/meat_module_outside_walls_4.png-1175f9e1217f0e17d3fdd165a9e0209b.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

godot/assets/meat_bore/meat_module/meat_module_outside_walls_5.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/meat_module_outside_walls_5.png-dfd65ea722db25b06f0543d428a83230.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/meat_bore/meat_module/meat_module_outside_walls_5.png"
+dest_files=[ "res://.import/meat_module_outside_walls_5.png-dfd65ea722db25b06f0543d428a83230.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