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

godot/.import/Heart_2.glb-1725b18ca310ad3324df496e43af6bbd.md5

@@ -0,0 +1,3 @@
+source_md5="469c217f128d2b835afe54e6eb3cd0c8"
+dest_md5="3bc37244acb0230b3e711804f1024913"
+

godot/.import/Heart_2.glb-63ab69fd6bf08b83a5d078f7bc79f3e2.md5

@@ -0,0 +1,3 @@
+source_md5="469c217f128d2b835afe54e6eb3cd0c8"
+dest_md5="bcda562cabd89c359ac0285061e5e9f9"
+

godot/assets/meat_bore/level.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=2]
+[gd_scene load_steps=15 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/level_wally.tscn" type="PackedScene" id=2]
@@ -10,6 +10,7 @@
 [ext_resource path="res://assets/meat_bore/meat_module/level_alexis.tscn" type="PackedScene" id=8]
 [ext_resource path="res://assets/meat_bore/meat_module/level_lee.tscn" type="PackedScene" id=9]
 [ext_resource path="res://assets/meat_bore/meat_module/level_jackie.tscn" type="PackedScene" id=10]
+[ext_resource path="res://assets/models/heart/Heart_2.tscn" type="PackedScene" id=11]
 [ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=12]
 [ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=13]
 
@@ -125,3 +126,6 @@ transform = Transform( -0.452271, 0.189509, 0.236865, -0.0433815, 0.487985, -0.3
 [node name="level_jackie" parent="." instance=ExtResource( 10 )]
 
 [node name="MeatSinkParameters" parent="." instance=ExtResource( 6 )]
+
+[node name="Heart_2" parent="." instance=ExtResource( 11 )]
+transform = Transform( -95.0824, 0, 30.9731, 0, 100, 0, -30.9731, 0, -95.0824, 0.00217056, 31.5978, 83.3354 )

godot/assets/models/Heart_2.tscn

@@ -0,0 +1,10 @@
+[gd_scene format=2]
+
+[node name="Heart_2"]
+
+[node name="Heart" parent="." index="0"]
+blend_shapes/bulge1 = 0.789501
+blend_shapes/bulge2 = 0.210499
+
+[node name="AnimationPlayer" parent="." index="1"]
+autoplay = "HeartBeat"

godot/assets/models/heart/Heart_2.tscn

@@ -0,0 +1,43 @@
+[gd_scene load_steps=9 format=2]
+
+[ext_resource path="res://assets/models/heart/Heart_2.glb" type="PackedScene" id=1]
+[ext_resource path="res://assets/audio/ambient_heartbeat.ogg" type="AudioStream" id=2]
+
+[sub_resource type="AnimationNodeAnimation" id=1]
+animation = "HeartBeat"
+
+[sub_resource type="AnimationNodeAnimation" id=2]
+animation = "HeartBeat"
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=3]
+switch_mode = 2
+auto_advance = true
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=4]
+switch_mode = 2
+auto_advance = true
+
+[sub_resource type="AnimationNodeStateMachine" id=5]
+states/HeartBeat/node = SubResource( 2 )
+states/HeartBeat/position = Vector2( 586, 124 )
+"states/HeartBeat 2/node" = SubResource( 1 )
+"states/HeartBeat 2/position" = Vector2( 809, 124 )
+transitions = [ "HeartBeat", "HeartBeat 2", SubResource( 3 ), "HeartBeat 2", "HeartBeat", SubResource( 4 ) ]
+start_node = "HeartBeat"
+
+[sub_resource type="AnimationNodeStateMachinePlayback" id=6]
+
+[node name="Heart_2" instance=ExtResource( 1 )]
+
+[node name="Heart" parent="." index="0"]
+blend_shapes/bulge1 = 0.56232
+blend_shapes/bulge2 = 0.43768
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="AnimationPlayer" index="0"]
+stream = ExtResource( 2 )
+
+[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
+tree_root = SubResource( 5 )
+anim_player = NodePath("../AnimationPlayer")
+active = true
+parameters/playback = SubResource( 6 )

godot/player/HighSpeedFOV.gd

@@ -6,7 +6,7 @@ var has_played = false
 
 func _process(_delta):
 	if OnFootPhysics.is_falling_terminally:
-		if has_played:
+		if not has_played:
 			$FOVAnimation.play("fov")
 			has_played = true
 		return

godot/player/player.tscn

@@ -40,7 +40,7 @@ tracks/0/keys = {
 
 [sub_resource type="Animation" id=9]
 resource_name = "fov"
-length = 3.0
+length = 10.0
 step = 0.061
 tracks/0/type = "value"
 tracks/0/path = NodePath("..:fov")
@@ -49,7 +49,7 @@ tracks/0/loop_wrap = true
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/keys = {
-"times": PoolRealArray( 0, 0.549, 2.928 ),
+"times": PoolRealArray( 0, 0.549, 5.002 ),
 "transitions": PoolRealArray( 1, 1, 1 ),
 "update": 0,
 "values": [ 70.0, 70.0, 130.0 ]