Finish merge??
This commit is contained in:
parent
d2ff71d899
commit
38344706f3
@ -206,12 +206,8 @@ namespace NeonTea.Quakeball.Players {
|
||||
}
|
||||
Debug.Log("I was hit! Aaagh!");
|
||||
Splatter.Play();
|
||||
<<<<<<< HEAD
|
||||
HitAudioSource.Play();
|
||||
LocalHitAudioSource.Play();
|
||||
=======
|
||||
HitAudioSource.PlayOneShot(HitClip);
|
||||
>>>>>>> cbce3a6a7c2ad4de57bd4feb36e306e603039960
|
||||
}
|
||||
|
||||
public bool IsGrounded() {
|
||||
|
Loading…
Reference in New Issue
Block a user