Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker

Conflicts:
	unity_Project/Assets/_Scenes/MainLevel.unity
	unity_Project/ProjectSettings/ProjectSettings.asset
	unity_Project/ProjectSettings/ProjectVersion.txt

unity_Project/Assets/0bjects/Textures/txtr_cargo_box_METAL_2048.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: e5c60f332f246e842b2448744d337a9a
+timeCreated: 1444367677
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/0bjects/Textures/txtr_engine_shiny.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 42fb1623938ec5a4cb66ce442d7e8df0
+timeCreated: 1444393857
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/GUI Assets/follow-active.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: a56ca18c407402647a6ed1108667ec03
+timeCreated: 1444389427
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Scripts/PlayerSounds.cs

@@ -3,6 +3,8 @@ using System.Collections;
 
 public class PlayerSounds : MonoBehaviour {
 	
+	public GameObject PlayerObject;
+
 	private AudioSource source;
 	private float volLowRange = 0.5f;   // Volume Low Range
 	private float volHighRange = 1.0f;  // Volume High Range
@@ -10,11 +12,11 @@ public class PlayerSounds : MonoBehaviour {
 	private float pitchHighRange = 1.5f; // Pitch High Range
 	private float pitchDefault = 1.0f; // Pitch Default Value
 
-	
 
 	// AUDIO CLIPS
 	// All sound effects are listed here.
-	public AudioClip sfxFootstep;
+	public AudioClip sfxFootSand;
+	public AudioClip sfxFootFloor;
 	public AudioClip sfxTEST;
 	public AudioClip sfxSwitch;
 	public AudioClip sfxPickUp;
@@ -34,12 +36,18 @@ public class PlayerSounds : MonoBehaviour {
 
 	void PlayFootstep(){
 		float volRandom = Random.Range (volLowRange, volHighRange);
-
+		// SAND GROUND
 		source.pitch = Random.Range (pitchLowRange, pitchHighRange);
-		source.PlayOneShot (sfxFootstep,volRandom);
+		source.PlayOneShot (sfxFootSand,volRandom);
+
 	}
 
 
+
+
+
+
+
 	public void PlayTest(){
 		float volRandom = Random.Range (volLowRange, volHighRange);
 		

unity_Project/Assets/Scripts/PlayerSounds.cs.meta

@@ -1,10 +1,20 @@
 fileFormatVersion: 2
 guid: 6ed61f910a1a91c468bbcb5ef31a04bd
-timeCreated: 1443688566
+timeCreated: 1444391524
 licenseType: Free
 MonoImporter:
   serializedVersion: 2
-  defaultReferences: []
+  defaultReferences:
+  - PlayerObject: {instanceID: 0}
+  - sfxFootSand: {fileID: 8300000, guid: 1ea8dc6673a63ec439437b6f591cdf4a, type: 3}
+  - sfxFootFloor: {fileID: 8300000, guid: 7453853a241f33d4c86a19f26d2515fa, type: 3}
+  - sfxTEST: {fileID: 8300000, guid: a72d12d8942fa5e4dbf7d80277162f4a, type: 3}
+  - sfxSwitch: {fileID: 8300000, guid: 4446f8b5e50e93a49ac164b2c1e91d41, type: 3}
+  - sfxPickUp: {fileID: 8300000, guid: 6f0909228f29eac4f9f00fd1dd223c84, type: 3}
+  - sfxRotateL: {fileID: 8300000, guid: 714ec971c0991bd438886a67f41ee158, type: 3}
+  - sfxRotateR: {fileID: 8300000, guid: 0cc6e5efee06d9248943d2dc35386079, type: 3}
+  - sfxJump: {fileID: 8300000, guid: c9bb08969bcdad14781f0226444365f7, type: 3}
+  - sfxLand: {fileID: 8300000, guid: dec92f528110a304f935823040ed4af8, type: 3}
   executionOrder: 0
   icon: {instanceID: 0}
   userData: 

unity_Project/Assets/Scripts/impactSFX_crate.cs

@@ -8,7 +8,7 @@ public class impactSFX_crate : MonoBehaviour {
 
 	private float volLowRange = 0.5f;   // Volume Low Range
 	private float volHighRange = 1.0f;  // Volume High Range
-	private float pitchLowRange = 0.75f; // Pitch Low Range
+	private float pitchLowRange = 0.50f; // Pitch Low Range
 	private float pitchHighRange = 1.0f; // Pitch High Range
 	private float pitchDefault = 1.0f; // Pitch Default Value
 
@@ -25,7 +25,7 @@ public class impactSFX_crate : MonoBehaviour {
 		if (Time.time > lastHitTime + waitTime) {
 			lastHitTime = Time.time;
 			source.pitch = Random.Range (pitchLowRange, pitchHighRange);
-			source.PlayOneShot (sfxImpCrate, 0.85f);
+			source.PlayOneShot (sfxImpCrate, 0.90f);
 		}
 	}
 

unity_Project/Assets/Scripts/sceneController.cs

@@ -28,7 +28,7 @@ public class sceneController : MonoBehaviour {
 	// Call PlayerSound script to allow sounds upon button presses
 	// NOTE: Make sure the SceneController's inspector has the PlayerAvatar
 	// attached as an element under its script component.
-	public PlayerSounds _playerSoundScript;
+	public PlayerSounds PlayerSoundSource;
 
 
 
@@ -77,9 +77,10 @@ public class sceneController : MonoBehaviour {
 
 		if (Input.GetButtonDown(playerSwapInput)) {
 			Debug.Log("swappy Swap");
+			PlayerSoundSource.PlaySwitch();  //Play "Switch Character" sound function
 			activeP1  = !activeP1;
 			activeP2  = !activeP2;
-			//_playerSoundScript.PlaySwitch();  //Play "Switch Character" sound function
+
 
 
 			if (activeP1){

unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/TLO - Cargo Box METAL.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 82775f7d7bfa8f942a817ee7b1c560f1
+timeCreated: 1444367701
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/TLO - Engine Objective.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 086b95e207a3e8f478fca4d5b59d5068
+timeCreated: 1444394052
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: ec859906f525d8c44985ca31c67c339a
+folderAsset: yes
+timeCreated: 1444395421
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Media.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: f96326e715eae4d1cb846884a08cd629
+folderAsset: yes
+timeCreated: 1444395421
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Media/Desktop.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 382dbcfad22624a0784c7f198a511516
+folderAsset: yes
+timeCreated: 1444395421
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Media/Desktop/Materials.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: beb0e35351f5e4cbf9f7cc3bc698a4ab
+folderAsset: yes
+timeCreated: 1444395421
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Media/Desktop/Materials/Ray_02.mat.meta

@@ -0,0 +1,6 @@
+fileFormatVersion: 2
+guid: 7b6eb087ac199453095820f174994f6f
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Media/Desktop/Materials/Ray_03.mat.meta

@@ -0,0 +1,6 @@
+fileFormatVersion: 2
+guid: db09fc779bfb943a19fac36ece2de8dd
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Media/Desktop/Materials/Ring_02.mat.meta

@@ -0,0 +1,6 @@
+fileFormatVersion: 2
+guid: e987fcffca0b542e78b63cbd66434e09
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Media/Desktop/Materials/Sparkle_01.mat.meta

@@ -0,0 +1,6 @@
+fileFormatVersion: 2
+guid: ee04f7050e5ab49a9a8debaa96d29b0e
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Media/Desktop/Textures.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 23f76ba8e19d247c9beaeeeb46eac245
+folderAsset: yes
+timeCreated: 1444395421
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Media/Desktop/Textures/Ray_02.tga.meta

@@ -0,0 +1,53 @@
+fileFormatVersion: 2
+guid: 630eb6cb129784281a988a26cf8e999f
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 512
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Media/Desktop/Textures/Ray_03.tga.meta

@@ -0,0 +1,53 @@
+fileFormatVersion: 2
+guid: 968abceaaf665477bbf02dd8a6bc7000
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 512
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Media/Desktop/Textures/Ring_02.tga.meta

@@ -0,0 +1,53 @@
+fileFormatVersion: 2
+guid: 04e482ba8df9b4c03b1d95f31db964b4
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 512
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Media/Desktop/Textures/Sparkle_01.tga.meta

@@ -0,0 +1,53 @@
+fileFormatVersion: 2
+guid: 6fb414e2819a84fcd9406f3d79fb9882
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 256
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Prefabs.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 0f161bb41df9b467d8e8604508a90c17
+folderAsset: yes
+timeCreated: 1444395421
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Prefabs/Fire.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: cfc8f1d96f29845fc88c26a61f13b4e8
+folderAsset: yes
+timeCreated: 1444395421
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Elementals - Aura/Prefabs/Fire/Holy Aura.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4f87325f27448f34ea3524d10cfb0131
+timeCreated: 1444394517
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/MagnetSpark.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 40fd995de46debf409eefbcaa2293be0
+folderAsset: yes
+timeCreated: 1444375025
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/MagnetSpark/Flares.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: a813c8fd21e61434798c1a334df694d5
+folderAsset: yes
+timeCreated: 1444371283
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/MagnetSpark/Flares/Full Colour.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 36cbd8de90fbd9b41974a3f7b3654cd5
+folderAsset: yes
+timeCreated: 1444371283
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/MagnetSpark/Flares/Full Colour/Spark 1.png.meta

@@ -0,0 +1,53 @@
+fileFormatVersion: 2
+guid: 20b5bdfcc66741949834621cf0db2168
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 1024
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/MagnetSpark/Flares/Full Colour/Spark Line.png.meta

@@ -0,0 +1,53 @@
+fileFormatVersion: 2
+guid: b206737170ad3ee4b9625fea088dd86c
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 1024
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/MagnetSpark/Spark.mat.meta

@@ -0,0 +1,6 @@
+fileFormatVersion: 2
+guid: 8192566e4ce7f264c90c029eda547836
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/MagnetSpark/Sparks.mat.meta

@@ -0,0 +1,6 @@
+fileFormatVersion: 2
+guid: f1aeb9e2e57ed8945aff1dc7ab51a9a5
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/MagnetSpark/Sparks.prefab.meta

@@ -0,0 +1,6 @@
+fileFormatVersion: 2
+guid: 51f86eac077549d4aa4627aa42653fb9
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Materials/ParticleSparkMagnet.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 43e8aadfad1ccf44795915b36b3988f8
+timeCreated: 1444370362
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Standard Assets/ParticleSystems/Textures/txtr_particle_sparkle_2.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 1d8b5c21e5b6a8d4b924e6fcd81844e0
+timeCreated: 1444370332
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Textures.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 97def69cc8aa8f0458d67929f23873dd
+folderAsset: yes
+timeCreated: 1444371283
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/prefabs/Objective Engine.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cc230d50bb3f98f4f929d469b0c22efc
+timeCreated: 1444394106
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 5.1.2f1
+m_EditorVersion: 5.1.3f1
 m_StandardAssetsVersion: 0