Modifications + ignore

Signed-off-by: Ante <ante.bralic@gmail.com>
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop

Signed-off-by: Ante <ante.bralic@gmail.com>

Conflicts:
	.gitignore
	tojam/Assets/Standard Assets/Water (Pro Only)/Sources/Materials/Daylight Water.mat
Adding meta files + got rid of old hydra plugin

Signed-off-by: Ante <ante.bralic@gmail.com>
Metas

Signed-off-by: Ante <ante.bralic@gmail.com>
Added bullet and engine hum sounds to player jet

Signed-off-by: Ante <ante.bralic@gmail.com>
Added shoot and death sounds to Drone

Signed-off-by: Ante <ante.bralic@gmail.com>
meta file deletion

Signed-off-by: Ante <ante.bralic@gmail.com>
Added music to player jet.

Signed-off-by: Ante <ante.bralic@gmail.com>
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop

Signed-off-by: Ante <ante.bralic@gmail.com>

Conflicts:
	tojam/Assets/Audio.meta
	tojam/Assets/Audio/Music.meta
	tojam/Assets/Audio/Music/SJ_Mellia_-_01_-_01_reverseselector.mp3.meta
	tojam/Assets/Audio/Music/SJ_Mellia_-_04_-_04_bytemarks.mp3.meta
	tojam/Assets/Audio/Music/SJ_Mellia_-_05_-_05_supaunlimita.mp3.meta
	tojam/Assets/Audio/SFX.meta
	tojam/Assets/Audio/SFX/151022__bubaproducer__laser-shot-silenced.wav.meta
	tojam/Assets/Audio/SFX/165147__rhythmpeople__rpeople-blaster-02.wav.meta
	tojam/Assets/Audio/SFX/69757__syna-max__recognizer.wav.meta
	tojam/Assets/Audio/SFX/69764__syna-max__lightcycle.wav.meta
	tojam/Assets/Audio/SFX/69966__syna-max__derezz-sounds_A.wav.meta
	tojam/Assets/Audio/SFX/69966__syna-max__derezz-sounds_B.wav.meta
	tojam/Assets/Audio/SFX/69966__syna-max__derezz-sounds_C.wav.meta
	tojam/Assets/Audio/SFX/69966__syna-max__derezz-sounds_D.wav.meta
	tojam/Assets/Audio/SFX/69966__syna-max__derezz-sounds_E.wav.meta
	tojam/Assets/Audio/SFX/69966__syna-max__derezz-sounds_F.wav.meta
	tojam/Assets/Audio/SFX/69967__syna-max__synth-amb.ogg.meta
	tojam/Assets/Model/key.FBX.meta
	tojam/Assets/Model/keyHole.FBX.meta
	tojam/Assets/Scenes/FlightTestScene.unity
	tojam/Assets/Textures/ForceFieldTexture.png.meta
	tojam/Assets/Textures/ForceFieldTexture_orange.png.meta
	tojam/Assets/Textures/ForceFieldTexture_red.png.meta
	tojam/Assets/Textures/keyHoleLightingMap.tga.meta
	tojam/Assets/Textures/keyLightingMap.tga.meta
	tojam/ProjectSettings/EditorBuildSettings.asset