diff --git a/unity_Project/Assets/Textures.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures.meta similarity index 67% rename from unity_Project/Assets/Textures.meta rename to unity_Project/Assets/0bjects/Textures/Credits Textures.meta index 8915b1d..9c155c5 100644 --- a/unity_Project/Assets/Textures.meta +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 97def69cc8aa8f0458d67929f23873dd +guid: 98f33bcc9e41b8949a879320065fa448 folderAsset: yes -timeCreated: 1444371283 +timeCreated: 1444963981 licenseType: Free DefaultImporter: userData: diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_3D_objects.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_3D_objects.png.meta new file mode 100644 index 0000000..8f2bb5f --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_3D_objects.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 5229931a887da744f8b143d3a3b6ebe2 +timeCreated: 1444963987 +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/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Jeffrey.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Jeffrey.png.meta new file mode 100644 index 0000000..66a472c --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Jeffrey.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 508669a15aa596e4fb31b64a9ef0358a +timeCreated: 1444963986 +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/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Joshua.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Joshua.png.meta new file mode 100644 index 0000000..0967920 --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Joshua.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 6923f83b6752ee24fab936c70fbdb3f6 +timeCreated: 1444963989 +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/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO.png.meta new file mode 100644 index 0000000..a5d0033 --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 436e1c01cabf71846b68ffe62d16676f +timeCreated: 1444963986 +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/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO_DoubleSided.png b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO_DoubleSided.png new file mode 100644 index 0000000..0bc5d10 Binary files /dev/null and b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO_DoubleSided.png differ diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO_DoubleSided.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO_DoubleSided.png.meta new file mode 100644 index 0000000..66ab80f --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO_DoubleSided.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 773a44313208d2949b7f84a9ba9bcaaf +timeCreated: 1444970994 +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/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Lachlan.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Lachlan.png.meta new file mode 100644 index 0000000..427ab98 --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Lachlan.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: f91640ab040168b41ac708a606406911 +timeCreated: 1444963993 +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/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Simon.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Simon.png.meta new file mode 100644 index 0000000..5df58ee --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Simon.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 5f52597b29f3415468d182d4708a845c +timeCreated: 1444963988 +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/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_art_assets.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_art_assets.png.meta new file mode 100644 index 0000000..54cd517 --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_art_assets.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 17e151b8ca0b54c47b00504bf33440e9 +timeCreated: 1444963984 +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/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_developed.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_developed.png.meta new file mode 100644 index 0000000..ab1ff19 --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_developed.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 854f5a0b19b8d874b851336cdbd51df1 +timeCreated: 1444963991 +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/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_sound.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_sound.png.meta new file mode 100644 index 0000000..f0ebd05 --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_sound.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 6eb3f04d86801894b8bb4d8ee0801837 +timeCreated: 1444963990 +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/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_text.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_text.png.meta new file mode 100644 index 0000000..2e39e72 --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_text.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: d5b6678e6c800594d987a459a36dff49 +timeCreated: 1444963992 +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/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_trailer.png.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_trailer.png.meta new file mode 100644 index 0000000..3bf5cdf --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_trailer.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 4217b02130105354b8bf5cb48e701efc +timeCreated: 1444963985 +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/unity_Project/Assets/EndCamera.cs b/unity_Project/Assets/EndCamera.cs new file mode 100644 index 0000000..bfb0f37 --- /dev/null +++ b/unity_Project/Assets/EndCamera.cs @@ -0,0 +1,24 @@ +using UnityEngine; +using System.Collections; + +public class EndCamera : MonoBehaviour { + + public GameObject camera; + public MonoBehaviour script; + + // Use this for initialization + void Start () { + //script = camera.GetComponent("Smooth Follow") as MonoBehaviour; + } + + // Update is called once per frame + void Update () { + + } + + void OnTriggerEnter(Collider other) { + if (other.transform.tag == "moveable") { + script.enabled = false; + } + } +} diff --git a/unity_Project/Assets/EndCamera.cs.meta b/unity_Project/Assets/EndCamera.cs.meta new file mode 100644 index 0000000..21a3244 --- /dev/null +++ b/unity_Project/Assets/EndCamera.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: df677d53264e848479e62ad841b46475 +timeCreated: 1444968786 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/GUI Assets/UI_credits.png.meta b/unity_Project/Assets/GUI Assets/UI_credits.png.meta new file mode 100644 index 0000000..b6b7ca7 --- /dev/null +++ b/unity_Project/Assets/GUI Assets/UI_credits.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 139518c3564a5fa4b91d3b9137dd97a0 +timeCreated: 1444963983 +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/unity_Project/Assets/GUI Assets/buttons.meta b/unity_Project/Assets/GUI Assets/buttons.meta new file mode 100644 index 0000000..c3b175c --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 246270fcdb8756147a17ddeacc523eaf +folderAsset: yes +timeCreated: 1444963981 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta new file mode 100644 index 0000000..f11c0ea --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: c6ed5502d45191d409f13d94ae605f98 +timeCreated: 1444963991 +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/unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta new file mode 100644 index 0000000..43d66d7 --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: ed1d3d6c58fca874aa1332a2dafdbbb4 +timeCreated: 1444963992 +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/unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta new file mode 100644 index 0000000..ab86487 --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: c93aa9271dee1bf4191b97da38a4e5de +timeCreated: 1444963991 +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/unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta new file mode 100644 index 0000000..7dafdbe --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 0d349f824e5ba244ca80b1ef5e856f8b +timeCreated: 1444963982 +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/unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta new file mode 100644 index 0000000..f85a1cb --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 197e17f17bcf50244923c00c199cfb80 +timeCreated: 1444963984 +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/unity_Project/Assets/New Terrain 1.asset b/unity_Project/Assets/New Terrain 1.asset index a37000f..7d71dc4 100644 Binary files a/unity_Project/Assets/New Terrain 1.asset and b/unity_Project/Assets/New Terrain 1.asset differ diff --git a/unity_Project/Assets/Scripts/fence.cs b/unity_Project/Assets/Scripts/fence.cs index 02b11da..000f11c 100644 --- a/unity_Project/Assets/Scripts/fence.cs +++ b/unity_Project/Assets/Scripts/fence.cs @@ -31,4 +31,21 @@ public class fence : MonoBehaviour { */ } } + + void OnTriggerEnter(Collider other) { + if (other.transform.tag == "moveable") { + rigidbody.isKinematic = false; + //rigidbody.velocity = other.relativeVelocity; + /* + ContactPoint contact = collision.contacts[0]; + Vector3 push = transform.position - contact.point; + push.Normalize(); + + Debug.Log("fence: " + push); + rigidbody.AddForceAtPosition(push*1000, contact.point); + */ + } + } } + + diff --git a/unity_Project/Assets/_Scenes/CreditScreen.unity b/unity_Project/Assets/_Scenes/CreditScreen.unity index ffc5caf..79fbbe5 100644 Binary files a/unity_Project/Assets/_Scenes/CreditScreen.unity and b/unity_Project/Assets/_Scenes/CreditScreen.unity differ diff --git a/unity_Project/Assets/_Scenes/MainLevel.unity b/unity_Project/Assets/_Scenes/MainLevel.unity index dad3af5..b7f6fab 100644 Binary files a/unity_Project/Assets/_Scenes/MainLevel.unity and b/unity_Project/Assets/_Scenes/MainLevel.unity differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures.meta b/unity_Project/Assets/zCreditStuff/Sign Textures.meta new file mode 100644 index 0000000..fcc3c9f --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e59775e1f93aca940a3042d021e47012 +folderAsset: yes +timeCreated: 1444964978 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat new file mode 100644 index 0000000..dfa3754 Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat.meta new file mode 100644 index 0000000..9f439fe --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 88197d1d91b040f4c9396c45103182dd +timeCreated: 1444966650 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat new file mode 100644 index 0000000..df3aa5e Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat.meta new file mode 100644 index 0000000..6fb3807 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c300f8b12de7e4445a31fbcad532c4f6 +timeCreated: 1444966606 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat new file mode 100644 index 0000000..05cec7c Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat.meta new file mode 100644 index 0000000..08f3c9d --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21c997d3263b7e347ae888dd06a58a52 +timeCreated: 1444964970 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat new file mode 100644 index 0000000..8b298cc Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat.meta new file mode 100644 index 0000000..63c4369 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30d48ae75bd1abd4e8cd85567f01cd32 +timeCreated: 1444966550 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat new file mode 100644 index 0000000..92b9112 Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat.meta new file mode 100644 index 0000000..57d4623 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b15e911dae052f342a886ba163360b36 +timeCreated: 1444965094 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat new file mode 100644 index 0000000..16ed2a8 Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat.meta new file mode 100644 index 0000000..6339f90 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 63bcd1a96853ff6479f15b4e87dcd8ba +timeCreated: 1444965816 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Logo.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Logo.mat new file mode 100644 index 0000000..9a14704 Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Logo.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Logo.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Logo.mat.meta new file mode 100644 index 0000000..03b6478 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Logo.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a9c99d3824d6b549a6072260e219637 +timeCreated: 1444966745 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat new file mode 100644 index 0000000..814bc43 Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat.meta new file mode 100644 index 0000000..a058f58 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c2e138507a1e544ea9051f74e4defce +timeCreated: 1444966677 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat new file mode 100644 index 0000000..a6d727e Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat.meta new file mode 100644 index 0000000..34832db --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f673623f0d0fb142928e5a70359968a +timeCreated: 1444965592 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat new file mode 100644 index 0000000..4293de8 Binary files /dev/null and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat.meta b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat.meta new file mode 100644 index 0000000..c2b0aa5 --- /dev/null +++ b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 44efaad6b0ee2d14794df197e371a72c +timeCreated: 1444966705 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/zCreditStuff/car_Control.cs b/unity_Project/Assets/zCreditStuff/car_Control.cs index 0ec051f..183d14e 100644 --- a/unity_Project/Assets/zCreditStuff/car_Control.cs +++ b/unity_Project/Assets/zCreditStuff/car_Control.cs @@ -31,8 +31,8 @@ public class car_Control : MonoBehaviour { // Update is called once per frame void FixedUpdate () { carRigid.centerOfMass = centreOfMass; - float inputX = Input.GetAxis ("Player1 Movement Y"); - float inputY = Input.GetAxis("Player1 Movement X"); + float inputX = 1; //Input.GetAxis ("Player1 Movement Y"); + float inputY = 0; //Input.GetAxis("Player1 Movement X"); applyAcceleration (inputX); applyTorque (inputY); diff --git a/unity_Project/ProjectSettings/EditorBuildSettings.asset b/unity_Project/ProjectSettings/EditorBuildSettings.asset index f8c6ec2..42116fe 100644 Binary files a/unity_Project/ProjectSettings/EditorBuildSettings.asset and b/unity_Project/ProjectSettings/EditorBuildSettings.asset differ