Pre pull commit

IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta

@@ -1,82 +0,0 @@
-fileFormatVersion: 2
-guid: 919eb0dba9aa0da44aec3a80f1cf98ea
-timeCreated: 1485000000
-licenseType: Free
-ModelImporter:
-  serializedVersion: 19
-  fileIDToRecycleName:
-    100000: lighthouse
-    100002: //RootNode
-    400000: lighthouse
-    400002: //RootNode
-    2300000: lighthouse
-    3300000: lighthouse
-    4300000: lighthouse
-  materials:
-    importMaterials: 1
-    materialName: 0
-    materialSearch: 1
-  animations:
-    legacyGenerateAnimations: 4
-    bakeSimulation: 0
-    resampleCurves: 1
-    optimizeGameObjects: 0
-    motionNodeName: 
-    animationImportErrors: 
-    animationImportWarnings: 
-    animationRetargetingWarnings: 
-    animationDoRetargetingWarnings: 0
-    animationCompression: 1
-    animationRotationError: 0.5
-    animationPositionError: 0.5
-    animationScaleError: 0.5
-    animationWrapMode: 0
-    extraExposedTransformPaths: []
-    clipAnimations: []
-    isReadable: 1
-  meshes:
-    lODScreenPercentages: []
-    globalScale: 1
-    meshCompression: 0
-    addColliders: 0
-    importBlendShapes: 1
-    swapUVChannels: 0
-    generateSecondaryUV: 0
-    useFileUnits: 1
-    optimizeMeshForGPU: 1
-    keepQuads: 0
-    weldVertices: 1
-    secondaryUVAngleDistortion: 8
-    secondaryUVAreaDistortion: 15.000001
-    secondaryUVHardAngle: 88
-    secondaryUVPackMargin: 4
-    useFileScale: 1
-  tangentSpace:
-    normalSmoothAngle: 60
-    normalImportMode: 0
-    tangentImportMode: 3
-  importAnimation: 1
-  copyAvatar: 0
-  humanDescription:
-    serializedVersion: 2
-    human: []
-    skeleton: []
-    armTwist: 0.5
-    foreArmTwist: 0.5
-    upperLegTwist: 0.5
-    legTwist: 0.5
-    armStretch: 0.05
-    legStretch: 0.05
-    feetSpacing: 0
-    rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
-    hasTranslationDoF: 0
-    hasExtraRoot: 0
-    skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {instanceID: 0}
-  animationType: 0
-  humanoidOversampling: 1
-  additionalBone: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

IronToad_UnityProject/Assets/Art/Models/pier.obj.meta

@@ -1,82 +0,0 @@
-fileFormatVersion: 2
-guid: 37549450629db464abffe54861590cf3
-timeCreated: 1485008673
-licenseType: Free
-ModelImporter:
-  serializedVersion: 19
-  fileIDToRecycleName:
-    100000: pCylinder3
-    100002: //RootNode
-    400000: pCylinder3
-    400002: //RootNode
-    2300000: pCylinder3
-    3300000: pCylinder3
-    4300000: pCylinder3
-  materials:
-    importMaterials: 1
-    materialName: 0
-    materialSearch: 1
-  animations:
-    legacyGenerateAnimations: 4
-    bakeSimulation: 0
-    resampleCurves: 1
-    optimizeGameObjects: 0
-    motionNodeName: 
-    animationImportErrors: 
-    animationImportWarnings: 
-    animationRetargetingWarnings: 
-    animationDoRetargetingWarnings: 0
-    animationCompression: 1
-    animationRotationError: 0.5
-    animationPositionError: 0.5
-    animationScaleError: 0.5
-    animationWrapMode: 0
-    extraExposedTransformPaths: []
-    clipAnimations: []
-    isReadable: 1
-  meshes:
-    lODScreenPercentages: []
-    globalScale: 1
-    meshCompression: 0
-    addColliders: 0
-    importBlendShapes: 1
-    swapUVChannels: 0
-    generateSecondaryUV: 0
-    useFileUnits: 1
-    optimizeMeshForGPU: 1
-    keepQuads: 0
-    weldVertices: 1
-    secondaryUVAngleDistortion: 8
-    secondaryUVAreaDistortion: 15.000001
-    secondaryUVHardAngle: 88
-    secondaryUVPackMargin: 4
-    useFileScale: 1
-  tangentSpace:
-    normalSmoothAngle: 60
-    normalImportMode: 0
-    tangentImportMode: 3
-  importAnimation: 1
-  copyAvatar: 0
-  humanDescription:
-    serializedVersion: 2
-    human: []
-    skeleton: []
-    armTwist: 0.5
-    foreArmTwist: 0.5
-    upperLegTwist: 0.5
-    legTwist: 0.5
-    armStretch: 0.05
-    legStretch: 0.05
-    feetSpacing: 0
-    rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
-    hasTranslationDoF: 0
-    hasExtraRoot: 0
-    skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {instanceID: 0}
-  animationType: 0
-  humanoidOversampling: 1
-  additionalBone: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 844c4f25011b45348a5db5bc5b4f956e
-folderAsset: yes
-timeCreated: 1485037848
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3c7e12539b1e2c048bbfe0734108abba
-timeCreated: 1485039339
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7a2ebb0518fbb4d46a3aa17dac934dce
-timeCreated: 1485038927
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

IronToad_UnityProject/Assets/Sound.meta~HEAD

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 73fb9ee280b0c75439600b4d5c3a6a7d
-folderAsset: yes
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

IronToad_UnityProject/Assets/Sound.meta~HEAD.meta

@@ -1,14 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< HEAD
-guid: 7562c5d08f15d254c92f6dbd50cd18c9
-timeCreated: 1485039339
-licenseType: Pro
-=======
-guid: 0fb49e3e0a97c2c4cb531c04d67f2615
-timeCreated: 1485038927
-licenseType: Free
->>>>>>> 927ced4c4317bc1f86f167c9b1594cec30b8e540
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

IronToad_UnityProject/Assets/Sound/Music.meta

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

IronToad_UnityProject/Assets/Sound/SFX.meta

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

IronToad_UnityProject/Assets/Textures.meta

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

IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta

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