Raptor Ragdoll and Mecanim updated with new textures and animations
Merge branch 'ragdoll'
fixed issues related to raptor prefab
Merge branch 'raptor_prefab_fix'
no message
Fixed merge errors
Spinosaurus animated, textured, rigged
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into SpinoAnimations
New Diloph ragdoll and animation. Updated Raptor Texture. Set Game to AutoRun
Merge branch 'ragdoll'
Spinosaurus: Updated Model, Texture, Animation now in prefab with mecanim and ragdoll ready for playtesting.
Raptor Smite animation triggering. (Press "Y" to test Melee attacks)
Linked the animation events for Diloph to MeleeAttack and Bomb trigger (Playtest: Melee = Y, Bomb = U)
Linked animation to Spino BuzzSaw. Created "Duration" as editable values for both BuzzSaw and TeleportSlam
Napalm bomb fix.
Set animation based triggers to BuzzSaw.cs
Merge branch 'BuzzSaw_Tweeks'
scripted most of the teleport slam. Replaced menu dinos with the newer models.
fixed player pickup
Merge branch 'master' of https://github.com/Okomikeruko/UVU_CyberDino into PickUps

Conflicts:
	UnityProject-CyberDino/Assets/Scripts/PickUps/PlayerPickUp.cs