tweaks to mac 10 and gun look control
This commit is contained in:
@@ -748,7 +748,7 @@ audio_empty = NodePath("Audio/Empty")
|
||||
audio_reload = NodePath("Audio/Reload")
|
||||
|
||||
[node name="mac10" type="MeshInstance3D" parent="."]
|
||||
transform = Transform3D(0.00547455, 0.00277349, -0.299937, -0.0256886, 0.298889, 0.00229492, 0.298848, 0.0256413, 0.00569177, -0.0109618, 0.0121364, 9.31208e-05)
|
||||
transform = Transform3D(0.00547455, 0.00277349, -0.299937, -0.0256886, 0.298889, 0.00229493, 0.298848, 0.0256413, 0.00569177, -0.0109618, 0.0121364, 9.31208e-05)
|
||||
cast_shadow = 0
|
||||
lod_bias = 10.0
|
||||
mesh = SubResource("ArrayMesh_pcg38")
|
||||
|
||||
@@ -223,7 +223,7 @@ collision_mask = 105
|
||||
collide_with_areas = true
|
||||
|
||||
[node name="GunLookTarget" type="Marker3D" parent="Head/Recoil/Camera3D/BulletRay"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.265447, 0, -4.48192)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -4.482)
|
||||
|
||||
[node name="InteractRay" type="RayCast3D" parent="Head/Recoil/Camera3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.00322104, -0.0232438)
|
||||
|
||||
@@ -41,4 +41,4 @@ func load_leaderboard_data():
|
||||
print("Failed to load document from Firebase")
|
||||
|
||||
func get_leaderboard_name():
|
||||
return "leaderboard_" + str(GameGlobals.all_user_leaderboards[GameGlobals.user_id][GameGlobals.last_leaderboard_id])
|
||||
return str(GameGlobals.all_user_leaderboards[GameGlobals.user_id][GameGlobals.last_leaderboard_id]) + "_leaderboard"
|
||||
|
||||
@@ -697,6 +697,7 @@ func weapon_tilt(input_x, delta):
|
||||
|
||||
func weapon_sway(delta):
|
||||
#aim gun at center screen
|
||||
if gun != null:
|
||||
if !gun_ray.is_colliding():
|
||||
gun.look_at(gun_look_target.global_position)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user