scripted most of the teleport slam. Replaced menu dinos with the newer models.
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_new_hud
Got ride of the item switching as well as fixed the size of the dinos in the menu.
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_new_hud
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_new_hud
Troodon asset import and weapon system integration
TeleportSlam  now takes into account the multiple colliders that the spherecast hits. Also There were some small changes to the menu and hud scripts
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into Robert_new_hud
Somehow the t-rex prefab got corrupted but it's functioning now.
Added AcidSpit weapon code
Linked Inventory to the HUD. Removed deleted script from the dino prefabs.
uncommented position graphic on the hud.
Mad Dash set up
Merge branch 'Weapons'
Turned on dropping items
Troodon Ragdoll and EMPPulse VFX
Merge branch 'Troodon'

Conflicts:
	UnityProject-CyberDino/Assets/Scripts/Dinosaurs/Weapons/Diloph/AcidSpit.cs
Resolved Conflicts to AcidSpit.cs
Resolved issue with broken TRex prefab
Merge remote-tracking branch 'origin/Robert_new_hud'

Conflicts:
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/Troodon.prefab