From 5400a939121f869453009027f6c5b3a771dd4504 Mon Sep 17 00:00:00 2001 From: Simon Tran Date: Fri, 16 Oct 2015 17:53:54 +1100 Subject: [PATCH] Resolved merge conflicts. Title Screen works as well as credits scene --- .../Assets/GUI Assets/UI_credits.png.meta | 23 ------------------ .../GUI Assets/buttons/btn_continue.png.meta | 23 ------------------ .../GUI Assets/buttons/btn_credits.png.meta | 23 ------------------ .../GUI Assets/buttons/btn_exit.png.meta | 23 ------------------ .../GUI Assets/buttons/btn_new_game.png.meta | 23 ------------------ .../GUI Assets/buttons/btn_settings.png.meta | 23 ------------------ .../Assets/_Scenes/CreditScreen.unity | Bin 135128 -> 135184 bytes .../Sign Textures/txt_Sign_3dObjects.mat | Bin 4996 -> 4996 bytes .../Sign Textures/txt_Sign_ArtAssets.mat | Bin 4996 -> 4996 bytes .../Sign Textures/txt_Sign_Credits.mat | Bin 4992 -> 4992 bytes .../Sign Textures/txt_Sign_Jeffrey.mat | Bin 4992 -> 4992 bytes .../Sign Textures/txt_Sign_Joshua.mat | Bin 4992 -> 4992 bytes .../Sign Textures/txt_Sign_Lachlan.mat | Bin 4992 -> 4992 bytes .../Sign Textures/txt_Sign_SFX.mat | Bin 4988 -> 4988 bytes .../Sign Textures/txt_Sign_Simon.mat | Bin 4992 -> 4992 bytes .../Sign Textures/txt_Sign_Trailer.mat | Bin 4992 -> 4992 bytes 16 files changed, 138 deletions(-) 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 f949d49b7ec4830b367adb123ac2acdeca9e16bb..37e143dd1bc46576d948633b9f46964693a9f936 100644 GIT binary patch delta 1553 zcmZXUe@t6d6vxj6T*{DG!DQ{8H8kPJScG)WRk{TCL#J%n0wPh+kU=80>U4!{X2hY@ zY|0YBl4HVHvdE%;lw`VM<8U!EObHQp^nLPz)tI1f)7^fKrwbh{rOEW$_~vwQAUgZ_rM%xlWQ2cQ9dVID=F zK{1eYJ?Q#0o%hG+i+IHQKL@UeFGGVo1-koBlq!#C9NzIXt=y|G2_50P7o@8yprgEZ z0jG>+=H1cmenn_6zX?v~vrs=@0v(SLq0#?W!B3944+|aSC^!%2FKTL%%NI49Wr1iA zo(;xGo$}K({W-US)42;;#RH&67m1{g7LC?2;f~1V{K$xnE(hn~>(DUgE}`D>%)F~# zA2R3&?^=?m%}_sgg0`#>J&1UAW27?q`O(L`vIn{xTqA$Kq~VKE{O^+0=D`Wa;9J{< zg@-;oD!ha3ap|jSsD+#2_&)J+PTbb!j}(9Qn$Q;R0~g?rp=O={ecGfla!Gt!a$M*z zt7SQ-4H{e!{1#JdneC=3vdED z8M3apv(3JXO_kp5y|wTBxUc!ysXN{d`4excen)}2GgOdtwi|aN4PI5eLuL0Ly`Z*= YC8ysURHl*O1$7O-*CX#utGy5W2e7fqasU7T delta 1539 zcmZXTe@vT27{{Mmrxqj90hu(HH?cS@Od-^1H%MS*I_>6`b;duCgsdbgpqmVhON~P} zGm_3Y?R=7TGr^U(KOot{uqqIpVT&=-gvCXT#e}8&v$cN=+5+njH|qD^Rzv8UKHuxz z_jAvC_uRd{fH8E|XeL^Y(wdSG5tR^S(GWdTXRCW^)I9TeRnqy`vF(kwip@Q3A2)qg zxvK{55ka&@=ZH3=+s}Kut-)>9dV_rzy0x(JqYZgPpr^(+<;SbkxI;051~LA;V4Hir zr49C4I96rj`ES~R{Iu#|a-&@Y8=maBVm<-CT#u~2;I<#nzo6!L`SP3;F`j|CI6Wt| zu2H*w#`f7;oZ<`?w*%g=sSI7WQS{~9NpNt8LKC%;6ZRsz6AC1 zG-%TgMBCwfp+}Cc`+3VAMYr<0m=qDNg}Qi0OlnsrkpoT^&sr$9MctXEm(fs|kAgeM z1JDpp#AJi>3eg2PZas3jw+=V!bP65{hYG34d5*jn;NrLxMy`oV&Gi$h!c!V=e4FmW zKcZ*<=Q_Z7xDR@j&p@4gJziEM{FVC@=SENYx1ljEO2~%RKZpWw_Un;*>n6i#H@cL9 zw|Z}trHi^};`W59Z%d+#KS>xh$Dc$l%xTdhm**GnrO}ZI~?!Quw$DO8m-#)GDTl`r)jsjP=u5m4E_#5?q8YKt22m=^3^QNLJ zcoy6c--8}u^Ac7vUzmH$`r=!PcJkgODaQE#l=wL4t~gO2oRzzLr?*q5BYYX0muH|c zPJccj`K8V zQ?l?Z8|~-vxz{Dt-KvFpct;YuOcm129}MesJs$<<OHyXx=9-k$s)ZnRbStY;zW=Lt74PGYl*-!&_3|0erUwKaUqwH+;oJ8W9pLNW zjC>pFa4Zm32^`W8zY{}q!f=!uDgQ>ai_iOvwGds_9+_g-!4y+G;bMGS&+?KWXo;oE= zW8Q<}(XIZo4spN#>k+YWEIcA^*81nZ7cco8GosudmZH>u%`J@nhZCZ7to4Q%xBUw} ChspT> 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 dfa37544ac3ab547c2db94cf045b584366398f16..1cab7334222790aea3e1101062c6188c10f4eb31 100644 GIT binary patch delta 44 zcmV+{0Mq}3Cxj=E7y&b}8J`FdHwcGV`j-z#kow541@uwT1GCWxO9zwS2ne$r5NHE% CfDnZM delta 44 zcmZosZ&9Bh!DzHmaz2Nk>LkmB9oMT|`lU^5t+My&F>k)e;mtnz0SCus8G#ID08tqZ AyZ`_I 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 df3aa5e99337fab00a7f3787fa1607295f513134..9535c243fec385b5e8cb8164381e4920645dc8fd 100644 GIT binary patch delta 44 zcmV+{0Mq}3Cxj=E7y&b}8J`Fd-Kb`z5`5x7wi3Q`9cImI1GCWxO9zwS2ne$r5NHE< CP7qfB delta 44 zcmZosZ&9Bh!DzHmaz2M(p`2*lo A5&!@I 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 05cec7cf06ebefc9d00af9209c3b07feb5328bd2..c19f64ea051e1722b8238b089878cb9e00234703 100644 GIT binary patch delta 44 zcmZorZ&05g!Dzfuaz2NkrJe1}du*?KdK^psTB=Xn$GrI>hd2A=2OJ!mWdu@~0blhG As{jB1 delta 44 zcmV+{0Mq|~Cx9oA7y&Y|8J`FdU2Ase#t2YJop?%>I@bS`1GCWxO9zwS2ne$r5M%># CqY!!k 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 8b298cc8c2dfadd722d25884601568a70d41beba..e234b517fd000e5235ace49cfaab4955e5f49d94 100644 GIT binary patch delta 44 zcmZorZ&05g!Dzfuaz2M(DO+5&(02y^#Z^sTI&#hVm^WYK@MfR1E*1GCWxO9zwS2ne$r5M%?1 CAQ3SD delta 44 zcmV+{0Mq|~Cx9oA7y&Y|8J`FdmNJjCb|vmYubX3h@Y_3Y1GCWxO9zwS2ne$r5M%>< CZV<@; 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 16ed2a87254c1bed6c4e3c8363ce3c17027c329e..4ce62d4d350e4682ba8e3033852acb5dd4914c9f 100644 GIT binary patch delta 44 zcmZorZ&05g!Dzfuaz2M3Py5Z9zme+B>!Sm2r#BvtW!`*|!<&8b0}hVOG6E^g0C0W~ AK>z>% delta 44 zcmZorZ&05g!DzHmaz2OP{6v;r4gzi73u_v(5?H1QGH<@f;mtnz0SCus8G#gL07g;{ AM*si- 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 814bc430d37a16ab0fa3d5d50b17e71dc43c753b..2e7f2f0735e30df1ccb53c04cb8ead21c2e90a76 100644 GIT binary patch delta 44 zcmV+{0Mq~cCj2Il7y&b}8J`Fd$1nZ^DW?ZRuZA^x!3mG?1GCWxO9zwS2ne$r5MTp| C91w^A delta 44 zcmV+{0Mq~cCj2Il7y&Y|8J`Fd<~tA6Xb6Exi@Vh54hVsB1GCWxO9zwS2ne$r5MTq1 Ct`L#{ 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 a6d727ecae8d9aeb6f5c4d2944fbb0d6d171cb26..a281e2fd002ba02e0b6ed6aef56a2a37f2b2d298 100644 GIT binary patch delta 44 zcmV+{0Mq|~Cx9oA7y&b}8J`FdZ6h9sktq29bs1GCWxO9zwS2ne$r5M%?L Co)Q88 delta 44 zcmZorZ&05g!DzHmaz2OPSJkQ8C)ta*w#jPvvaj$s%Dnj^hd2A=2OJ!mWdu@~0a9}g Ax&QzG 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 4293de8844189fceb7a820f2d217dcc6cac2f7d4..cb23dc41bbd22e220786d5ae602ca47c3ee19faf 100644 GIT binary patch delta 44 zcmV+{0Mq|~Cx9oA7y&b}8J`FdS@2;5KAWaMp73Qa$)r1~1GCWxO9zwS2ne$r5M%>x C&=5EP delta 44 zcmZorZ&05g!DzHmaz2NkN+GupGoz_%_wS?LFW4WRXWo2~!<&8b0}hVOG6E^g06w4& Ay8r+H