New Scene for VFX testing and scaling
Made Personal Copies of Prefabs for VFX
Files for effects are updated to a current build.
End of semester Effects -Lucas
Small changes to effects.
Merge branch 'LucasEffects'

Conflicts:
	UnityProject-CyberDino/Assets/Materials.meta
	UnityProject-CyberDino/Assets/Old Project Folders/Racers/Diloph/Prefabs/Diloph_GameObject.prefab
	UnityProject-CyberDino/Assets/Old Project Folders/Racers/Diloph/Prefabs/Old/Diloph_GameObject.prefab
	UnityProject-CyberDino/Assets/Old Project Folders/Racers/Hesp/Prefabs/Hesp_GameObject.prefab
	UnityProject-CyberDino/Assets/Old Project Folders/Racers/Hesp/Prefabs/Old/Hesp_GameObject.prefab
	UnityProject-CyberDino/Assets/Old Project Folders/Racers/Raptor/Prefabs/Raptor_GameObject.prefab
	UnityProject-CyberDino/Assets/Old Project Folders/Racers/TRex/AnimationControls/Trex_AnimationControls.controller
	UnityProject-CyberDino/Assets/Racers/Prefabs/Individual Dinos/Raptor.prefab
	UnityProject-CyberDino/Assets/Racers/Prefabs/Player_3x.prefab
	UnityProject-CyberDino/Assets/Racers/Prefabs/Player_SizeModified.prefab
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/Diloph.prefab
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/Hesp.prefab
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/Raptor.prefab
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/TRex.prefab
	UnityProject-CyberDino/Assets/Resources/Dinosaurs/Resources/Troodon.prefab
	UnityProject-CyberDino/Assets/Resources/GUI/ButtonsGUISkin.guiskin
	UnityProject-CyberDino/Assets/Resources/GUI/CountDown.prefab
	UnityProject-CyberDino/Assets/Resources/GUI/DilophNoRace.prefab
	UnityProject-CyberDino/Assets/Resources/GUI/GUI.prefab
	UnityProject-CyberDino/Assets/Resources/GUI/MasterMenu.prefab
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/Materials/uvuGraphic.mat
	UnityProject-CyberDino/Assets/Resources/GUI/Materials/fireButton.mat
	UnityProject-CyberDino/Assets/Resources/GUI/MenuBackground.prefab
	UnityProject-CyberDino/Assets/Resources/GUI/RaptorNoRace.prefab
	UnityProject-CyberDino/Assets/Resources/GUI/Spinosaurus_riggedNoRace.prefab
	UnityProject-CyberDino/Assets/Resources/GUI/TRexNoRace.prefab
	UnityProject-CyberDino/Assets/Resources/LucasWeapons/FlameThrower/Material/Flame01.mat
	UnityProject-CyberDino/Assets/Resources/LucasWeapons/FlameThrower/Scene/flameThrower.unity
	UnityProject-CyberDino/Assets/Resources/NetworkHandler.prefab
	UnityProject-CyberDino/Assets/Resources/PickUps/Resources/PickUp.prefab
	UnityProject-CyberDino/Assets/Resources/PickUps/Resources/PickUpManager.prefab
	UnityProject-CyberDino/Assets/Resources/Respawn Checkpoints/Resources/CityTrack1_RespawnCheckpoints.prefab
	UnityProject-CyberDino/Assets/Resources/Respawn Checkpoints/Resources/CityTrack2_RespawnCheckpoints.prefab
	UnityProject-CyberDino/Assets/Resources/Respawn Checkpoints/Resources/RespawnCheckpoints.prefab
	UnityProject-CyberDino/Assets/Resources/Respawn Checkpoints/Resources/RespawnPoint.prefab
	UnityProject-CyberDino/Assets/Resources/VFX/Bump/Materials/Shockwave_material.mat
	UnityProject-CyberDino/Assets/Resources/VFX/Bump/Resources/Bump_Prefab.prefab
	UnityProject-CyberDino/Assets/Resources/VFX/Dust Trail/Materials/Dust_Material.mat
	UnityProject-CyberDino/Assets/Resources/VFX/Dust Trail/Resouces/DustTrail_PreFab.prefab
	UnityProject-CyberDino/Assets/Resources/VFX/Forcefield/Forcefield_Temp_Material.mat
	UnityProject-CyberDino/Assets/Resources/VFX/Respawn/Materials/RepawnScan_Material.mat
	UnityProject-CyberDino/Assets/Resources/VFX/Respawn/Resouces/Respawn_VFX.prefab
	UnityProject-CyberDino/Assets/Resources/VFX/Turbo/Materials/Boost_Material.mat
	UnityProject-CyberDino/Assets/Resources/VFX/Turbo/Materials/Materials/boost_Texture.mat
	UnityProject-CyberDino/Assets/Resources/VFX/Turbo/Resources/Boost_prefab.prefab
	UnityProject-CyberDino/Assets/Resources/Weapons/Laser/Materials/Lazer_Material.mat
	UnityProject-CyberDino/Assets/Resources/Weapons/Laser/Resources/Laser_VFX.prefab
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun/Materials/MachineGunBulletGradiant_Material.mat
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun/Materials/MachineGunBulletTrail_Material.mat
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun/Resources/BulletHit_VFX 1.prefab
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun/Resources/Player_MachineGun_Bullet.prefab
	UnityProject-CyberDino/Assets/Resources/Weapons/Machine Gun/Resources/Player_MachineGun_Gun.prefab
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Materials/smoke trail.mat
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Resources/MissileHit_VFX.prefab
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Resources/MissileTrail_VFX.prefab
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Resources/PlayerMissileLauncher.prefab
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Resources/mainSmokeTrail.prefab
	UnityProject-CyberDino/Assets/Resources/Weapons/Missile Launcher/Resources/shockwave-rocket.prefab
	UnityProject-CyberDino/Assets/Scenes/CityTrack.unity
	UnityProject-CyberDino/Assets/Scenes/Menu.unity
	UnityProject-CyberDino/Assets/Scenes/Player_Prefab_Test_Scene.unity
	UnityProject-CyberDino/Assets/Scenes/PreMenu.unity
	UnityProject-CyberDino/Assets/Scenes/Track_Test_Scene.unity
	UnityProject-CyberDino/Assets/Scenes/VFX_Test_Scene.unity
	UnityProject-CyberDino/Assets/Standard Assets/Character Controllers/First Person Controller.prefab
	UnityProject-CyberDino/ProjectSettings/DynamicsManager.asset
	UnityProject-CyberDino/ProjectSettings/EditorBuildSettings.asset
	UnityProject-CyberDino/ProjectSettings/ProjectSettings.asset
	UnityProject-CyberDino/ProjectSettings/TagManager.asset
Potentially conflicted files.