openfpsz/open-fpsz
1
0
Fork 0
mirror of https://gitlab.com/open-fpsz/open-fpsz.git synced 2026-04-25 14:25:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix/midair-flag-regrabs' into 'develop'

Browse source 
Fix/midair flag regrabs

See merge request open-fpsz/open-fpsz!43
This commit is contained in:
Squinty 2024-04-17 16:25:25 +00:00
commit 3e28091661
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/flag_carry_component.gd
View file

@ -42,6 +42,8 @@ func _release(inherited_velocity : Vector3, throw_speed : float):
_carried_flag.drop()
_carried_flag.rotation_degrees.x = 0.0
_carried_flag.linear_velocity = inherited_velocity + (attachment.global_basis.z * throw_speed)
# Throw the flag from some distance in front of the player to avoid regrabbing mid-air
_carried_flag.global_position = _carried_flag.global_position + (attachment.global_basis.z * 1.5)
_carried_flag = null
func _is_carrying() -> bool: