derekdz/fps_project_1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweaks to mac 10 and gun look control

Browse Source
This commit is contained in:
derek
2025-04-10 10:53:41 -05:00
parent 5d116b1a20
commit 65677d8d3a
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/mac_10.tscn
View File

@@ -748,7 +748,7 @@ audio_empty = NodePath("Audio/Empty")
audio_reload = NodePath("Audio/Reload") audio_reload = NodePath("Audio/Reload")
[node name="mac10" type="MeshInstance3D" parent="."] [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 cast_shadow = 0
lod_bias = 10.0 lod_bias = 10.0
mesh = SubResource("ArrayMesh_pcg38") mesh = SubResource("ArrayMesh_pcg38")

2
assets/player.tscn
View File

@@ -223,7 +223,7 @@ collision_mask = 105
collide_with_areas = true collide_with_areas = true
[node name="GunLookTarget" type="Marker3D" parent="Head/Recoil/Camera3D/BulletRay"] [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"] [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) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.00322104, -0.0232438)

2
scripts/leaderboard.gd
View File

@@ -41,4 +41,4 @@ func load_leaderboard_data():
print("Failed to load document from Firebase") print("Failed to load document from Firebase")
func get_leaderboard_name(): 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"

1
scripts/player.gd
View File

@@ -697,6 +697,7 @@ func weapon_tilt(input_x, delta):
func weapon_sway(delta): func weapon_sway(delta):
#aim gun at center screen #aim gun at center screen
if gun != null:
if !gun_ray.is_colliding(): if !gun_ray.is_colliding():
gun.look_at(gun_look_target.global_position) gun.look_at(gun_look_target.global_position)