Update to Godot 3.3

godotengine · Apr 21, 2021 · 4bf5191 · 4bf5191
1 parent 4515405
commit 4bf5191
Show file tree

Hide file tree

Showing 65 changed files with 10,306 additions and 10,289 deletions.
diff --git a/door/door.tscn b/door/door.tscn
@@ -32,6 +32,7 @@ unit_size = 7.0
 [node name="CollisionShape" type="CollisionShape" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.55109, 0 )
 shape = SubResource( 1 )
+
 [connection signal="body_entered" from="." to="." method="_on_door_body_entered"]
 
 [editable path="DoorModel"]
diff --git a/effects_shared/BlastMesh.mesh b/effects_shared/BlastMesh.mesh
diff --git a/enemies/red_robot/laser/BarrelSmoke.tres b/enemies/red_robot/laser/BarrelSmoke.tres
@@ -1,4 +1,7 @@
-[gd_resource type="ArrayMesh" format=2]
+[gd_resource type="ArrayMesh" load_steps=2 format=2]
+
+[sub_resource type="SpatialMaterial" id=1]
+vertex_color_use_as_albedo = true
 
 [resource]
 resource_name = "BarrelSmoke"
@@ -9,6 +12,7 @@ surfaces/0 = {
 "blend_shape_data": [  ],
 "format": 97559,
 "index_count": 288,
+"material": SubResource( 1 ),
 "primitive": 4,
 "skeleton_aabb": [  ],
 "vertex_count": 79

diff --git a/enemies/red_robot/laser/impact_effect/Plane.tres b/enemies/red_robot/laser/impact_effect/Plane.tres
@@ -1,4 +1,7 @@
-[gd_resource type="ArrayMesh" format=2]
+[gd_resource type="ArrayMesh" load_steps=2 format=2]
+
+[sub_resource type="SpatialMaterial" id=1]
+vertex_color_use_as_albedo = true
 
 [resource]
 resource_name = "Plane"
@@ -9,6 +12,7 @@ surfaces/0 = {
 "blend_shape_data": [  ],
 "format": 97559,
 "index_count": 6,
+"material": SubResource( 1 ),
 "primitive": 4,
 "skeleton_aabb": [  ],
 "vertex_count": 4

diff --git a/enemies/red_robot/parts/sparks_effect/SparkParticle.mesh b/enemies/red_robot/parts/sparks_effect/SparkParticle.mesh
diff --git a/enemies/red_robot/red_robot.tscn b/enemies/red_robot/red_robot.tscn
@@ -400,7 +400,7 @@ nodes/hit3/position = Vector2( 980, 240 )
 nodes/output/position = Vector2( 1180, 200 )
 nodes/state/node = SubResource( 51 )
 nodes/state/position = Vector2( 60, 100 )
-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" ]
+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" ]
 
 [sub_resource type="SphereShape" id=53]
 radius = 1.11815
@@ -771,7 +771,7 @@ script = ExtResource( 1 )
 bones/14/bound_children = [ NodePath("RayFrom") ]
 
 [node name="RayFrom" type="BoneAttachment" parent="RedRobotModel/Armature/Skeleton" index="4"]
-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 )
+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 )
 bone_name = "CannonAnimRecoil"
 
 [node name="Circle" type="MeshInstance" parent="RedRobotModel/Armature/Skeleton/RayFrom"]
@@ -1105,6 +1105,7 @@ unit_size = 15.0
 stream = ExtResource( 19 )
 unit_db = 3.0
 unit_size = 15.0
+
 [connection signal="body_entered" from="PlayerDetectionArea" to="." method="_on_area_body_entered"]
 [connection signal="body_exited" from="PlayerDetectionArea" to="." method="_on_area_body_exited"]
 

diff --git a/menu/menu.tscn b/menu/menu.tscn
@@ -652,6 +652,7 @@ transform = Transform( -1, 8.4334e-08, 3.14739e-07, 0, 0.965926, -0.258819, -3.2
 
 [node name="ExplosionAudio" parent="BackgroundCache/Bullet" index="4"]
 unit_db = -80.0
+
 [connection signal="pressed" from="UI/Main/Play" to="." method="_on_play_pressed"]
 [connection signal="pressed" from="UI/Main/Settings" to="." method="_on_settings_pressed"]
 [connection signal="pressed" from="UI/Main/Quit" to="." method="_on_quit_pressed"]
@@ -660,5 +661,4 @@ unit_db = -80.0
 [connection signal="timeout" from="UI/Loading/DoneTimer" to="." method="_on_loading_done_timer_timeout"]
 
 [editable path="PlayerModel"]
-
 [editable path="BackgroundCache/Bullet"]