working on wheel animator
Merge branch 'old-working-copy' of https://github.com/GoldenCity/GoldenCityGameMain4_16_9_23AM into old-working-copy
continued work on wheel animator. it's trickier than expected
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/prefabProjectile_2.prefab
	Assets/Scenes/Scene_Campaign.unity
	GoldenCityGameMain4_16_9_23AM.userprefs
set gui textures to gui
merging
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/Wall.prefab
	Assets/PreFabs/prefabProjectile_2.prefab
	Assets/Scenes/Scene_Campaign.unity
	GoldenCityGameMain4_16_9_23AM.userprefs
Made Nanites more effective

nanite particle effects on wall