From 3c383fa9695eb51d6169a0adf26628c6330abf1c Mon Sep 17 00:00:00 2001 From: Kerby Tineus Date: Sat, 25 Jun 2016 14:23:54 -0400 Subject: [PATCH] Merge Kerby --- Assets/Materials.meta | 9 +++++++++ Assets/Materials/Ground.mat | Bin 0 -> 4892 bytes Assets/Materials/Ground.mat.meta | 8 ++++++++ Assets/Materials/New Material 1.mat | Bin 0 -> 4900 bytes Assets/Materials/New Material 1.mat.meta | 8 ++++++++ 5 files changed, 25 insertions(+) create mode 100644 Assets/Materials.meta create mode 100644 Assets/Materials/Ground.mat create mode 100644 Assets/Materials/Ground.mat.meta create mode 100644 Assets/Materials/New Material 1.mat create mode 100644 Assets/Materials/New Material 1.mat.meta diff --git a/Assets/Materials.meta b/Assets/Materials.meta new file mode 100644 index 0000000..ced9f5f --- /dev/null +++ b/Assets/Materials.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 9ae293cd9e24d174a992ca345a75eac3 +folderAsset: yes +timeCreated: 1466817257 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Ground.mat b/Assets/Materials/Ground.mat new file mode 100644 index 0000000000000000000000000000000000000000..2eb866de403f1137d807b6c18de2c3f47f9b9b95 GIT binary patch literal 4892 zcmeI0OKjX!6o!vyGD({9Dy6igEe-E?N-5zPnl#Urc1TLvg4hhs%*~9!V@I~9Oe7Xw zA;F#%-Bd_ykPu?Uh6NHE)(EjEk7c{<7F7-Zf9<)MI~l2BKPNizz27}PJ`dZv9+A5({`f<6vwYB9q0Q;a{Ub}we*7XDJ8y_y;yn67;{xVnri^Dil zUKL4UzojRsh=adxijw}|NIC>aKbbnR3*+Cx@4~U5IjsxwH+&q$oc6^oJ^?>ZV?LU% z(VBms6(s#7_fzV!@Akv^GV6kL`x!CZk<;-1E&MQkUc*UwPQf{jc&Oxz*_k0P>NpSK z9L70DuC*xVVfzu3^WBC!0v~b`%6zGm-hA)YEaTmA-eY(c=Mv_O2i?Mzw7nH4Ti7qo zJ>**LIPW(+>(~33Gq1f+3TwxDHZUfCfDl4{6Z}(*84vG~e(^kLxLvpX_wf#R#`x%~N z`{#Yy&;NMN3t0Ue<10}5e+0+8KDut-<@`~@i&kEb89rp?^*A|%_35tL6ND*wNxs0S zQ@1A#AJ+B!5p%}#l;I=Rb@`lS`HouGeTH1?s8!Er4KK-07_*+N@pDiL>-IhR`zyx0 z_n#+(I5MLBcb@kbG|PDR{Xb#&u>1+%zhTa2^cYlRT>H6-e6L|P1bvaXi~ofgIiJCd zXMX;{jDB7s?y~RrInl#AeqJ`bp!;|ObJlZ`JZ1cLA73%t?jzopT6+8Vnz6V0_`2bC zAKx(C?&F)_{rWgXuGQ}2TZWf}^<*DeH@>$hd|&Z-hw6N%3DceV&KPdzdx{*=o9`@P zN^a*nXSkj3yy14f3*i0oT_o3P=gaqK#!GSu5inoAJ5NJJ#<4c6>+mmTtiu_o)5UM) z{OuloJLhM6I4?#&=WJ~3ym}*Px*LnWTjzYP6(?cyT@~QW^DWg<5+{)t)GxU8 zvb!M{125TJiNXyPC7Y`ar4l-IFRNM(Jw-1URC^(~982IfRd!BBvZbUIDV|n!eI;$# z#CUmqJ=VS!{m@NxAfX>du|!grHE~%Gk@4N*JZL#w%(fc)aD!=}E%HTfPmDw=4qH)G z#m8EVzOvTx{KN|?s+~lxu^J2p6&O@tP=P@O1{D}o;Qv>EpUz8B*a~XdR*75jj_`Av z+g{FhLAjN#lwB{tu7GS?QtT9|nP|J&R&#?}4@+!2ZpA9|DseskoiJ*;{vGW3X@Q+m zlWL#E5}p*nyQ66 zLb2`lz*VJ;n)tp~UGl>?-f;pf>~k19`%_tssOV literal 0 HcmV?d00001 diff --git a/Assets/Materials/Ground.mat.meta b/Assets/Materials/Ground.mat.meta new file mode 100644 index 0000000..097a510 --- /dev/null +++ b/Assets/Materials/Ground.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aed5fade9ccbf2d46bf25f753014c55e +timeCreated: 1466817296 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/New Material 1.mat b/Assets/Materials/New Material 1.mat new file mode 100644 index 0000000000000000000000000000000000000000..70a7d84561ecf3dc5cd9698f3f01f659c3b142b3 GIT binary patch literal 4900 zcmeI0OKcle6o${(v6H5}N-1qAr3S(qQc4NW(6o8ArFD~%wjefUV&B*UV^1_QZXJom ztdL;Oif$?-Hb@AuV#5N74Qqs0l*h8&c8jWp|GzW7@pUX!?0ursx%azg&YZ{0^o~Ww zeiqq1AtLvSJb;79)a230skI|=XLEDYaRBx}zr23q;O!gxIyXOBx^->;)xBk~92Sc> zQeGEHV85v+iHL*0Z}O7-;7Bq8NI$7MvIFDa!SBH_r#Y>2@;7`O!kqT`9zF>_&tg87 ztul8|1JD5eqO^#cuvkaf_SLpjM+I(p4V|6 zz&VU_oLp;O&cpU&DCav3cLYA<7?k-^DgF80t69o>)F7V{2@XJ`7Q8IF=jlxM+U|7u;F&y_L4(b&qL@V z>qbBO2ov%V-IuR2zTfbImG2|qX}(3PF9*oA7OlQKYIy2@9DU?<4}z!Hwf#Rv`{VRw z`{#W+$bTv0Ijnw;@l`1OKaOKoA6>WaGX8|&c`L6c4Ii=cnjnX;KD~8&iZCHB$QKxO z>-MzaMP1JyF=sr_7(QxUm(N+6@0fMn=g75=S@nG0@Phn=G3&`1zW}AMZr`K7zhcaL z|3yNGBcs}X_j!Lwvy}JV|C5FnF?tk#@_DZn}*wc ze9LgVk8gty>fc?v30!dg++;a|*Hhtp7}hu_Zl zyM6pl#?SO|UW|UuX1wgiD)d}mmY3sjdZFgULAcO~RV(s>)-h>T7Cm2`p2uL>jT;zf zyOoApQz4hrkr|v(8&`s`76F{~>W#SRt}ps-o%6YN6bH@sR10UGZ>zSFC=R_={eoLB zyX$hX<;5GzVX&^kcw?oZR7|JtWmU_dr|9K^>MXP_N78beDm^D9=~CPd6;G?WzLJh? zV7#=p7HMCLe&EJBkiZYZNJ6R0s<h%9R>Q%t0>cUnD=@6UumZyh{QnB@)AO9VQtED1O4vj5zhrL7 zyTZ?IZhtx70p*suQg*!-b_Zlzl3>S3O-0+ywwvqRf>>hPaZ6U2SF!8)=Yp{5`ggJC zCkA#*q3io@=PtJV7==YJM=*^NHItXFK?o*Ym3 ztEv`k3&pnI1y_|aYU2A|^`sv}(Y6y{VV}d;*`LZvSe^B;7sQx0n$1V?7887!!EUY{ z2Wx9IN^QC|1sMP1>uGKC;rpQ%E0APH=c{A!S}Kb4dE@xE!XBsFLT$&N8@6h`5{If) zj~g^kX803Af3MA{Sm#eUm5Y~FRF(FE4+hN3L5&embS~Yxq)7j~#QV6??b{qTq1mE2 NWWLQBYuA-z=0Ccv7m@$~ literal 0 HcmV?d00001 diff --git a/Assets/Materials/New Material 1.mat.meta b/Assets/Materials/New Material 1.mat.meta new file mode 100644 index 0000000..3a7d582 --- /dev/null +++ b/Assets/Materials/New Material 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f3315ade4f14c740a827cbd008ea14e +timeCreated: 1466817392 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: