Refactored Don Quixote a little bit.
Merge branch 'master' of github.com:russelljahn/Lethal-Pursuit into russelldev

Conflicts:
	Lethal-Pursuit/Assets/Scenes/Arena.unity
Put in a more reliable implementation of the hud damage overlay. SHould have fixed 'blood vision' bug.
Cleaned up SpaceshipHealth.cs a little bit.
Got a basic indicator that locks on to another ship.
Fixed bug where indicators would sometimes not show.
Added lobby checking and suicide counting and score display
Adding work on arrow indicators in HudEnemyIndicator, although it's currently commented out because it doesn't work yet.
Made it where pickups are always grabbed if possible.
Added stuff to test damage shock effects.
Replaced ship models with Alex's newer ones and added electric damage shock effect meshes. Also added resource prefab for Double spaceship.
Merge branch 'master' into russelldev

Conflicts:
	Lethal-Pursuit/Assets/Models/Battle Stages/Materials/04 - Default.mat.meta
	Lethal-Pursuit/Assets/Scenes/Arena.unity
	Lethal-Pursuit/Assets/Scenes/MainMenu.unity
Combined Andy's work.
Got electrical fields to brielfy show when hurt.
Worked on bug where damage overlay wouldn't work properly in multiplayer. Haven't been able to test tho because Unity master servers are down.
ship colors
Merge branch 'master' into russelldev

Conflicts:
	Lethal-Pursuit/Assets/Models/Spaceships/Ships_Outer/Materials/Buzz_ElectricField.mat
	Lethal-Pursuit/Assets/Models/Spaceships/Ships_Outer/Materials/DonQuixote_ElectricField.mat
	Lethal-Pursuit/Assets/Models/Spaceships/Ships_Outer/Materials/Double_ElectricField.mat
	Lethal-Pursuit/Assets/Models/Spaceships/Ships_Outer/Materials/Magneto_ElectricField.mat
Last commit had stuff commented out that it shouldn't have.
a
a