diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD b/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD new file mode 100644 index 0000000..8db841f --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 93c6fe7644c3dd249ae67cfc5ef62f4f +folderAsset: yes +timeCreated: 1444816934 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD.meta b/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD.meta new file mode 100644 index 0000000..5738ed6 --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18002ecada6fcf74db33422cdf6b45e3 +timeCreated: 1444977403 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: 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 index 8f2bb5f..7524808 100644 --- 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 @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: 73807885af79f08409af8cfa504f151d +timeCreated: 1444816941 +======= guid: 5229931a887da744f8b143d3a3b6ebe2 timeCreated: 1444963987 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} 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 index 66a472c..075e2ba 100644 --- 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 @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: 5760e5b6217f00f43aa7284f88d673e0 +timeCreated: 1444816940 +======= guid: 508669a15aa596e4fb31b64a9ef0358a timeCreated: 1444963986 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} 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 index 0967920..70b0fd7 100644 --- 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 @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: ffd886b811d09e246bcf9cef7b5300da +timeCreated: 1444816946 +======= guid: 6923f83b6752ee24fab936c70fbdb3f6 timeCreated: 1444963989 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} 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 index a5d0033..087e86d 100644 --- 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 @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: 5d2c4f9f4d2c70c43a5015441363ec60 +timeCreated: 1444816940 +======= guid: 436e1c01cabf71846b68ffe62d16676f timeCreated: 1444963986 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} 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 index 427ab98..9301e40 100644 --- 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 @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: c0789dc7df957234fab515bd76187cd5 +timeCreated: 1444816942 +======= guid: f91640ab040168b41ac708a606406911 timeCreated: 1444963993 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} 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 index 5df58ee..e64bdd2 100644 --- 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 @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: f689cf6e913fffe468423a391aedcbe4 +timeCreated: 1444816946 +======= guid: 5f52597b29f3415468d182d4708a845c timeCreated: 1444963988 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} 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 index 54cd517..f71a77f 100644 --- 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 @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: dd8a665a21c72e046b21eb37d166dcb6 +timeCreated: 1444816945 +======= guid: 17e151b8ca0b54c47b00504bf33440e9 timeCreated: 1444963984 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} 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 index ab1ff19..ec934cb 100644 --- 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 @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: 225357fdc7247dc4487fa33e7005859b +timeCreated: 1444816939 +======= guid: 854f5a0b19b8d874b851336cdbd51df1 timeCreated: 1444963991 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} 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 index f0ebd05..65f55db 100644 --- 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 @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: 7cf2ef30927a7034fa6853a71c90f81f +timeCreated: 1444816942 +======= guid: 6eb3f04d86801894b8bb4d8ee0801837 timeCreated: 1444963990 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} 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 index 2e39e72..d96c8bc 100644 --- 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 @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: 93e3d399ed60aec4c81447df937219eb +timeCreated: 1444816942 +======= guid: d5b6678e6c800594d987a459a36dff49 timeCreated: 1444963992 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} 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 index 3bf5cdf..302ad07 100644 --- 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 @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: 950f1640e3b96a04e90f56f29c4ab3aa +timeCreated: 1444970305 +======= guid: 4217b02130105354b8bf5cb48e701efc timeCreated: 1444963985 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/unity_Project/Assets/Fonts.meta b/unity_Project/Assets/Fonts.meta new file mode 100644 index 0000000..55f3427 --- /dev/null +++ b/unity_Project/Assets/Fonts.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 5629de68fc927c74da741f808f175add +folderAsset: yes +timeCreated: 1444975270 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/Fonts/MotionControl-Bold.otf b/unity_Project/Assets/Fonts/MotionControl-Bold.otf new file mode 100644 index 0000000..389d8c8 Binary files /dev/null and b/unity_Project/Assets/Fonts/MotionControl-Bold.otf differ diff --git a/unity_Project/Assets/Fonts/MotionControl-Bold.otf.meta b/unity_Project/Assets/Fonts/MotionControl-Bold.otf.meta new file mode 100644 index 0000000..141caa0 --- /dev/null +++ b/unity_Project/Assets/Fonts/MotionControl-Bold.otf.meta @@ -0,0 +1,18 @@ +fileFormatVersion: 2 +guid: b929c126c43e9ab4d816cc240f297c0f +timeCreated: 1444975270 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + customCharacters: + fontRenderingMode: 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 index b6b7ca7..b665bea 100644 --- a/unity_Project/Assets/GUI Assets/UI_credits.png.meta +++ b/unity_Project/Assets/GUI Assets/UI_credits.png.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 139518c3564a5fa4b91d3b9137dd97a0 -timeCreated: 1444963983 -licenseType: Free +guid: e2273b98b70b41c4789399af71b0160e TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -30,22 +28,22 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 - spriteMode: 0 + 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: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/unity_Project/Assets/GUI Assets/buttons.meta b/unity_Project/Assets/GUI Assets/buttons.meta index c3b175c..bada2e0 100644 --- a/unity_Project/Assets/GUI Assets/buttons.meta +++ b/unity_Project/Assets/GUI Assets/buttons.meta @@ -1,7 +1,13 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: e05209d25db06c14e89ac6899807685a +folderAsset: yes +timeCreated: 1444970301 +======= guid: 246270fcdb8756147a17ddeacc523eaf folderAsset: yes timeCreated: 1444963981 +>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 licenseType: Free DefaultImporter: userData: diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_close.png b/unity_Project/Assets/GUI Assets/buttons/btn_close.png new file mode 100644 index 0000000..c3d79d6 Binary files /dev/null and b/unity_Project/Assets/GUI Assets/buttons/btn_close.png differ diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_close.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_close.png.meta new file mode 100644 index 0000000..a59d64e --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons/btn_close.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 03fe9bcd1afa0ab44883a90a8d4dd211 +timeCreated: 1444974404 +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: diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_close_LIT.png b/unity_Project/Assets/GUI Assets/buttons/btn_close_LIT.png new file mode 100644 index 0000000..e1a278e Binary files /dev/null and b/unity_Project/Assets/GUI Assets/buttons/btn_close_LIT.png differ diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_close_LIT.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_close_LIT.png.meta new file mode 100644 index 0000000..8d0acbb --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons/btn_close_LIT.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 52e2c5ed0b739c14aad485429f82d500 +timeCreated: 1444974405 +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: diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta index f11c0ea..38ad122 100644 --- a/unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta +++ b/unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: c6ed5502d45191d409f13d94ae605f98 -timeCreated: 1444963991 -licenseType: Free +guid: 68ac929074196e04eaa1c95cb34eb5f8 TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -30,22 +28,22 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 - spriteMode: 0 + 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: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_continue_LIT.png b/unity_Project/Assets/GUI Assets/buttons/btn_continue_LIT.png new file mode 100644 index 0000000..f453aa4 Binary files /dev/null and b/unity_Project/Assets/GUI Assets/buttons/btn_continue_LIT.png differ diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_continue_LIT.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_continue_LIT.png.meta new file mode 100644 index 0000000..2efa89f --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons/btn_continue_LIT.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 35c2f87b938d7a74e941f483af34ed06 +timeCreated: 1444974405 +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: diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta index 43d66d7..cb21ecd 100644 --- a/unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta +++ b/unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: ed1d3d6c58fca874aa1332a2dafdbbb4 -timeCreated: 1444963992 -licenseType: Free +guid: cd2159db50f67e043b760e4b9e378ceb TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -30,22 +28,22 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 - spriteMode: 0 + 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: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_credits_LIT.png b/unity_Project/Assets/GUI Assets/buttons/btn_credits_LIT.png new file mode 100644 index 0000000..5cd66f6 Binary files /dev/null and b/unity_Project/Assets/GUI Assets/buttons/btn_credits_LIT.png differ diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_credits_LIT.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_credits_LIT.png.meta new file mode 100644 index 0000000..557b982 --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons/btn_credits_LIT.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 4a7d97a86f9f1e8449d4e2197247c5d1 +timeCreated: 1444974405 +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: diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta index ab86487..fa043f1 100644 --- a/unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta +++ b/unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: c93aa9271dee1bf4191b97da38a4e5de -timeCreated: 1444963991 -licenseType: Free +guid: 0952d26219807984d81378f2b93cd120 TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -30,22 +28,22 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 - spriteMode: 0 + 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: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_exit_LIT.png b/unity_Project/Assets/GUI Assets/buttons/btn_exit_LIT.png new file mode 100644 index 0000000..dc1e391 Binary files /dev/null and b/unity_Project/Assets/GUI Assets/buttons/btn_exit_LIT.png differ diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_exit_LIT.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_exit_LIT.png.meta new file mode 100644 index 0000000..01404d3 --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons/btn_exit_LIT.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 435e7ab930504b541a763fd43b9e56bf +timeCreated: 1444974405 +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: 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 index 7dafdbe..e2b211a 100644 --- a/unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta +++ b/unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 0d349f824e5ba244ca80b1ef5e856f8b -timeCreated: 1444963982 -licenseType: Free +guid: efeaa4c9cf64299478579c7bb54ef9af TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -30,22 +28,22 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 - spriteMode: 0 + 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: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_new_game_LIT.png b/unity_Project/Assets/GUI Assets/buttons/btn_new_game_LIT.png new file mode 100644 index 0000000..1d4594a Binary files /dev/null and b/unity_Project/Assets/GUI Assets/buttons/btn_new_game_LIT.png differ diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_new_game_LIT.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_new_game_LIT.png.meta new file mode 100644 index 0000000..651bc30 --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons/btn_new_game_LIT.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 14bb7e22f0743b54cb8bfee07b2ab6b0 +timeCreated: 1444974405 +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: diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta index f85a1cb..1ca44fc 100644 --- a/unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta +++ b/unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 197e17f17bcf50244923c00c199cfb80 -timeCreated: 1444963984 -licenseType: Free +guid: 0d71b952815265d469069b89f501a43c TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -30,22 +28,22 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 - spriteMode: 0 + 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: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_settings_LIT.png b/unity_Project/Assets/GUI Assets/buttons/btn_settings_LIT.png new file mode 100644 index 0000000..a23d4d5 Binary files /dev/null and b/unity_Project/Assets/GUI Assets/buttons/btn_settings_LIT.png differ diff --git a/unity_Project/Assets/GUI Assets/buttons/btn_settings_LIT.png.meta b/unity_Project/Assets/GUI Assets/buttons/btn_settings_LIT.png.meta new file mode 100644 index 0000000..14d873f --- /dev/null +++ b/unity_Project/Assets/GUI Assets/buttons/btn_settings_LIT.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: dbd8216062710be42b97af992ea14ab8 +timeCreated: 1444974405 +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: diff --git a/unity_Project/Assets/Textures.meta b/unity_Project/Assets/Textures.meta new file mode 100644 index 0000000..8915b1d --- /dev/null +++ b/unity_Project/Assets/Textures.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 97def69cc8aa8f0458d67929f23873dd +folderAsset: yes +timeCreated: 1444371283 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/_Scenes/CreditScreen.unity b/unity_Project/Assets/_Scenes/CreditScreen.unity index f949d49..37e143d 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 9b2764f..fc7665f 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/_Scenes/TitleScreen.unity b/unity_Project/Assets/_Scenes/TitleScreen.unity index 35ce6e3..63c01f5 100644 Binary files a/unity_Project/Assets/_Scenes/TitleScreen.unity and b/unity_Project/Assets/_Scenes/TitleScreen.unity differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat index dfa3754..1cab733 100644 Binary files a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_3dObjects.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat index df3aa5e..9535c24 100644 Binary files a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_ArtAssets.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat index 05cec7c..c19f64e 100644 Binary files a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Credits.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat index 8b298cc..e234b51 100644 Binary files a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Jeffrey.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat index 92b9112..cffc357 100644 Binary files a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Joshua.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat index 16ed2a8..4ce62d4 100644 Binary files a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Lachlan.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat index 814bc43..2e7f2f0 100644 Binary files a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_SFX.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat index a6d727e..a281e2f 100644 Binary files a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Simon.mat differ diff --git a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat index 4293de8..cb23dc4 100644 Binary files a/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat and b/unity_Project/Assets/zCreditStuff/Sign Textures/txt_Sign_Trailer.mat differ diff --git a/unity_Project/ProjectSettings/ProjectSettings.asset b/unity_Project/ProjectSettings/ProjectSettings.asset index ac67012..6faa7cf 100644 Binary files a/unity_Project/ProjectSettings/ProjectSettings.asset and b/unity_Project/ProjectSettings/ProjectSettings.asset differ diff --git a/unity_Project/ProjectSettings/ProjectVersion.txt b/unity_Project/ProjectSettings/ProjectVersion.txt index 8c353d8..c609863 100644 --- a/unity_Project/ProjectSettings/ProjectVersion.txt +++ b/unity_Project/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.1.2f1 +m_EditorVersion: 5.1.3f1 m_StandardAssetsVersion: 0