NeonTea/quakeball
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Finish merge??

Browse Source
This commit is contained in:
Jens Pitkänen 2020-08-08 10:21:50 +03:00
parent d2ff71d899
commit 38344706f3
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/Players/Player.cs
View File

@ -206,12 +206,8 @@ namespace NeonTea.Quakeball.Players {
} }
Debug.Log("I was hit! Aaagh!"); Debug.Log("I was hit! Aaagh!");
Splatter.Play(); Splatter.Play();
<<<<<<< HEAD
HitAudioSource.Play(); HitAudioSource.Play();
LocalHitAudioSource.Play(); LocalHitAudioSource.Play();
=======
HitAudioSource.PlayOneShot(HitClip);
>>>>>>> cbce3a6a7c2ad4de57bd4feb36e306e603039960
} }
public bool IsGrounded() { public bool IsGrounded() {