Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_gui_and_hud
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_gui_and_hud
Hesp Sonic Scream Update.
Hesp Updates
Adjusted fire and damage to line up a bit better. Change the active time of the turret projectile to be lower. Added TurretHit script that will activate explosions on the dinosaur if it has been damaged. This TurretHit script will need to be added to each dino prefab and a few instances of the Turret_Explosion_VFX will need to be added to the prefab as well. We will probably need to change the explosion vfx a bit.
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_gui_and_hud
The correct names of the dinos should now appear over them during multiplayer.
Merge branch 'Sam_Working'
Made it so the turrets will now actually target the ai.
Merge branch 'Christian's'

Conflicts:
	UnityProject-CyberDino/Assets/Scenes/Prefabs.unity