sjkillen/meat_madness_redux
sjkillen
/
meat_madness_redux
1
0
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'spencer'

This commit is contained in:
Spencer Killen 2023-01-04 13:39:37 -07:00
parent 16e10fd007 ea7726efdc
commit 4b39437d36
Signed by: sjkillen
GPG Key ID: F307025B65C860BA
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
godot/effects/elevator.tscn
View File

@ -50,6 +50,9 @@ vertex_animation_name = "Key009Action001"
vertex_animation_path = NodePath("../../meat_elevator/MeatElevator/AnimationPlayer")
playback_speed = 0.5
[node name="ElevatorGrip" parent="meat_elevator_tracker/MeatElevatorTracker" index="1"]
transform = Transform( 1, 0, 0, 0, 5.091, 0, 0, 0, 1, 0, 0, 0 )
[node name="TunnelBlockerUpper" type="StaticBody" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.28918, 0 )

6
godot/player/player.tscn
View File

@ -73,7 +73,7 @@ tracks/0/keys = {
"values": [ 0.5, 3.0 ]
}
[sub_resource type="SphereShape" id=5]
[sub_resource type="CylinderShape" id=16]
[sub_resource type="Animation" id=10]
length = 0.001
@ -240,8 +240,8 @@ script = ExtResource( 7 )
[node name="Area" type="Area" parent="ElevatorPhysics"]
[node name="CollisionShape" type="CollisionShape" parent="ElevatorPhysics/Area"]
transform = Transform( 0.325, 0, 0, 0, 0.78, 0, 0, 0, 0.325, 0.0029822, 0.0328078, -0.000828505 )
shape = SubResource( 5 )
transform = Transform( 0.325, 0, 0, 0, 0.682, 0, 0, 0, 0.325, 0.0029822, 0.0328078, -0.000828505 )
shape = SubResource( 16 )
[node name="MovementInput" type="Node" parent="."]
script = ExtResource( 4 )