Compare commits

..

No commits in common. "436c92952478eb74a1cc7e471f66516292e46af7" and "1f0663f39d317679879364e2ab44f164ec523551" have entirely different histories.

8 changed files with 2 additions and 1146 deletions

View File

@ -1,3 +0,0 @@
source_md5="57b9277936600220511e8c7776e2dc33"
dest_md5="c55ef2bf8ce71022b526aaaa7f3a30da"

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=25 format=2]
[gd_scene load_steps=24 format=2]
[ext_resource path="res://assets/meat_creek/side_tunnel_1.glb" type="PackedScene" id=1]
[ext_resource path="res://player/player.tscn" type="PackedScene" id=2]
@ -20,7 +20,6 @@
[ext_resource path="res://assets/meat_creek/WhaleSounds.gd" type="Script" id=18]
[ext_resource path="res://assets/models/black_box/black_box.tscn" type="PackedScene" id=19]
[ext_resource path="res://assets/models/obelisk/obelisk.tscn" type="PackedScene" id=20]
[ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=21]
[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=400]
[sub_resource type="PanoramaSky" id=2]
@ -143,9 +142,6 @@ transform = Transform( 0.709009, -0.431706, -0.557617, 0.357585, 0.711878, -0.09
[node name="meat_tentacle3" parent="decorations" index="2" instance=ExtResource( 400 )]
transform = Transform( -0.0265356, -0.362184, -1.17042, 0, 1.26435, -0.335417, 1.29597, -0.00741591, -0.023965, -62.359, 0.919437, -93.1787 )
[node name="meat_tentacle_small" parent="decorations" index="3" instance=ExtResource( 21 )]
transform = Transform( -0.465289, 0, 0.263226, 0, 0.641959, 0, -0.283901, 0, -0.501833, -63.3223, 0, -95.7911 )
[node name="shader" parent="." index="7" instance=ExtResource( 7 )]
[node name="creek_cage" parent="." index="8" instance=ExtResource( 9 )]

View File

@ -69,5 +69,5 @@ script = ExtResource( 3 )
transform = Transform( 1.29603, 0.396787, 0.0456263, -0.180669, 2.84635, 0.327301, 0, -0.581511, 1.63319, -0.459882, 0, -0.0209413 )
[node name="CollisionShape" type="CollisionShape" parent="StaticBody" index="0"]
transform = Transform( 0.222041, 0.00571365, -0.0496885, -0.032101, 0.0306116, -0.539539, -0.0114299, 0.284227, -0.0947877, 0.181285, 0.638165, 0.185954 )
transform = Transform( 0.222041, 0.00571365, -0.0496885, -0.0321011, 0.0306116, -0.539539, -0.0114299, 0.284227, -0.0947877, 0.181285, 0.638165, 0.185954 )
shape = SubResource( 1 )

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -1,69 +0,0 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://assets/models/meat_tentacle_small.glb" type="PackedScene" id=1]
[ext_resource path="res://assets/models/MeatElevatorEntrance.material" type="Material" id=2]
[ext_resource path="res://assets/models/AnimationPlayer.gd" type="Script" id=3]
[sub_resource type="Animation" id=3]
resource_name = "ArmatureAction-loop"
length = 3.0
loop = true
tracks/0/type = "transform"
tracks/0/path = NodePath("Armature/Skeleton:Bone.003")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = PoolRealArray( 0, 1, 0, 0, 0, 1.49012e-08, -7.45058e-09, 1.49012e-08, 1, 1, 1, 1, 0.0666667, 1, 1.49012e-08, -2.98023e-08, -1.19209e-07, -9.81732e-05, 0.0052858, 0.00109726, 0.999986, 1, 1, 1, 0.133333, 1, -1.49012e-08, 2.98023e-08, -1.19209e-07, -0.000298331, 0.0190093, 0.00408248, 0.999811, 1, 1, 1, 0.2, 1, 0, -2.98023e-08, -2.38419e-07, -0.000560188, 0.0410555, 0.00902754, 0.999116, 1, 1, 1, 0.333333, 1, -7.45058e-08, 2.98023e-08, 0, -0.00130106, 0.106409, 0.0237738, 0.994037, 1, 1, 1, 0.533333, 1, -1.49012e-08, -8.9407e-08, -2.38419e-07, -0.00391489, 0.245193, 0.0524962, 0.968044, 1, 1, 1, 0.733333, 1, -2.98023e-08, -2.98023e-08, -1.19209e-07, -0.0107686, 0.402299, 0.0753062, 0.912342, 1, 1, 1, 0.866667, 1, 4.47035e-08, -8.9407e-08, -5.96046e-08, -0.0194034, 0.498568, 0.0782339, 0.863095, 1, 1, 1, 0.933333, 1, 4.47035e-08, 2.98023e-08, -1.19209e-07, -0.025484, 0.540771, 0.0737985, 0.837539, 1, 1, 1, 1, 1, 0, 0, -1.19209e-07, -0.0329392, 0.578466, 0.0647944, 0.812461, 1, 1, 1, 1.06667, 1, -5.96046e-08, 2.98023e-08, -1.19209e-07, -0.0424528, 0.610784, 0.0492959, 0.78912, 1, 1, 1, 1.13333, 1, 2.98023e-08, 5.96046e-08, -1.19209e-07, -0.0543802, 0.638331, 0.026573, 0.767379, 1, 1, 1, 1.2, 1, 7.45058e-08, 0, -1.19209e-07, -0.0702922, 0.661238, -0.00725605, 0.746841, 1, 1, 1, 1.26667, 1, 0, 0, -1.19209e-07, -0.0938105, 0.68069, -0.0603645, 0.724028, 1, 1, 1, 1.33333, 1, -7.45058e-08, -5.96046e-08, -2.38419e-07, -0.118392, 0.689965, -0.114303, 0.704887, 1, 1, 1, 1.4, 1, 4.47035e-08, 0, 0, -0.138172, 0.685095, -0.151973, 0.698898, 1, 1, 1, 1.46667, 1, -8.9407e-08, 0, -2.38419e-07, -0.155162, 0.670454, -0.177997, 0.703373, 1, 1, 1, 1.53333, 1, -1.49012e-08, 5.96046e-08, 0, -0.170153, 0.646526, -0.193024, 0.718188, 1, 1, 1, 1.6, 1, 1.49012e-08, -5.96046e-08, -1.19209e-07, -0.183981, 0.613799, -0.198244, 0.741688, 1, 1, 1, 1.66667, 1, 0, 0, 0, -0.197156, 0.572872, -0.194973, 0.771319, 1, 1, 1, 1.73333, 1, -2.98023e-08, -5.96046e-08, -2.38419e-07, -0.194495, 0.529585, -0.189912, 0.80352, 1, 1, 1, 1.8, 1, -5.96046e-08, -8.9407e-08, -2.38419e-07, -0.170829, 0.487046, -0.187371, 0.835761, 1, 1, 1, 1.86667, 1, -5.96046e-08, 2.98023e-08, 0, -0.146854, 0.435961, -0.177506, 0.869979, 1, 1, 1, 1.93333, 1, -1.49012e-08, 2.98023e-08, 0, -0.123589, 0.377734, -0.160942, 0.903405, 1, 1, 1, 2, 1, -2.98023e-08, -8.9407e-08, -1.19209e-07, -0.101992, 0.314683, -0.13901, 0.933407, 1, 1, 1, 2.13333, 1, 1.49012e-08, -2.98023e-08, 0, -0.069884, 0.186652, -0.0844935, 0.976288, 1, 1, 1, 2.2, 1, 1.49012e-08, 0, -1.19209e-07, -0.049725, 0.130466, -0.0601972, 0.988374, 1, 1, 1, 2.26667, 1, -1.49012e-08, 0, -1.19209e-07, -0.0279884, 0.0827915, -0.0399243, 0.995373, 1, 1, 1, 2.33333, 1, 5.96046e-08, 0, -1.19209e-07, -0.0135948, 0.0436046, -0.0217319, 0.99872, 1, 1, 1, 2.4, 1, -4.47035e-08, -5.96046e-08, -1.19209e-07, -0.00579953, 0.016805, -0.00834531, 0.999807, 1, 1, 1, 2.46667, 1, 7.45058e-08, 1.19209e-07, -5.96046e-08, 0.000143072, 0.00239365, -0.001462, 0.999996, 1, 1, 1, 2.5, 1, 4.47035e-08, 5.96046e-08, -1.19209e-07, -2.88658e-15, 4.47035e-08, 7.45058e-08, 1, 1, 1, 1, 3, 1, 0, 0, 0, 1.49012e-08, -7.45058e-09, 1.49012e-08, 1, 1, 1, 1 )
tracks/1/type = "transform"
tracks/1/path = NodePath("Armature/Skeleton:Bone.001")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = PoolRealArray( 0, 1, 0, 0, 0, -3.64292e-17, -9.31323e-10, -1.69966e-08, 1, 1, 1, 1, 0.0666667, 1, 0, 0, 1.49012e-08, 0.00605299, 0.000765066, 0.00323749, 0.999976, 1, 1, 1, 0.133333, 1, 0, 0, 7.45058e-09, 0.0213833, 0.00270277, 0.0114371, 0.999702, 1, 1, 1, 0.2, 1, 5.96046e-08, 0, -7.45058e-09, 0.0450922, 0.00569947, 0.0241179, 0.998675, 1, 1, 1, 0.466667, 1, 0, 0, 0, 0.183649, 0.0232125, 0.098226, 0.977796, 1, 1, 1, 0.666667, 1, 5.96046e-08, 0, 0, 0.276514, 0.0349502, 0.147895, 0.948918, 1, 1, 1, 0.733333, 1, 0, 0, 7.45058e-09, 0.294908, 0.0372751, 0.157733, 0.94168, 1, 1, 1, 0.8, 1, 0, 0, 0, 0.305116, 0.0385654, 0.163194, 0.937435, 1, 1, 1, 0.866667, 1, -5.96046e-08, -1.19209e-07, 2.23517e-08, 0.30636, 0.0387227, 0.163859, 0.936907, 1, 1, 1, 0.933333, 1, -5.96046e-08, -1.19209e-07, 2.23517e-08, 0.303687, 0.0383847, 0.162429, 0.938039, 1, 1, 1, 1, 1, 0, 0, 7.45058e-09, 0.298709, 0.0377556, 0.159767, 0.940118, 1, 1, 1, 1.06667, 1, 0, 0, 0, 0.291265, 0.0368146, 0.155785, 0.943155, 1, 1, 1, 1.2, 1, 5.96046e-08, 0, 1.49012e-08, 0.270586, 0.0342009, 0.144725, 0.951141, 1, 1, 1, 1.8, 1, 0, 0, 1.49012e-08, 0.118694, 0.0150024, 0.0634841, 0.990786, 1, 1, 1, 2.26667, 1, 0, 0, 1.49012e-08, 0.0165096, 0.00208674, 0.00883022, 0.999823, 1, 1, 1, 2.33333, 1, 5.96046e-08, 5.96046e-08, -7.45058e-09, 0.00860474, 0.00108759, 0.0046023, 0.999952, 1, 1, 1, 2.4, 1, 0, 0, 1.49012e-08, 0.00330433, 0.00041764, 0.0017674, 0.999993, 1, 1, 1, 2.46667, 1, 0, 0, 7.45058e-09, 0.00045256, 5.71996e-05, 0.000242049, 1, 1, 1, 1, 2.5, 1, 0, 0, 7.45058e-09, -2.23517e-08, -1.76951e-08, 3.49246e-10, 1, 1, 1, 1, 3, 1, 0, 0, 0, -3.64292e-17, -9.31323e-10, -1.69966e-08, 1, 1, 1, 1 )
tracks/2/type = "transform"
tracks/2/path = NodePath("Armature/Skeleton:Bone.002")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = PoolRealArray( 0, 1, 0, 0, 0, -5.37764e-17, -3.72529e-09, 9.31323e-10, 1, 1, 1, 1, 0.0666667, 1, 2.98023e-08, 0, -7.45058e-09, 0.0453506, 0.0370021, -0.0626852, 0.996316, 1, 1, 1, 0.133333, 1, 1.49012e-08, 1.19209e-07, -1.49012e-08, -0.00986027, -0.0023665, 0.00659993, 0.999927, 1, 1, 1, 0.2, 1, 1.49012e-08, 0, -1.49012e-08, 0.0172874, 0.0311202, -0.0451867, 0.998344, 1, 1, 1, 0.266667, 1, 1.49012e-08, 0, 0, 0.00339986, 0.0254191, -0.0332922, 0.999117, 1, 1, 1, 0.333333, 1, 1.49012e-08, 0, 0, 0.00270606, 0.0349959, -0.0456025, 0.998343, 1, 1, 1, 0.4, 1, 4.47035e-08, 0, 0, 0.00984021, 0.0569171, -0.076853, 0.995368, 1, 1, 1, 0.466667, 1, 4.47035e-08, 0, -7.45058e-09, 0.00483812, 0.0600395, -0.0802678, 0.994952, 1, 1, 1, 0.533333, 1, 2.98023e-08, 0, -7.45058e-09, 0.0104589, 0.0815394, -0.111638, 0.990343, 1, 1, 1, 0.666667, 1, 1.49012e-08, 0, -7.45058e-09, 0.0116983, 0.104921, -0.145378, 0.983728, 1, 1, 1, 0.733333, 1, 2.98023e-08, 0, -7.45058e-09, 0.0149343, 0.122223, -0.169727, 0.977769, 1, 1, 1, 0.8, 1, 4.47035e-08, 0, -7.45058e-09, 0.0157512, 0.133539, -0.184278, 0.973633, 1, 1, 1, 0.933333, 1, -1.49012e-08, 0, -7.45058e-09, 0.0200981, 0.162681, -0.21819, 0.962042, 1, 1, 1, 1, 1, 1.49012e-08, 0, -1.49012e-08, 0.021711, 0.175701, -0.229992, 0.956954, 1, 1, 1, 1.06667, 1, 1.49012e-08, 0, 0, 0.0238316, 0.190291, -0.241197, 0.951339, 1, 1, 1, 1.13333, 1, 2.98023e-08, 0, 0, 0.0254432, 0.203534, -0.247845, 0.946836, 1, 1, 1, 1.2, 1, 2.98023e-08, 0, -7.45058e-09, 0.0271986, 0.217495, -0.252129, 0.942543, 1, 1, 1, 1.26667, 1, 5.96046e-08, 0, 0, 0.0288715, 0.231609, -0.252795, 0.938945, 1, 1, 1, 1.33333, 1, -4.47035e-08, 0, -7.45058e-09, 0.0306992, 0.246787, -0.250544, 0.935618, 1, 1, 1, 1.4, 1, 1.49012e-08, 0, -1.49012e-08, 0.0324111, 0.262247, -0.243842, 0.933122, 1, 1, 1, 1.46667, 1, 1.49012e-08, 0, -7.45058e-09, 0.0340252, 0.277841, -0.233733, 0.931137, 1, 1, 1, 1.53333, 1, 1.49012e-08, 0, -7.45058e-09, 0.0355336, 0.293469, -0.220327, 0.929553, 1, 1, 1, 1.6, 1, 4.47035e-08, 0, 1.49012e-08, 0.036934, 0.30898, -0.204074, 0.928181, 1, 1, 1, 1.66667, 1, 4.47035e-08, 0, -7.45058e-09, 0.0382296, 0.324232, -0.185564, 0.926811, 1, 1, 1, 1.8, 1, 1.49012e-08, 0, 0, 0.0404599, 0.353221, -0.143051, 0.923653, 1, 1, 1, 2, 1, 1.49012e-08, 0, -7.45058e-09, 0.0428966, 0.390534, -0.0741096, 0.916597, 1, 1, 1, 2.26667, 1, 1.49012e-08, 0, -7.45058e-09, 0.0445335, 0.423218, 0.00311268, 0.904927, 1, 1, 1, 2.33333, 1, 0, 0, 0, 0.0447157, 0.427931, 0.0160912, 0.902561, 1, 1, 1, 2.4, 1, 1.49012e-08, 0, -7.45058e-09, 0.0448223, 0.431008, 0.0249842, 0.900888, 1, 1, 1, 2.46667, 1, 2.98023e-08, 0, -7.45058e-09, 0.0448738, 0.432633, 0.0298392, 0.899958, 1, 1, 1, 2.5, 1, 2.98023e-08, 0, -7.45058e-09, 0.0448813, 0.432888, 0.0306191, 0.899809, 1, 1, 1, 3, 1, 0, 0, 0, -5.37764e-17, -3.72529e-09, 9.31323e-10, 1, 1, 1, 1 )
tracks/3/type = "transform"
tracks/3/path = NodePath("Armature/Skeleton:Bone")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/keys = PoolRealArray( 0, 1, 0, 0, 0, 3.72529e-09, 8.69477e-10, 6.05223e-09, 1, 1, 1, 1, 0.0666667, 1, 0, 0, 0, 0.000179839, 0.00167736, 0.00149354, 0.999998, 1.00009, 1.0036, 1.00005, 0.133333, 1, 0, 0, 0, 0.000649567, 0.00591171, 0.00535104, 0.999968, 1.00032, 1.01291, 1.00018, 0.2, 1, 0, 0, 0, 0.00140416, 0.0123981, 0.0114586, 0.999857, 1.0007, 1.02772, 1.00038, 0.333333, 1, 0, 0, 0, 0.00361123, 0.02962, 0.028899, 0.999137, 1.00188, 1.07038, 1.00096, 0.466667, 1, 0, 0, 0, 0.00651272, 0.048619, 0.0512278, 0.997482, 1.00359, 1.12581, 1.00173, 0.533333, 1, 0, 0, 0, 0.00811361, 0.0573351, 0.0633968, 0.996307, 1.00463, 1.15634, 1.00215, 0.6, 1, 0, 0, 0, 0.0097558, 0.0647785, 0.0758639, 0.994964, 1.00576, 1.18777, 1.00259, 0.666667, 1, 0, 0, 0, 0.0113978, 0.0706102, 0.0883807, 0.993516, 1.00696, 1.2194, 1.00302, 0.733333, 1, 0, 0, 0, 0.0129872, 0.0740274, 0.100693, 0.992075, 1.0082, 1.25044, 1.00346, 0.8, 1, 0, 0, 0, 0.0144909, 0.0749359, 0.112617, 0.990703, 1.00946, 1.28027, 1.00387, 0.866667, 1, 0, 0, 0, 0.0158616, 0.0727174, 0.123931, 0.989496, 1.0107, 1.30811, 1.00427, 0.933333, 1, 0, 0, 0, 0.0170571, 0.0669046, 0.134422, 0.988516, 1.01187, 1.33321, 1.00462, 1, 1, 0, 0, 0, 0.0180554, 0.057383, 0.143972, 0.987752, 1.01295, 1.35516, 1.00494, 1.06667, 1, 0, 0, 0, 0.0187846, 0.0429933, 0.152175, 0.987239, 1.01387, 1.37267, 1.00521, 1.13333, 1, 0, 0, 0, 0.0192436, 0.0239239, 0.158962, 0.986807, 1.01461, 1.38569, 1.00541, 1.2, 1, 0, 0, 0, 0.0193787, -0.000749363, 0.163927, 0.986282, 1.01509, 1.3932, 1.00556, 1.26667, 1, 0, 0, 1.49012e-08, 0.0191524, -0.031321, 0.166654, 0.985332, 1.01526, 1.39451, 1.00563, 1.33333, 1, 0, 0, 1.49012e-08, 0.0185124, -0.0651589, 0.166903, 0.983644, 1.01511, 1.3899, 1.00564, 1.4, 1, 0, 0, 1.49012e-08, 0.0169758, -0.100029, 0.164238, 0.981189, 1.0146, 1.37907, 1.00554, 1.46667, 1, 0, 0, 1.49012e-08, 0.0139296, -0.127894, 0.158908, 0.978876, 1.01385, 1.36362, 1.00534, 1.53333, 1, 0, 0, 1.49012e-08, 0.00982419, -0.131012, 0.150431, 0.979852, 1.01287, 1.34384, 1.00498, 1.6, 1, 0, 0, 1.49012e-08, 0.00692527, -0.118517, 0.139694, 0.983052, 1.01171, 1.32038, 1.00457, 1.66667, 1, 0, 0, 1.49012e-08, 0.0050455, -0.104116, 0.127669, 0.986324, 1.01045, 1.29405, 1.00415, 1.73333, 1, 0, 0, 1.49012e-08, 0.00381459, -0.0908591, 0.114654, 0.989234, 1.00912, 1.26517, 1.00371, 1.86667, 1, 0, 0, 1.49012e-08, 0.00222466, -0.0679364, 0.0872471, 0.993865, 1.0065, 1.20343, 1.00282, 2.13333, 1, 0, 0, 1.49012e-08, 0.000723537, -0.0331329, 0.0352129, 0.99883, 1.00227, 1.08336, 1.00114, 2.26667, 1, 0, 0, 1.49012e-08, 0.000380598, -0.0195469, 0.0155093, 0.999689, 1.00094, 1.03697, 1.00051, 2.33333, 1, 0, 0, 1.49012e-08, 0.000272812, -0.0134486, 0.00816696, 0.999876, 1.00049, 1.01953, 1.00027, 2.4, 1, 0, 0, 1.49012e-08, 0.000208509, -0.00780699, 0.00316026, 0.999965, 1.00019, 1.00758, 1.0001, 2.46667, 1, 0, 0, 1.49012e-08, 0.000178669, -0.00251935, 0.000436169, 0.999997, 1.00003, 1.00105, 1.00001, 2.5, 1, 0, 0, 0, 0.000176687, 1.71556e-10, 1.35287e-08, 1, 1, 1, 1, 3, 1, 0, 0, 0, 3.72529e-09, 8.69477e-10, 6.05223e-09, 1, 1, 1, 1 )
tracks/4/type = "transform"
tracks/4/path = NodePath("Armature/Skeleton:Bone.017")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2.5, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 )
[sub_resource type="CapsuleShape" id=1]
radius = 0.997672
height = 0.947179
[node name="meat_tentacle_small" instance=ExtResource( 1 )]
[node name="Cone" parent="Armature/Skeleton" index="0"]
material_override = ExtResource( 2 )
material/0 = ExtResource( 2 )
[node name="AnimationPlayer" parent="." index="1"]
autoplay = "ArmatureAction-loop"
reset_on_save = false
playback_speed = 0.45
anims/ArmatureAction-loop = SubResource( 3 )
script = ExtResource( 3 )
[node name="StaticBody" type="StaticBody" parent="." index="2"]
transform = Transform( 1.30828, 0.0600859, 0.00690913, -0.0271908, 2.91994, 0.147704, -0.00302639, -0.260107, 1.65971, -0.459882, 0, -0.0209413 )
[node name="CollisionShape" type="CollisionShape" parent="StaticBody" index="0"]
transform = Transform( 0.222041, 0.00571365, -0.0496885, -0.032101, 0.0306116, -0.539539, -0.0114299, 0.284227, -0.0947877, 0.181285, 0.638165, 0.185954 )
shape = SubResource( 1 )