diff --git a/Assets/Art/Materials/Pillow_Uv.mat b/Assets/Art/Materials/Pillow_Uv.mat new file mode 100644 index 0000000..202614d Binary files /dev/null and b/Assets/Art/Materials/Pillow_Uv.mat differ diff --git a/Assets/Art/Materials/Pillow_Uv.mat.meta b/Assets/Art/Materials/Pillow_Uv.mat.meta new file mode 100644 index 0000000..c92eed1 --- /dev/null +++ b/Assets/Art/Materials/Pillow_Uv.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fbc6b255d0260d4488f0a8f51896a937 +timeCreated: 1440280353 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Materials/T_Porte_D.mat b/Assets/Art/Materials/T_Porte_D.mat new file mode 100644 index 0000000..7172fd3 Binary files /dev/null and b/Assets/Art/Materials/T_Porte_D.mat differ diff --git a/Assets/Art/Materials/T_Porte_D.mat.meta b/Assets/Art/Materials/T_Porte_D.mat.meta new file mode 100644 index 0000000..6e14969 --- /dev/null +++ b/Assets/Art/Materials/T_Porte_D.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b2886c779b18264283b77734b135663 +timeCreated: 1440280044 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/SM_Murs.FBX b/Assets/Art/SM_Murs.FBX index b79cfaf..fe1a167 100644 Binary files a/Assets/Art/SM_Murs.FBX and b/Assets/Art/SM_Murs.FBX differ diff --git a/Assets/Art/SM_Murs.FBX.meta b/Assets/Art/SM_Murs.FBX.meta index b52cf46..835e1db 100644 --- a/Assets/Art/SM_Murs.FBX.meta +++ b/Assets/Art/SM_Murs.FBX.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 2da41d02c6b33b249a6c1a752c6adc41 -timeCreated: 1440271182 +guid: 56d82b7f76516a84f8211df1eb5a5fa6 +timeCreated: 1440280503 licenseType: Free ModelImporter: serializedVersion: 18 @@ -10,6 +10,8 @@ ModelImporter: 2300000: //RootNode 3300000: //RootNode 4300000: Box069 + 7400000: Take 001 + 9500000: //RootNode materials: importMaterials: 1 materialName: 0 @@ -67,7 +69,7 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 0 + animationType: 2 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Art/SM_Murs_Inversed.FBX b/Assets/Art/SM_Murs_Inversed.FBX new file mode 100644 index 0000000..a3d6eb2 Binary files /dev/null and b/Assets/Art/SM_Murs_Inversed.FBX differ diff --git a/Assets/Art/SM_Murs_Inversed.FBX.meta b/Assets/Art/SM_Murs_Inversed.FBX.meta new file mode 100644 index 0000000..690c3ab --- /dev/null +++ b/Assets/Art/SM_Murs_Inversed.FBX.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 468783296f7855642ae57783908446f7 +timeCreated: 1440281885 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: Box069 + 7400000: Take 001 + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .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 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/SM_Pillow.FBX b/Assets/Art/SM_Pillow.FBX new file mode 100644 index 0000000..e77c033 Binary files /dev/null and b/Assets/Art/SM_Pillow.FBX differ diff --git a/Assets/Art/SM_Pillow.FBX.meta b/Assets/Art/SM_Pillow.FBX.meta new file mode 100644 index 0000000..a715498 --- /dev/null +++ b/Assets/Art/SM_Pillow.FBX.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 5f25e7658d2291248b5b733de46d36c1 +timeCreated: 1440280353 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: SM_Pillow + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .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 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/SM_Porte.FBX b/Assets/Art/SM_Porte.FBX new file mode 100644 index 0000000..bcac828 Binary files /dev/null and b/Assets/Art/SM_Porte.FBX differ diff --git a/Assets/Art/SM_Porte.FBX.meta b/Assets/Art/SM_Porte.FBX.meta new file mode 100644 index 0000000..c26b652 --- /dev/null +++ b/Assets/Art/SM_Porte.FBX.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: bf56788b08c37074dba5a2f79a7cc2ae +timeCreated: 1440280746 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: Box073 + 7400000: Take 001 + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .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 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/SM_Porte.fbm.meta b/Assets/Art/SM_Porte.fbm.meta new file mode 100644 index 0000000..8f93f04 --- /dev/null +++ b/Assets/Art/SM_Porte.fbm.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: aca8c195601f0354c965f406bf27cd5b +folderAsset: yes +timeCreated: 1440280044 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/SM_Porte.fbm/T_Porte_D.tga b/Assets/Art/SM_Porte.fbm/T_Porte_D.tga new file mode 100644 index 0000000..6f7333d Binary files /dev/null and b/Assets/Art/SM_Porte.fbm/T_Porte_D.tga differ diff --git a/Assets/Art/SM_Porte.fbm/T_Porte_D.tga.meta b/Assets/Art/SM_Porte.fbm/T_Porte_D.tga.meta new file mode 100644 index 0000000..337175d --- /dev/null +++ b/Assets/Art/SM_Porte.fbm/T_Porte_D.tga.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 0500764176b5acc42864a1e6ca4d2331 +timeCreated: 1440280044 +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: diff --git a/Assets/Art/SM_PorteCadre.FBX b/Assets/Art/SM_PorteCadre.FBX new file mode 100644 index 0000000..77746b2 Binary files /dev/null and b/Assets/Art/SM_PorteCadre.FBX differ diff --git a/Assets/Art/SM_PorteCadre.FBX.meta b/Assets/Art/SM_PorteCadre.FBX.meta new file mode 100644 index 0000000..0c292af --- /dev/null +++ b/Assets/Art/SM_PorteCadre.FBX.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 28f5bb6ff89c57f4da3fd2742cc40114 +timeCreated: 1440280812 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: Box074 + 7400000: Take 001 + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .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 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Door.prefab b/Assets/Prefabs/Door.prefab new file mode 100644 index 0000000..c1050fc Binary files /dev/null and b/Assets/Prefabs/Door.prefab differ diff --git a/Assets/Prefabs/Door.prefab.meta b/Assets/Prefabs/Door.prefab.meta new file mode 100644 index 0000000..11e812e --- /dev/null +++ b/Assets/Prefabs/Door.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 519507fb75bbea241af0167b82acf64c +timeCreated: 1440281099 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Walls.prefab b/Assets/Prefabs/Walls.prefab index bc8910a..0f5ac71 100644 Binary files a/Assets/Prefabs/Walls.prefab and b/Assets/Prefabs/Walls.prefab differ diff --git a/Assets/Scenes/PatScene.unity b/Assets/Scenes/PatScene.unity index e4c5082..4ec728f 100644 Binary files a/Assets/Scenes/PatScene.unity and b/Assets/Scenes/PatScene.unity differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6e63725..52c12ea 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 802c8ce..8c353d8 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.0.2f1 +m_EditorVersion: 5.1.2f1 m_StandardAssetsVersion: 0