what have we here?
Merge branch 'old-working-copy' of https://github.com/GoldenCity/GoldenCityGameMain4_16_9_23AM into old-working-copy
upped soul rewards
Merge branch 'old-working-copy' of https://github.com/GoldenCity/GoldenCityGameMain4_16_9_23AM into old-working-copy

Conflicts:
	Assets/PreFabs/prefabProjectile_2.prefab
	Assets/Scenes/Scene_Campaign.unity
syncing 2 local repos
Merge branch 'old-working-copy' of https://github.com/GoldenCity/GoldenCityGameMain4_16_9_23AM into old-working-copy

Conflicts:
	Assets/PreFabs/CurrentlyUsedEnemies/HapryMissile.prefab
	Assets/PreFabs/CurrentlyUsedEnemies/LionPrefab.prefab
	Assets/PreFabs/CurrentlyUsedEnemies/batteringRamTest.prefab
removed animators from junk so mechanim would stop bitching
fkagjaklsgj;
imported updated wall
Merge branch 'old-working-copy' of https://github.com/GoldenCity/GoldenCityGameMain4_16_9_23AM into old-working-copy

Conflicts:
	Assets/PreFabs/CurrentlyUsedEnemies/CyclopsTest.prefab
	Assets/PreFabs/prefabProjectile_2.prefab
	Assets/Scenes/Scene_Campaign.unity
trying to fix stuff
fixed some probs with the maticore prefab

fixed wall textures
continued work on lightning
fixed manticore colliders
Merge branch 'old-working-copy' of https://github.com/GoldenCity/GoldenCityGameMain4_16_9_23AM into old-working-copy

Conflicts:
	Assembly-CSharp-Editor.pidb
	Assembly-CSharp-firstpass.pidb
	Assembly-UnityScript-firstpass.pidb
	Assembly-UnityScript.pidb
	Assets/PreFabs/CurrentlyUsedEnemies 1.meta
	Assets/PreFabs/CurrentlyUsedEnemies 1/BOAR_Prefab.prefab.meta
	Assets/PreFabs/CurrentlyUsedEnemies 1/CyclopsTest.prefab
	Assets/PreFabs/CurrentlyUsedEnemies 1/CyclopsTest.prefab.meta
	Assets/PreFabs/CurrentlyUsedEnemies 1/HapryMissile.prefab.meta
	Assets/PreFabs/CurrentlyUsedEnemies 1/LionPrefab.prefab
	Assets/PreFabs/CurrentlyUsedEnemies 1/LionPrefab.prefab.meta
	Assets/PreFabs/CurrentlyUsedEnemies 1/ManticorePrefab.prefab.meta
	Assets/PreFabs/CurrentlyUsedEnemies 1/batteringRamTest.prefab.meta
	Assets/PreFabs/CurrentlyUsedEnemies/CyclopsTest.prefab
	Assets/PreFabs/CurrentlyUsedEnemies/LionPrefab.prefab
	Assets/PreFabs/prefabProjectile_2.prefab
	Assets/Scenes/Scene_Campaign.unity
	GoldenCityGameMain4_16_9_23AM.userprefs
lightning mostly sort of working with a lot of null ref exceptions...
exhaust for boar

changed health bar tex
sfx for mines and beams