Skip to content

Commit a53108a

Browse files
authored
Merge pull request #95 from aaronfranke/update-3.2.4
Update to Godot 3.3
2 parents 4515405 + 4bf5191 commit a53108a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+10306
-10289
lines changed

door/door.tscn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ unit_size = 7.0
3232
[node name="CollisionShape" type="CollisionShape" parent="."]
3333
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.55109, 0 )
3434
shape = SubResource( 1 )
35+
3536
[connection signal="body_entered" from="." to="." method="_on_door_body_entered"]
3637

3738
[editable path="DoorModel"]

effects_shared/BlastMesh.mesh

1.38 KB
Binary file not shown.

enemies/red_robot/laser/BarrelSmoke.tres

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
[gd_resource type="ArrayMesh" format=2]
1+
[gd_resource type="ArrayMesh" load_steps=2 format=2]
2+
3+
[sub_resource type="SpatialMaterial" id=1]
4+
vertex_color_use_as_albedo = true
25

36
[resource]
47
resource_name = "BarrelSmoke"
@@ -9,6 +12,7 @@ surfaces/0 = {
912
"blend_shape_data": [ ],
1013
"format": 97559,
1114
"index_count": 288,
15+
"material": SubResource( 1 ),
1216
"primitive": 4,
1317
"skeleton_aabb": [ ],
1418
"vertex_count": 79

enemies/red_robot/laser/impact_effect/Plane.tres

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
[gd_resource type="ArrayMesh" format=2]
1+
[gd_resource type="ArrayMesh" load_steps=2 format=2]
2+
3+
[sub_resource type="SpatialMaterial" id=1]
4+
vertex_color_use_as_albedo = true
25

36
[resource]
47
resource_name = "Plane"
@@ -9,6 +12,7 @@ surfaces/0 = {
912
"blend_shape_data": [ ],
1013
"format": 97559,
1114
"index_count": 6,
15+
"material": SubResource( 1 ),
1216
"primitive": 4,
1317
"skeleton_aabb": [ ],
1418
"vertex_count": 4
Binary file not shown.

enemies/red_robot/red_robot.tscn

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ nodes/hit3/position = Vector2( 980, 240 )
400400
nodes/output/position = Vector2( 1180, 200 )
401401
nodes/state/node = SubResource( 51 )
402402
nodes/state/position = Vector2( 60, 100 )
403-
node_connections = [ "output", 0, "hit3", "state", 0, "Animation", "state", 1, "Animation 3", "state", 2, "Animation 2", "state", 3, "Animation 4", "aiming", 0, "state", "aiming", 1, "aim", "hit1", 0, "aiming", "hit1", 1, "Animation 5", "hit2", 0, "hit1", "hit2", 1, "Animation 6", "hit3", 0, "hit2", "hit3", 1, "Animation 7" ]
403+
node_connections = [ "state", 0, "Animation", "state", 1, "Animation 3", "state", 2, "Animation 2", "state", 3, "Animation 4", "output", 0, "hit3", "aiming", 0, "state", "aiming", 1, "aim", "hit1", 0, "aiming", "hit1", 1, "Animation 5", "hit2", 0, "hit1", "hit2", 1, "Animation 6", "hit3", 0, "hit2", "hit3", 1, "Animation 7" ]
404404

405405
[sub_resource type="SphereShape" id=53]
406406
radius = 1.11815
@@ -771,7 +771,7 @@ script = ExtResource( 1 )
771771
bones/14/bound_children = [ NodePath("RayFrom") ]
772772

773773
[node name="RayFrom" type="BoneAttachment" parent="RedRobotModel/Armature/Skeleton" index="4"]
774-
transform = Transform( -0.999109, -5.97867e-05, 0.0422096, 0.00546806, 0.991389, 0.130834, -0.041854, 0.130948, -0.990505, -0.0813368, 1.99566, 0.277505 )
774+
transform = Transform( -0.997439, -0.070985, -0.00878045, -0.0710157, 0.99747, 0.00323016, 0.00852894, 0.00384544, -0.999956, -0.149183, 1.9902, 0.191941 )
775775
bone_name = "CannonAnimRecoil"
776776

777777
[node name="Circle" type="MeshInstance" parent="RedRobotModel/Armature/Skeleton/RayFrom"]
@@ -1105,6 +1105,7 @@ unit_size = 15.0
11051105
stream = ExtResource( 19 )
11061106
unit_db = 3.0
11071107
unit_size = 15.0
1108+
11081109
[connection signal="body_entered" from="PlayerDetectionArea" to="." method="_on_area_body_entered"]
11091110
[connection signal="body_exited" from="PlayerDetectionArea" to="." method="_on_area_body_exited"]
11101111

menu/menu.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,7 @@ transform = Transform( -1, 8.4334e-08, 3.14739e-07, 0, 0.965926, -0.258819, -3.2
652652

653653
[node name="ExplosionAudio" parent="BackgroundCache/Bullet" index="4"]
654654
unit_db = -80.0
655+
655656
[connection signal="pressed" from="UI/Main/Play" to="." method="_on_play_pressed"]
656657
[connection signal="pressed" from="UI/Main/Settings" to="." method="_on_settings_pressed"]
657658
[connection signal="pressed" from="UI/Main/Quit" to="." method="_on_quit_pressed"]
@@ -660,5 +661,4 @@ unit_db = -80.0
660661
[connection signal="timeout" from="UI/Loading/DoneTimer" to="." method="_on_loading_done_timer_timeout"]
661662

662663
[editable path="PlayerModel"]
663-
664664
[editable path="BackgroundCache/Bullet"]

0 commit comments

Comments
 (0)