- tweaked fire rate on the rifle to match the Sound
- added placeholder rifle sound
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami
-
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami
imported models energy and healing pack but haven't tied them to code yet
- finished healing zone
- added new heal zone sphere model and changed old model to be used as area Shield
-Added rifle sound from alien swarm for testing
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami
-fixed sound
- created a grenade prefab for the rifle alt fire ( found in 3d models/weapons )
-added shotgun placeholder sound
Fixed the shotgun prefab
Added in Holosign2 prop with texture
Added 2 chair props w/ textures
things
Merge branch 'Levels' of https://github.com/AlexHayton/UnityTestProject2 into Rami

Conflicts:
	Assets/Scenes/Level_LTD001.unity
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami

Conflicts:
	Assets/TestProject/Prefabes/Weapons/Rifle.prefab
	Assets/TestProject/Prefabes/Weapons/Shotgun.prefab
	Assets/TestProject/Sounds/RifleBulletSound.prefab
-
-changed rolling enemy size
-changed spawn time in ship Scene ( for less annoying spawn times )
Fixed conflicts from previous merge