diff --git a/unity_Project/Assets/GUI Assets/UI_credits.png.meta b/unity_Project/Assets/GUI Assets/UI_credits.png.meta index 61f2d54..b665bea 100644 --- a/unity_Project/Assets/GUI Assets/UI_credits.png.meta +++ b/unity_Project/Assets/GUI Assets/UI_credits.png.meta @@ -1,12 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: e2273b98b70b41c4789399af71b0160e -timeCreated: 1444970306 -======= -guid: 139518c3564a5fa4b91d3b9137dd97a0 -timeCreated: 1444963983 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 -licenseType: Free TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -35,7 +28,6 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 -<<<<<<< HEAD aniso: 16 mipBias: -1 wrapMode: 1 @@ -44,29 +36,14 @@ TextureImporter: rGBM: 0 compressionQuality: 50 spriteMode: 1 -======= - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 -<<<<<<< HEAD alphaIsTransparency: 1 textureType: 8 -======= - alphaIsTransparency: 0 - textureType: -1 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 buildTargetSettings: [] spriteSheet: sprites: [] 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 96f102e..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,12 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 68ac929074196e04eaa1c95cb34eb5f8 -timeCreated: 1444970304 -======= -guid: c6ed5502d45191d409f13d94ae605f98 -timeCreated: 1444963991 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 -licenseType: Free TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -35,7 +28,6 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 -<<<<<<< HEAD aniso: 16 mipBias: -1 wrapMode: 1 @@ -44,29 +36,14 @@ TextureImporter: rGBM: 0 compressionQuality: 50 spriteMode: 1 -======= - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 -<<<<<<< HEAD alphaIsTransparency: 1 textureType: 8 -======= - alphaIsTransparency: 0 - textureType: -1 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 buildTargetSettings: [] spriteSheet: sprites: [] 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 15fe78b..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,12 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: cd2159db50f67e043b760e4b9e378ceb -timeCreated: 1444970305 -======= -guid: ed1d3d6c58fca874aa1332a2dafdbbb4 -timeCreated: 1444963992 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 -licenseType: Free TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -35,7 +28,6 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 -<<<<<<< HEAD aniso: 16 mipBias: -1 wrapMode: 1 @@ -44,29 +36,14 @@ TextureImporter: rGBM: 0 compressionQuality: 50 spriteMode: 1 -======= - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 -<<<<<<< HEAD alphaIsTransparency: 1 textureType: 8 -======= - alphaIsTransparency: 0 - textureType: -1 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 buildTargetSettings: [] spriteSheet: sprites: [] 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 fde8671..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,12 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 0952d26219807984d81378f2b93cd120 -timeCreated: 1444970304 -======= -guid: c93aa9271dee1bf4191b97da38a4e5de -timeCreated: 1444963991 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 -licenseType: Free TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -35,7 +28,6 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 -<<<<<<< HEAD aniso: 16 mipBias: -1 wrapMode: 1 @@ -44,29 +36,14 @@ TextureImporter: rGBM: 0 compressionQuality: 50 spriteMode: 1 -======= - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 -<<<<<<< HEAD alphaIsTransparency: 1 textureType: 8 -======= - alphaIsTransparency: 0 - textureType: -1 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 buildTargetSettings: [] spriteSheet: sprites: [] 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 74a523d..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,12 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: efeaa4c9cf64299478579c7bb54ef9af -timeCreated: 1444970306 -======= -guid: 0d349f824e5ba244ca80b1ef5e856f8b -timeCreated: 1444963982 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 -licenseType: Free TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -35,7 +28,6 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 -<<<<<<< HEAD aniso: 16 mipBias: -1 wrapMode: 1 @@ -44,29 +36,14 @@ TextureImporter: rGBM: 0 compressionQuality: 50 spriteMode: 1 -======= - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 -<<<<<<< HEAD alphaIsTransparency: 1 textureType: 8 -======= - alphaIsTransparency: 0 - textureType: -1 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 buildTargetSettings: [] spriteSheet: sprites: [] 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 0e99486..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,12 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 0d71b952815265d469069b89f501a43c -timeCreated: 1444970304 -======= -guid: 197e17f17bcf50244923c00c199cfb80 -timeCreated: 1444963984 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 -licenseType: Free TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -35,7 +28,6 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 -<<<<<<< HEAD aniso: 16 mipBias: -1 wrapMode: 1 @@ -44,29 +36,14 @@ TextureImporter: rGBM: 0 compressionQuality: 50 spriteMode: 1 -======= - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 -<<<<<<< HEAD alphaIsTransparency: 1 textureType: 8 -======= - alphaIsTransparency: 0 - textureType: -1 ->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789 buildTargetSettings: [] spriteSheet: sprites: [] 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/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