Skip to content

Commit bd457e3

Browse files
authored
Improve Main Menu options and fix misc bugs (godotengine#166)
1 parent bb833aa commit bd457e3

38 files changed

+278
-226
lines changed

‎default_env.tres‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎door/model/door.dae.import‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/door.dae-7f8548364364a8c72d317db0aac6a97d.scn
1313

1414
[params]
1515

16-
nodes/root_type="Spatial"
16+
nodes/root_type="Node3D"
1717
nodes/root_name="DoorModel"
1818
nodes/apply_root_scale=true
1919
nodes/root_scale=1.0

‎effects_shared/BlastMesh.glb.import‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/BlastMesh.glb-b73267f06de3a944c01538e9fdef259
1313

1414
[params]
1515

16-
nodes/root_type="Spatial"
16+
nodes/root_type="Node3D"
1717
nodes/root_name="Scene Root"
1818
nodes/apply_root_scale=true
1919
nodes/root_scale=1.0

‎enemies/red_robot/laser/BarrelSmoke.glb.import‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/BarrelSmoke.glb-8e2d69c4951af8065240d2d52c721
1313

1414
[params]
1515

16-
nodes/root_type="Spatial"
16+
nodes/root_type="Node3D"
1717
nodes/root_name="Scene Root"
1818
nodes/apply_root_scale=true
1919
nodes/root_scale=1.0

‎enemies/red_robot/laser/impact_effect/LightRaysMesh.glb.import‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/LightRaysMesh.glb-7064e2802466cd2578058f8b016
1313

1414
[params]
1515

16-
nodes/root_type="Spatial"
16+
nodes/root_type="Node3D"
1717
nodes/root_name="Scene Root"
1818
nodes/apply_root_scale=true
1919
nodes/root_scale=1.0

‎enemies/red_robot/parts/part_head.glb.import‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/part_head.glb-8de207327aec4b1572370054a7354cf
1313

1414
[params]
1515

16-
nodes/root_type="Spatial"
16+
nodes/root_type="Node3D"
1717
nodes/root_name="Scene Root"
1818
nodes/apply_root_scale=true
1919
nodes/root_scale=1.0

‎enemies/red_robot/parts/part_shield.glb.import‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/part_shield.glb-d6c233d3d85ae961b022dca28194d
1313

1414
[params]
1515

16-
nodes/root_type="Spatial"
16+
nodes/root_type="Node3D"
1717
nodes/root_name="Scene Root"
1818
nodes/apply_root_scale=true
1919
nodes/root_scale=1.0

‎enemies/red_robot/parts/ray.glb.import‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/ray.glb-8e1d5bd28d6e0c01a107a5b661f05121.scn"
1313

1414
[params]
1515

16-
nodes/root_type="Spatial"
16+
nodes/root_type="Node3D"
1717
nodes/root_name="Scene Root"
1818
nodes/apply_root_scale=true
1919
nodes/root_scale=1.0

‎enemies/red_robot/parts/sparks_effect/SparkParticle.glb.import‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/SparkParticle.glb-e3f6706407f31f2c4028af0147b
1313

1414
[params]
1515

16-
nodes/root_type="Spatial"
16+
nodes/root_type="Node3D"
1717
nodes/root_name="Scene Root"
1818
nodes/apply_root_scale=true
1919
nodes/root_scale=1.0

‎enemies/red_robot/red_robot.gd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func animate(delta:=0.0):
150150
if target_position != Vector3.ZERO:
151151
animation_tree["parameters/aiming/blend_amount"] = clamp(aim_preparing / AIM_PREPARE_TIME, 0, 1)
152152

153-
var to_cannon_local = target_position + Vector3.UP * ray_mesh.global_transform
153+
var to_cannon_local = (target_position + Vector3.UP) * ray_mesh.global_transform
154154
var h_angle = rad_to_deg(atan2( to_cannon_local.x, -to_cannon_local.z ))
155155
var v_angle = rad_to_deg(atan2( to_cannon_local.y, -to_cannon_local.z ))
156156
var blend_pos = animation_tree.get("parameters/aim/blend_position")

0 commit comments

Comments
 (0)