From 05c5f9ff14074e290445150fc75af0c598e47f96 Mon Sep 17 00:00:00 2001 From: Marc Chapman Date: Mon, 12 Feb 2018 12:35:01 +0000 Subject: [PATCH 1/2] Fixed defects in Turret material, Fixed TP Ryder material and added a spec map --- .../art/shapes/weapons/Ryder/TP_Ryder_S.dds | Bin 0 -> 32896 bytes .../game/art/shapes/weapons/Ryder/materials.cs | 2 +- .../game/art/shapes/weapons/Turret/materials.cs | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 Templates/Full/game/art/shapes/weapons/Ryder/TP_Ryder_S.dds diff --git a/Templates/Full/game/art/shapes/weapons/Ryder/TP_Ryder_S.dds b/Templates/Full/game/art/shapes/weapons/Ryder/TP_Ryder_S.dds new file mode 100644 index 0000000000000000000000000000000000000000..9b7688e7ef964d790c61cec8e7107a0c3b1b659d GIT binary patch literal 32896 zcmbTf4^&&%l`nh{@Ny9$R_6`1n77hM)YM1>yLcXTO&=jJA+J_m(v0nks6oi!XKF)Z zdy>c^vO%hn*hD1p%rwN)%s5fRV8m5GX;bP{1mtHjwG%r{I*p9$SQa%-jD?Y$KeC8G zy5DbKL6c_QtnXVNtLbm;bI-jx_w0T4+5gV=>?gN^5UTO~zf(|axz#=tc{@(ojfigT#%h)MGpSySfBTRJcU4CBr ze)MnEsF;|HyDQn>jlXd^vs!=mh)Z1$%9AUL;7y5~8hWf|7xicI36d-M<%FrHW zg#$DXf=$>#7`7#(`LVNzgjyyNn!=|O6H2?n`rg($m!gGpI4oUuMKi}zli*V|r}Bx` z79g|g^?eF8SMt*Fu^KLe)!|PC;p_bwzr)TkmcO#M_iFX2GVj$N+;>aGsSOqXG&{!C zRC5nH87r=7;gXoIs~a*H-(h358X(`qS~U#FgTKH)uKZM44HuKK!kGw4 zM2E#Pv*D2DrB8jY&Xi@adi;^d4-2CLq0b`>U)wOD=zH1o>zT3vjbAesIIHVZbRFpU zbcyfDFY_Pl?})Y+*QhmvzrM4fxMt0GEI!;WY?67!*o{YW8|2cBZx3)4-?-z*k$=Qu1^c%RXk3avUi;(6hcs7|Z{Pc)hg{%)d1ZO!^7wSb??8U9 zrzT51w8AC4qMIq3iC7nM)>U)AblbWIH1}#wAFxcdYHHO#_|c9%Me3}A1D1U^4{0Wp zE4(XK9MrUG^eZc-4{Ea2^NFpgBK3sQnds`827jHOL>|rtzeRpBHwzew1?sOT`xHXo zAFoX)TNDY4B|&_@F`sH{0g927*vwUP^NXn)gnFaiU{|QPJF3=KUEM%(+-Bbaet>`V z)sTnYV5q9N<{phO+cR}_!$~ExrHsWjF2#&!Cosaz%>)(@^d2?)+ju$!hv)|sj z9qWeq&i$_?e5gH5Khw@f8M|=lw~wUh;db6b{oZZo1w!uYGx)1tD(%*5?W2KM_(sNUN z(D#sEVJe1wf_9KX6YW1=uha8afDiHp6X~b?$+*52@*sF}lTYG4-et=py=gUe)&IlO z)5=VqPyYP5X=O2<`*%-gks$HEczRVDpSwrG|9TWpK>JtmzaQNpwU_rFOykis@=NsZ zpR1Mb|93ne(-QdXIW^m6G+JB1|K{fZQ{9U7`p%iR&XE3x`Y&I4PjO>~U6J40+uK&- z*35Y3KG#&7E}J@Gcjc@b&=?oOH%^z`tM2HSnQzq;sl8`T>52bci;KGl%C0C&pDE2d zg!aVF8&kE=3o~tr3#%Y!iB!iTt%L8Ugzd!tqM|i&iT?>pJ+*u1yt93n=Z@6;bvyKb zq^YZ}27J-~NFO5pFC4hpP|c}1W^=0S(ElqdSFT(dZ)$nmUq#}|>(>{z&~utXT_M^> z)?7{`TtIPVK0KiWe*E*F6UM#ooRaXam3L6T7jFFfJoFJ~x^(fg7KNQV9UYHKav|-H zEu657en0m08t!srcM9eLYpoNGsj(lmJ%6m1=${??SsRTb@0O8~fem&=dBDV<+Q67) zXUpuV4b_|s`e<5(eGQnUmN2j?jl6_W17EA5cGI75ho+fhap*BZ+;_0-&#`s6UDKj) z!Y<(|S`<|QXiDsZ+pHwNeTr)z|M8EfVb47D&=1a#-Gk-$C;rc1ocZWKQ|3}Ixu#!- z{mKgbz^x;r$&bn3&#C854u3IfB zcP;e4b$`k^t#m0SyE+)Hci0Qg3Fw2kKO&!i{y+2S$;-t5u8WQ5iU0c=tXo^a_Zx34 zMv4C+tI%eU8CsHqB+dJlN4GpmcEj=G zM~;&m#E!?&-puXX*49S+{`tp)pA()sboDCXOJD!SOT_>Ay?bvE|1YLe7im0#s~f-D z!nxgrPQtJtxTJQEAP{zKZL$!*cQ@6U$R7D2CV=Q;{eyfB?2<|`Xu|k7M~P?bD(3aW z@&G>ozVb~w!z7Qq+2^3&4HzAa=$HXN01S1Gy9mvJu!Ard3~LF+WV&4pjY`+!`gDIW z87XvOJeXgM3+tvqPS1nA*6t?z$da%+Yt?G@IL3DndgyJS#Q#{(O30#dtP|jZIXQuO z)k=0P-UM<+_g&HRd<)*|VoDUT4%x~W4}F)uK7i-RlRQuMr6iZ232A?{0kaA~3rqcd zkbAmsc!@?k@rzA`q~EuBfX=QQ~Jxu@^tE2?Jh!>d;hT_OJa z@A^g`?%!&;v5oYTKDD?w0sUkU9ReY*_t+)*4J^1MG>B+#!Se+0hcN@MKS1jruLu5T zu!w{V_(N&@xx79={YuJ5Mvj61+xJBMB)5*7q3@*SRu4H=v2Nd`n>22hpO2-{gnp1i zGY@@3?VYcX-f{Vju-~gW$3jq&7nc|eFWo27`Y4QqBt9|u9hkRjZtvc`daNUMvFm)Q znyHyVZ^Ssk2mH}^j6$gfQ6F_8Rv59j8P-r?gSBm1Mvl9;*zK6dS%IZ>-_QGEXS%P(iCo4J2Gbm-Yu z&_`Z+>5i;|X0D+taibM_OJ8^3dRD=Nk`JWb&MN3r#KpcsLf-1LlijMH9JWbl8U+pe z>T)5=#{LFz+?#>-2n!LPqz|AFi1zs+5t7q#{Lwh7hK9yyeZ0S^t%vyO&_4AtU4P@; zmO5x#COCTo(C*Ch*BicPhyGjmhd+ES*}?mNXdpcp`OQareu5c`oQ-_c%&A!T^;8%2 z_r10s`V#XvZ!nX8V}?C9fOSds;;AK^!T!Ui>`YTZ`p06UdF6cq)(OzRgbUgF1eJLN{Hf`|UtO zB+bu2M3DH(M;vKf(5A<;5H4=P`|%5ICSmA>0YX@N+U-zLz z^ZejJyys9}>EJ2sOT5e*B0JtXl~|a8y>C5{vbNPsD3dRL{`p3r>6Q<7=xQbufo~i+ zGJt+vQ(;S6O;&-~ol4D=6{!R4mg8-RC%g^=ysf54E$~5Ltr}`guBj+ehj}xDe^4Oc zy0!xLuGMcN{mSc`I@I8Mgx3o+uE>rZy~N+j^09K#Cxewkm9WDU<*`_R>`LR#zD(lZ z7HnL&P5L9c^4He}p$EC2|8C)PtY6Nla=M6)M0Vdx_}jB@Mp_^bDeE1_i0}K}-?xu` z7iNm6sbE+y`MsKoQ)Pi)xQ%4by?c0p-&g}b*;5ib3;(XF#AEW*K(6Ous@7n=c$hG! zn^xj=(zNgez0~e_1@p#_GFJ~_n7P^sBTQ(kAXK?Dgu_gb5bZSYe2TeGm-XR3n;^vn z!b~^@yPEouU&;?7PM`*j_Jh>!Qwijk@d<|b0rs`3nXpF(oCybLy*F-of05>O$JVWU zGw8A7W0j=m0x?mbbzM|cS_(Tv9UB!^kbT;4A#sD`p=;;PDGuZN_~n;h=D@E*hYla| z=&mS_99ek>wKrHSH$1u>nsbjXUOZLSsxgM$>=^u7lQ{n(p>_7{n*(LF>dslW>>&Id zy=BHp_V8p(7$*#*X73{ZYVX~5-|bQ|rtfI!CcebtfiBvI%h#8$C;pF&m5&V2yaf1C z^1HryIlS|${HOaeGBaQms@QGcJ;4Z_PT3mb`|j3fQ;-LC>(rf)8#VXVFTyD``Y&GG zvL(&`Ab$$$pX_<^+qxG_0rJmmVLnK-tRxmaUDm3W`C}s4^-l9sIj8Yna^9P|M(unE z`#B~HT?j+(DrdrO zvKtlWF1EOS>t@h2n+^Uy;uFjTd(8zDU{Cic zM&;iN^wb>G@PhUg9oE18^wbpDyGE7h9MItRw0`%d0wV5(c?(P6!ObSKwV)2gO+q65P;F5Exbz4V+yc2G4|Mm$b)*(+w{dOcYN*Kic_XLMO= zuJ|Ix0ZAA1{H^!l`QAZ34~Q@~--Gput&6{oNKvsbf$`Aq1n_&%I}R(bPk91yx@CW# z;xB>x+lyMEPyW5(QXT1)cz^OJ=?|;#yLaA;br}%8afsSGg+p%<1};v^iqw6|^GtA% zz6r`lJ)~y>Ozxul^qdebQco)z5H`LSG(SA7rG6&2qZ{`rLOz!&tKf0P%PzrrMLD6A zt?`r)I_~t%XQ7|A#1owcZF4%Foq#08l4J1iCzPRuDE6glPIx$s)@tq~AGS{@RWQ)H znbbby5vElbPf%QQ1=u(4>!$kz;ka~PH!pD1uMi7|ko9WWD!fl9XN)o2=>OV_pD5d20wAHPfeY$+?&tBSooeq?f){}hMo&&$Z9 z{Y5|Nf17af>aH84k3W2D|91%=`rySitw7_E;Y`r#OQC_s39ZMYZ_{-#HtVA6;l~p5 zBpzn|+dB zFLc$v-vT>_nFB_$cfMEJJ4yD2;L&7b{A%8sz&?{z5EMNak6p2)aZ95e{-fL@6cXA5 z2S@jHbcMAPXQ?`#e4W~bA@7)kK3_V%AqYOA3q9dB@~hopOOSroedq96aGANrw{#FX z#Grw&5OEH|Zoe7!7_LVR5>4$b>Fdk=r0eoj5Pln0yU;mFXcN-Ux$IBh=Mc>Sx=)LK z((~{fvY)?kWF%j*5BXSrJM8gf)Kl1l{RHl~gK#qb?&UVxk4%63wypwp+hea6qg`V% zj^9S@hR`_d0N8aet#J@e-kj~@)Fo2}zni0={J)7T~p98xsf21fs?>=2cVEhe!PN%Eb z?+~zW=qg_HXtD3;D%K!QIfwo3UF<8g|Gli`r2X&HVtatDhr4Z^)V}Bw%sueuI(BZe zyaPHpn3q7^gBhm46Kdr$eJ=cyxfpojUEMdr$MsrZ#jOWNuP(Z(r=b4Ch29};H2F*kl zuIxR!ydVBYY*B>UEYRPuJ4PdzKSJ>mp;nRu?8{(0(M-Okihk$7#rlinSO043)&~!k zsaP@=$fvw!Pk3u1#j9=;8w>*)6-y*$pOO4?o-aKFI|2FgsnhU3#PyT#mk>XO{Ym|~ zV?5{#=92d!Z-(ptQUpJg{GtxnVT7he8aEGpMtNbLHx#W(x5K`XuJ2vGP6#!E_$Ff= z9iMQpTEPCOER73@M-e^x75r1XO}ZW!g+4{UfCxPdG>MX5MmUr9p9<6U5hCJaX}`;X zd@jTf{s}!_WE(5ev<~qVqAAYuf5$)Xx7@#NssF|$-1VpDrk}Gk4yQCeUQCZ0Nc_S3 zGLkp?J;Ff15BzGK$ueEdA*^sYysU7h)teXt>Ofr^igXzc3qrTY; zESt!1WLQGq>@eL&`BaLNo!Fkv*NS3NymfP*vS?(azqA1vNU_uKK!Zzxbj`zGeZN}R zgKO7{##-2$DhJu6kYAO^XOq2%oivRLOBhWft``+x#T1JCHBB?*KhA5{wQw@6$iD); zTqqa$Pqstv!ruJ*h6x3eiTv08_nS%%_Ux4|> z_(mf{M}~(Zl6**V0{JC5!E?&<)AdJ5@V`xGS7aj}>CowF9G=m`4$#~7?tSo!_xVDu zAD*|s{)GH8F;4o+AS5OG)ZCqd-H5yy6GMb?CK{G7Zl`v^FYRYhd5M?uJxRgi$G*so zA#*@^ouEwSAv>uP^;qQZ@s8mnVW3+G5gOcrm`!;AI64w?!q~Uyx+83)`$SdPMEN7p z;R_OWI%g*--XH81f>M9^Xh1@TdsNCNFxz+^(wcvXG_rBiyALnOzp8g!A{BCc6_vpBaOir%3u4}KcURuzS9hBM~ zcIH&5xyHsiBjw+$7RyfJSAYMG-D>a;%fC)q|41j_jq77$BJ8*fcC5EoYH!=o_On(s z^aIc5l78TMud7YcYjJm4k69S)x44eDxYVzX+9cRbDQY8zW$5%WNgMc5B@{$GCiHJZaAS^Fq6L^*f1|d7cS9-0`iHV?SyJh zkO|mNRm@lD0b-v*fT0g{B?2c%{-q!nq;(dt6QVyddTC6z`(VG(Iz(7oLi`^8rV{rf zphI>)*>@AjKLP{PZ&c;Mb&LxOo$M0oNA2OI`+c~d=wS(QpGvx)`J7>C-xr($_<{SK zJ_Bhtq|cDY14EdD-iv9q{{PSXU!K1;n_UWzru50Y%{?`K@fZ8g>g4ODPSlULBOj!< z35@t*n3z3%h z_;I@Zkw>Y&On3zKaOf}psf1tj-@MfSku=&i!NZ~Fr=RDRFF)^VOV9hA^t%G{N~pEH zx}Ex~d`s8mH`>#`TekGvhnFzjF1MBa_{+~1Wa-}#*z)t2ak>9552!dA&)0seCbX4q zhCa~mwUFN6gM6uEFPY$9rs)TlXxS3ovBdu*#mTda`up49&maz`C;!-)@EXaVou8lL zbC3tIroM4k>I08>fc^=+)AI0MbogD`9zukU+lB+mYR^qKJ-&iwK)*UpQ zYeSxDai6|!W<#w;6}A}354Yvs5%{>>u6Sl{ZVvHr#0{vv1?$+`KXM&;946Nr5kG_k z^6&>~zYbWhBcEln1>zpWljYvIWa;KC#5IkfJRtg+={h0BF@eE3+-I`|#WOn8zla|u z&w`f8jpE#<^mETHJ>OG@$DD>+dtFq%X9Vm<#E6-Lq9`Y`aK7Y zD@$#g3Yh5qCLVf-e}%>=GmF>1^8B;QP+@p+C++z3FN={E%mjUY2}LJ zlkj`9)Fo@j$~n{>xyMJXT*W<*$Bw2aktdn47@=RGPo^*Kn}eS_H1rJOxmZ8UDUcmm zE*I94+@_l1GRo7!uV8J6KSTW>U%N`34Dhy@4LdYiPx9G~$lIih`Vxn(mg<$brG6?6 ze&5U+kk4I3`P~zzupSCMgHak6`mab|M`gASaU!1AZiM{8eZzCJ)WHBhMgII>{Ka1= zHiExaqdr%I>oBivnu=+q*%UxthtR}|@w{Z5cb+QSp(%81pCCGA$c-2*=IVu>K=P>jug^DZOf@?4TxLHKNXImAa$Lx_1KmS|jRlu$b5jFHrqk2Kz&x_xU2| z`{Sj(MYnFwD&PYnYmf8~Xkud}vLi>`8rf7w-JXW*f({gLw2@pCtv*iix8773^IoJ@ z34Z8>X_e)LwRvY?2a1-5o0j#+eE)>vp}A-BjvR&lfxbV2h=0H5DPZ{j&oRo+{Q zdU#R(JUj{BCJLWE*H&Z34qV>r(D8m5d+ljmO(56F%8yF@w4XhfhyE$XAI1GDQTXW- zni```%YF8orh@8osXxDBM)legXE))wj`yENKj2TF=+WW%vftD7@G$%AX|93~eRtjO zpW|v`xv#R{KX+ymuDk#7X%G63%3gbVmhMCQ#v1+9n!>;ArTSmSeu4XvayO8!3qa~m zct%3$ey5B*KZNUknZWlK*I2`>`$5!^8ZCP*l$WaCTGvVOX5YBAVp?TaXiEG0Xx*({ zJyd$ItWUZ1oG7PyS>C#qQ64idLk@YH*}z4Q`!&dC3iCVXss4en5xuva;)`pGK6~z< zCJ8^`JH2OVoX%g;`@)cU|7px)3c2jwnGH1m4?m%1db5Kg+;VXgx(|Ylt2h8ObC46*EC_ zP}dL$l!Q?avf+?-O5(pip%th;3}Y|Wf!$m^xw zO$J6Pub~bhnT)I;eZU(nZ!hsXxy<)vq`XhgGdVe}sAFj2%}urHqJk4^7~(iZYKupX zx>Mw7L}7;VHR9s1K(r`&J%qmV7kda7_8SDc?${l)Ur`kmBvT&55wZ%Rm*U?b^o#|u zi)0maZT&}Wwt7`Tv3&S@ln)X=^*adtqF78A^;@)*ZyOa2PVx_5c;O{mmikSlsyK!C z)tgF>;QcGQ{?UK~`55FO4SvL(vI-)jzQ`5Tssc|qx+jaC?-qQN&r5_nF2dO7Z+x5Z z+&??qK($dX3Pg*?g$8V*D)-FA0gV|(B{>mpH>i#>;OMvQStD-npFj6f7ng&zK;5i zy~Ouag7RB-MGWygs?W>ZgSa{5Ag{DCb_V`wGPzbm@oatlHro>47nk`@^%z6XnKu(e*L&jst@`@_-#B--8sW?JAl1@VU*++Va!VUT|ViT>WK_V zhm879ih_y|@5iXVo)1P*7X|xaSOtH&NF5Zz-GpY*#}S%DE$Wppeyf1tXNgd`|M2cv%7gy=p6{*$t@QuZwBsPo7j^Er^4b9GHlZZrzfc_&pY$NU z+NWqrgk{Ch>pX9f;=W)%^gudJL2_5#Yk)n#SZ40=Nvg}jet~sqS2S+zGA{SiL7rj% z<&pnlguZJBBLAm?J&oTPEhM{|_iIm+Jk>Yq_2h?`O`3Ys}{EUrLMubJk5LLZ3(1 z()qFf`JKPop0n;vWhlA(jnl;Mk9cc>bTq!-%hf zkmw>mDNt0De`eFcvRH1eXU7%Pdq>v}mQuV%u(NFx z$KX(TN_7fy?XDs0b_mq)@VgK(@k{Y-)K{d>kvaV%lKrwMrX>0KvfN90W2C&4&fjIP zUq6|*SqHl_V$a*Wu>yHz)L8*VKkBcj-B+BZU7#H`yeaIszG-8HIdysJfreum@oGH# z+3lJNQ=DgqQP(3bSodm>2e;X_?Y+Mtry>~QZF#8kniR<|f?e-kv#JOCz*e1;<$!Oi z?^w9rQv-hPoBss$I0ctJ-gt`#*B@GaN0R*Om&DXO(fclb`qnGDBK030I&}x?;0jJv z{kQ$Ez`waejJPSEYQ2*9<5}1nmwtEuEo&ND)upTNci4nl1nC~FgJHbK{- zFdFNi2h`k*<>Do(e@`Z5PCDml5mg*nqakD0&K96xG2~OeqrCK+GOCv<&CAPsb^8Mi ze7HD#czfyQtN-#pioM(SH1J6o=iTm7G~(|+=lil8&^{!OWFkL*$4hsK(Z?s0Q8739 z+x^GNFg^Tl_a7`1gN!fMRdZXBNF{z}W^R9k{GIyVAuYTVX5ABp|D$HvBa|mpBM&(y zQXM)AGC7T3Fgvt#u0ntV(u{Z+GczV(oY|y)1}0EcVMV{yOwavJd4Avl*oCr;yrMk~ zw{E^PRk-eOL*8cpueBa8z3&IZo3aAey@FZ z!`NjN_ulqnWjpt7+qMyW!12mYyxa3OC&Tvn!wqXT>!S|mobFiJuYUQInR(;FLv2%H# zgZmcuQva?CA8-8Hk6Sf=xPPF059-5CRlPL%wI3hU9O>NGxVr&$vx~p4KD@nEBg#8mM;$rG+Z>3W0y(Wg%BIZEW4)-kqVB@NWqvwfALc#N zDfx|9Z$QlSmyqlR%2zG-|Br}uA8u=_!TL{%UMtnlj#qrQ`09qAD3XJNxzaiE1;KWT z&XXs?u;My)_f#M&${(aPa;QUV1Tatx3sTk@l zcVPdAUJ}TT;!`TveK=Q=a7xIJI-JwW7SubtojAwD8528qQofY0ZEmK0Ys1eBKh(h= zVqP&x_2>-sR&9viAg#go=&}oB3rW<=6{%&`NuJ^hC%TNF`xGmNVy0KXMtIgFMx_ z$`&x+72i^?SqSp&Xm>|LptB2Xc+OeK3F?3l$GTU&CQ9+Gdo^y+UT99C*dd?oy zlTp2=c0muszP{gTruvr-OP6$R;ak7F&_Q)zGMvvP{n{-Uz(2;lzUW^deNZS`O(X~1 zCAU}7{wW9-wn}_W#^Ms1*{oEj$$LiAX!l5H&!?ulm z;OltR;di(i*r75{vKa9e$|Dlmv9yq(q8`Z=c?dDo>n~y*>Z-9pL+=3ymE` z!1vGbd>_W0EB7M)-OM4q1f)p05R~fTAfOTo;Q(Pb=9lD!Il~5eznuw-p5j=$YH8o7 z=Gxn5Pm(^!TyeaK>|?i>iFtwCiVXV=okJ`H4U7`q%q7glF~Yn&r%3yW+;uKSzq4%{ z@>LkeB(I8Q7q}Eo7wYs1aALrI$xF|B<5#KA=p0L~KVTwcE@Oz$CKwEaGHozP`6{O` zpeIB+#Y*`qd3Z8OXp5SWx9?MEeVuW#192=D^@NC*=87h=6P?2$&{F-Np4I{65cb?p z6nOt2{eD;Dg(_PAUB=0^$iuMYpq&wa_+dJ4SIuqec<@2gxpP9M9C2hdSGj(yiq8Gb zZ>_i3p>G`_K1kRt@+Lx@mzZ!5h z6&3i`GnkwPe_7!$_=R)Ef>p9Vy64ZmaRvN%3;{LL_iIPCY{UBJwm~jyk@pJ3O7l*l zUF7v{()SL3oYC*eLOi4Xz927v=4?S8?J8D`b{A;Wdv)V{9H)=vt)PDS2%wT5whe(p zy1vy}*o|3Zp~CLM2jFkxJV$=nqt&bq2jG^^W6?PP%BK^mmQc2Y2*{w$6X#*DFHqeV zzYwYF(ZTMD4aq&Qqu}SkE{A^N8@EyZQ!oc7`+#ggv=Z$KgrJY@ir2@6r1c~?Qe!0l zi=*)ntt&x@V_n!4ZeiR{=Q*{q(Ey#h`i0GiIvKmd=Mb$DUiM4IR$x(HkBiIS{qo zhD^*~Tom%9`gl=1Kz1Fz+aZ%s#W4S%6YgQUKj^Y|6Mu|}?qd8p>OTY<@jrj$>f5A$ zQRRWUtZEiz4xHCT8Ff#%m+D}w`@}`kPtW9f#z`*T?(tH-j~Q(Y{&F?62;rYewCWhnuNaLa*NAf@Q;T2SkI3&CDL;yXOe*dY0%KpjzD#@DDL)$f@P5Rb z7OlLI_*%bp>!xKn_$ux|{eUK?vNXKu9*wtTDB4!jryMEG>DgG5!EA29atPytevYLM7hIUf8(Z`N+Bf4zM@C=9dcpDXpV&7L#@5=) z2vL`^ge?+A*>d|b)Mf$y1Ab5lHVvlEVs1NIHzCKZ}=I&+@;kOQw zhxNy+)*jR}EAF$3(D#^MW8FNRtIr>s^H6>T;x4-%_CJu_xr7v-BUFJcqMr(!58gj}iE zI1teuR^mlHC&rC!19lhF8czlw4c@K^^~V^Mtb*?+~#E$l@DNE_qObWRfhKq zngXP!Ru>gz6JKm6PD~NskH@Ya-w1n{^0x1Pq^{=mDYrYNY7WHw^4z!!Wojauy_v?` zxLu-`F?=&kKNTr_82&K>wo$zJ`;q32e9FyMN2(QiYunxQdl@+y8Kn2l*IUjL|9!vc zw!6??* zZ3uD7vpUXajoy#E^1rgT`}CCmWX>kk zmBJs@@;vdM;k*acPrdQ_VvO?Z=g(i*N^zhy-UTc9E&95~y|nuO@cb;~Rn3aBb7ZHm zUM($c7Vw`tB50qoW4&dsEw3VeoH%{r1nN+5-gzPQ=twiZ6H*>{_}t&L6{`gOo$+S7 zR_+T#BTxL4^vP|}C;pjmMYLbSNaSB7oQvGkL+!78bj42i^heW#fny)qEzF(bZ;7Zk z+^uW3((mQqkADCB`S&`A|MqUzNs0$lRhCvxEBlnP%-qZ@#2ZbqWPr};hK1C^S=}*B zMn(?mT0FW>|Gw^r*EczITGXc#_Kb$CgbueDB7Qs&76Wn|gG@ z-mPK8yVZL;9)9pv_^BCB<*0F9re>?whwH16NAt!g)Wmx~*`l>3}+s&NC(iW};4qgiw`k=q^u>t?<-!^04|D11e zG^^IG^~PEpEoCYgVuh9(RQd>fjip6nBeWA8L3^P_WgF*Z534mcRg}NHD+76HoY!`^ zl&bD1@3P}N70B~0@jrupzoTQmp7hc2+gBcUf&Z12m8H|zj~t%aDCvKE>7#C1S;HZa zGvq-YD<^00Ez0xD&i`Wxts~SkKkw1C)y%l8yaVe;ykz19-L9I~9`}rR!1t3q^K}BQ z55Ib@?hMW)*<{@5aPE~V#)3kE_W->|VXVp0+g97-sex&#K z8LaC&J>H=+cpko2v>(5xll#}+M(vju$3UavyCwqvi>q*~2~BPU8k+R_jWt&{2zQ94 zjWx&04m5S`=PGt+R;__EeJ#`!MS0i~{trnwu1H;1}{hdcO~T ztlx}-!Jz#}oDz;=KP6n?McBo#E70%D=#ywQCz|OTI6cRU=Tvip9>GETPsjQB^Thw7 z$B#<irj>gy-b8)M4$aWoTs!e^;PzhL0lmHcYRo{m z=6fYE570H73K4B{kH^kz(p2DBuC)#Mb@z!d>KRUz-8S2HKh-z9;=38Ty5U$^@heAq zuWmS4=AKV1{s#34#zz;Py;^;bMt*ow{HS_b^}=1>TCrO9o9eZiO!@!Zv|9J}NjCAD z>P&Uxfdh-Hz~8#2z1-vUwn6iG;=AA$){tF@{kdm{#D5NPhzaH2&(9!VfjGf@2!0sO zGwqo~K5klB;*a6`GA_k~J6poUSFk_P0u1m;%zrifjb1<5pFLGp*zfSeIH5_he>h)& z)}O#df>Jy48>DtN{AcLG`j^^m3HZmTS7#-?Bu4_9GLpR%9T%VK13x=2grEf=XA4F* z`4>SWzvd+P+JwNHwEq1bkF@@)DyxY9v%4R``6|Q@n}%I9?h>u5nA%_4Ki@@sHo%ghoPih66_tzv* zH%8~>J54T}_ZTP(i46IP(`BN_j5t?YCWd5)bDS<)5W68a$21YqhB(bJO+u6zbXeah zQ3d&H)kMW^toK%p7;+-MutS4v9KK%#v@-qobx)R=crE{Z-Hx)RQRctavZE|1YQ?u& zKH8X!F+QjLqiU;F%l~N8J!Sg3E&6*j)2glKue(=)zX|Js@G96rrPi2?{O_g_kCy5) zD%X1a^u4FW16#I`U*@)q6q5hq9dkIye;*c8cCw%B(att0J{AAY`g@=ckk^-!U&0&1 z^J)Ks&IzfwEp_^v#E(ING3*n}qqW&+zYq!wCEV5Rq;~FyZkBEr+%oFlWC?F0t+IY? zN=tH;N{L#^<8=mu-=uTad{ktIuhY1M%fB2s4gJM6HZ|7Yjpq$~K>Sy8RVyoR zCqAPtGDWxm2UDUGLi{A;^upFAEBP_G&v>Q0*Zh3LEZIGUE-U7N@FiqJYSoVDNFSZ& z_nLUKbgtiQ`X;sGykjw;YDP>@f9zk|Xq_;37;!Yzg}K6?)BHNe{U*wDMg3+s<iA z9{i40Fs-?|F;g8kJhpd7S*BVLV}Tv0%hLLfc>6c3(%j6vX?(J5l}7K38|b=`B|-;r zJs^);kD-1h$o#1Ls#Tj+Ap_-Mn(8;>+$QQpwuWD&d~^){5~1Jwtb@kYa<}f}H0E=4 zf29fE?Lr(!jAde<*!klw#6chj(Ne^dklzw#x+tz>5*^roo2hx2JK2H7%)VVoL zGc)z$MTa@v-W{TNXH0a(>35RR8-Gwd3cqA@H1o5kQCAa0V2kQ+@PPl`i+s_Zu`{`T+DK4wlWHjw_YtF9w1kNS8{J4ELYg!(PgITbe?K8njg z5dvW+0BIkjbKCHDIJRhn9z;CG7(;vxl8L-H`SAksfD-KqiS#?RTgGCP@7nLl@U#Mx z7NX6z`N;vAj^R(uWMsI0C{<&3cOvG(;UeKEGWKurX z*p;x6yo5%dEhhQm#d)EY@aCG2YO!7ozrO2^TdQf%Sr8dx3k@AFAY9hnM6~{_Jd*H2!UkQvURroYEZPcjApi z1a`ARrE&?BhxQ+@93lCxscF%j(P91Z{38;-4PJ)tC2}#*UvVq)DQMq9{5~*0{|Uv( zyrq?uwC;F*vdNBhm$n!F->{jpBkV$c?d;% ze(Ae@^Crkd%! zCbxbc(#nG7qbmrl=6M^TIdpV|9q*sx6|j#ZPHqk*$$mn>B9v8txF&sf5#xp)!#Q*0 zcYnQhj^v>VA4Ys&Gt~*?=YRc~wi<(&nD@5hyR-|;b>opUn|ejr@b8~S{?oE;FU2W7 zG0x7q@Z2@=VIR?p`uPOSBTg+Arm?ttiMH7>4i;CjG+n4lqtH$Eog+|%xX0bxnV}vz z?c?L(;tf0O0?r`}6Ur>@0%4Ih|HCD|C71a}`_fo{(Q2x<@pL8Jw4Yh8*=-bW(;r!Z zbKdyg%7yuP;$Q#J8Q7`NH%PcH-%n_i&b`78nVE5tekxsEy1oc{aR2_WK=%#%#fyX& zE^W2mi{H!3&d#QFJC6^Q7J+srzOfqnf#OJKp@ZVvvfR95RJT}?>lr$Q`bfcEe0&Ca zq3e@`mFiTgws{UvUCNKGsaeVk?0fWLqaEi?PAAWY35AIF6Plm5QD$&zgI)1&PnPG? z_W<0(!>>&JB<8E$p4~sL8@1V96ouf>~TfXMRpkCcu~I$^||;Si8f5Ar6u}{LnBtN%8G` zK42z!auhyQMEq@P?0}xKE3SDrNZ&&)${sj+5PCAP7vH~xoXibro;e74NQ%)C(!a-_ zf9?p`TP17#{R4=zm3)+n5#Bi*=jnSvVP7gvcEwa86-R>$|x?-#g03d5Ke~zo^^N_(QVWEQx7cZ^lU$yIex1h5oZE;^qL(uhAEOiT`;ew~(DNH6IqPsPLT|{E<9}bIGdT;me%8V1Mk1IbCDp zmb$#nXLS`~0DAbW?wciJ;%oRm>E3NECuu(38d_aM@nK6_WJa>zhbk*++^TL4>l+9l zv^lyRgbtOXSfb@_Y25BYxkTGJhmG{qKYsFw^d5BnkG{u~otKfpRb1V$ZSNCYamCDr zs*>U8M%~p7Rg=lbiczn6MU0IRe~NA?x`p;laa7dOK4zIYc{iOe&Ips}Fg9MfO37R}4Td)Iu~^LUx!KD@~DH+_rX`k-iTw)z+ma z{v8{XIzlB=i*Mtm)sSE9v{j*`5-{Rae#ZEf!HWKK4iS$i&wkC)8yIl+($_E)_;Z+4{*=+y-d$Je0X)0#GjOPJ=G;<$YdPF zKc33#M;v5k!}N^*gYN^4@%={fpMAnmlI9=VSrM%#eZY7Z^s?G=`SKL;slR`$9Da@R zRv1J?Z+e)%7eslN!AOQav(t9|D^w4k6Gi$uaf1)1Eo;phO?ngR0C_l4ywO>zl zT4H3y7)FP@f_@9-Rj^)BM>(Mo7B7DeJ5$;1c441rQ81?w_H#2g)fC`~-nX7b-5zs-oJ=0XbLmsqUO(-TThY60sX^?AO} zL%-XeT|oTrskv5m{S9+nJ5XCS-bwK@?PxUiUi-$HjrZMuKg}DK3)V{uXL;n)F#XOO zFTQYr#`DRiA4lIr`&!Wo`yT7Z8i$^5=2Y62$q45O`AzJ^&&Oj&e)iM66 z0A%j&!pq3ZaPtd)d}l&Ajd<&@gXFTQDbYsrhxo1Vg*;3A5B~)Ez!)-yNG^Jh^kP2f zJit@nKhAZb zzWd%<{+*L}{(Z9^*lB9+^33I_35@%lclxD$Kyc7^LRwH?kwyUlDWV-XkVz=G9BJB} z{?3S??M8mguDBib6m-5N`h$T_Iru+A$1gtEhVv<&%pq|X>M%N*o*&+b_^#*L(6{LO z?M2x|MaRJZ#Ewj$gu;1wzjWPU){Ac{UGTHq&JQ60)=qt(57#fe^v{^DK80C4JOlYvSZyp! zzw?t7DbpcMpR#f+5EwxGNWZ1Af%c`UkkyR*B-ZKtEb;MIzw!@~9B7?|4nmnA6cXP} zAyK63_KM3xM5By8O8J#%XNx0}T*Qqbx*ksX!iVs@C;Rhzix95~#U~eOJZ&e19vVl` zwD0|8zDVDN6;8Vz$2>O~jh9?Ngl|`pyyWDR4$^%#93+PvaosAJirznUrg?u)#hb+c z-qV^NsTb?c)sg?&GdDST3jV8hd?9oOb&wl3ru9FTzob8_{2?IbBejS)4Dxc7BXN=g z(Ykn%_zdeL&2NaO#CJgm+wq=)FpPG>>GXA1k3e?B+7({^Rp`@sWBp~W0_W*o8}eM; zfbWfIOGTW2DmbYN3v|xvtynU3mH6M^kMHQ#YEr0+LYzgtbLZ|b$$2bbK-}t0WiYkf zj<|-xY(72(dkuDSs-#u(CgMweHiLbd7p?XI&6_~cb|{Ug8%IB@I7M|XqUc7vrcV(| zcA>5p_Jf|cN%2lW*dqB?g{}aN+mo9MJ8)Y0w~y7<_9;&))@ZeBD9(U=``>6@g6H;a zAwFsy{uH6$MtLOOKOS9(N_2Egl7sMg>MGGGPsB?0`{9K(()X{g+i$xK-+yHlQQrp# zv7am^KE6iwpl7Xs_={a};Jps$fo1y!-vtK$n_)kE(|cDB&GUCQtgfVfd8K(d#Q&6U zbeQyrQ>!hW01Y!z(4dZ&*8d@VuhH#Z+;<4|^zJk9G1^~?XCwG-XszbVTN^ii@jH_L z1pcG$=*B0oU#hudze=4aJ>O+n_`5W}waff>&^Uaa!OJhj$d7V_tyaRfhs7ZMJ1lQs*0oW-0?WUY>^}F6t}Z%1c=GhZ ze#EU5nW8yF@hq(vFp)jBCLZV{zguQP9WLGnAL7J!d1}>m(b!4nU7el5IH4QgXQuBv z*^uDGeo_D$^;oFG#JLstcS>8T0eT?gPv;zG`5*2gdB`g&>ZkFnSX<>MyTqW^HGdv~m#`0Mec<#(Z|@L)wVWLL66yx@b#;Ukk0Uw3@!BP%`aaa*;rk-g zUl1JbfwE@BEtQo=590UW5Wjy6=t?9*kVB138~*SZ@{}iaZEceOS6Vbg{<`z@JnUG+ z=`LT^(R*_KP$ykS{e_A6f)8*727vV4p3`NB5Mdmrz#o<*{|Xt27{vwA4ueYSCrbR5 z{=E?L>rv1}{8zYv#P2OwFodX2#W`6VZ#uGaCFRqS;>|_kf8*B84JR@0ccu2jpKazE z4_F>)!FvvV@HXw|+-qLZM<_1%Lxj}FN&u$PnA%A6$GFU zd>_TR1FG*^8}%gVoCeu{6xVtqwQn*T=cyKa9-P;?g72RsCh0uz83@3a*Z(sAS65X* z57a0u3z0?Acizg%7{-D38z*_>dKRM4Z|U!fEu$Un%|cKcE>THi9kuipW52*(Yyo_FqSYbSf!E3Vg*UlSIcJl!`NJ%RHA5F0JCruDQ8 z{6ZF5U`Z+eBy>ys(+Y(F8Yi~lAjxZZR)u!>Q=>9G2jlkJ5wED>BEu@vH2UH5)W90( zFNSvP$HO-C$G<0`ErwqYeyp5C{tWeSpT%QEkdyZNe&D4%mT2utkzLcg>z#k2__eFh zx2^{K5a;~TdLH#!rTB~}UX|8)C(e}+pZ^exi?sejoiRPpR=?Fu$QwhbQ>^AX=VFLU zLk|p%5ZE7RvL`8+zCR}$E$0%7w>JXbhGEV&O?f1KO+6iqR`|0T3_uhT) z-QPLqo_p@O=L);S9(9+g;{b8)_~Pze7x?q^hY!Vku%-2dpA%=dMs|_P`r$GiFv_Cr zb?ZsNj$$0ZaSCD_h@3r({a`M`(wdPEIgfMu^LEUm5dcm-BzW2YKeY zXHQ!t?+^?gmQS7PMZIwQx3N4r)K)H6@)98(5%SSsZ_U<>N;X&Ulj{ZKT@eQPa! z&mSa?et&Qh@@|;9_2ONDe=Lzeneu;<_yzp^QhVTuT69tJi5~mpi7Xq?{5l* zC_nj^?qJ;6qPub9#;a2(|NX1EIpV9;mhtxL<3B8LM>B$+fx*anGX?^F z-$aMHm-+^Rj_<^JU*3lKBjQohv3Ldl>t%d<1ioz*{8GN0U*NRJ4-)x-e9!~@!6(Yl zd!pQaqL(;-otMfVD(9yPmGd02p7*y__-Rx*CE_Y1BpzmcdwW}(4EzEA;G$lfLVp$; z#xO2n9QfJu`(*s@rrgd+p5xMjfq}R#Sd%xX=dnI0YN91Jv}xzPMmW)dxbu|@*m8d7pK`f*(iQ1^p8XjKd=#L)TQyWw#ql6qYK0vSyHLqZi}Avrf*s&7JiD#= zW&Y32iR}-G)1utEU3&8r^yq_y&;s%A?Y#*50`_a5X*2KB4ZEsIWwWd!b(>_3pk77P zo3(nu4_-`kS+9rVoc#2`?6GT${rV`a;NQadMZheTaSSHQIPdCVIhgX#3O*Q;gxt3E zNbM{Sy-Piz(e(EAww9ku`PdGc0iS@j@7l$BCFvJ(4!#-T{U?S-PVxHa38nIUdv68* zBa7e1{#;VK{&Y_b#(_Q85Wfoh=)fC&^at$wW%D)Sw*O%^PyDS`dyII#GHn%npxP2; zK0y3B>!UazjZ}?Ug*}*Ts_AKMT(+tgI<*OK5@+8c}g466Im;7?Ok>4-NH{`C_OSdSQuX$Gby9Pe9*` z`@j}Lzl`8Pwil}C6+ak;e7Jm}SR^&u)hxeD``uLuF%Hy^i*W$)$sP2+y|r#t1OL;} z858q?PG>yUjdDWD#EG*V`xr=zjA=;C)NQUa(7Fj{}^4)~p|epTlK{ z?f?8H`{&Sw{#(R9S=#v$@p>QrAK+vd^bPuWy=0GLT;O?+c02hX0>?X_Z&*{m<`eM8 zxnQB-F~|mZZ;ZtMSVS#y9=r|nf8svlof#%od_JMK-Db0U3eW9rJNQq&=l=c4EBwz7 z!(aS^eDUDky{o9#ZOBJTq)I9T+NG02kr2OA<8`w=gI9J5{jYZoXnDOcl#fuJZvJBa z)kWMF>9S22UpK7WKs#RYGH)I7z`Jq2$wtH*V1W$Lc|7l=ANhfF<$6)p;#|kdIVj8< z&-)&wXs^_dxVUck0S??HKc~<_6vg ztJO;CzYJ0@elmSq<* zG>Up8q!)a(cLDsf=-&XvdNut-2uokbI65p>C*U8b`}BgNs| zdXavf`TGZ+lXr1FbzO!y-!}S`Zqz$5KoGCFl2h305%pIQ=9g=~@%wkF2bOObtfd{e z@AW;+}RCj^?J{F$w$~eV|Ky*%VDBg!5{NKtcR6S1-5VWy4|Fh*tm$(!Gn7t|IjBG zIB=iAiStuvr*0mPXDG)O`}NjG-_L$A>2$&_&{b;(&>nXD@ti-{jYd;7+x_dvcs<*N z`Y#9yg>@P6PH_LPBaVmEym@%JV%r=BE@|Wx0s+&YcG4etCaKD-JJ8SC!oX-J0f{hi3tJK** zrw|7TcLMx@*q0?q!!o#AO+-;f`e8NF&-w7E8|zQNzqxrE^k$b1Zt@H3pbv6Th_sKk zL;sM*l>tFJm4RxOZ6R4lD*5TB0S$Ovg8F3WV_a8^sPEQ|`-fq7!7m*@x%sj0!5>hV zKTmz_Nbjb-2b@Z0NShj)8rg4_OlCsR`2GZ`WQlRvU)V0A-e@)k zbeq;bF*5$x9>z~56?Z4&Cl#~)qzUoz`ax}R7xpzz9o32WN=4~^AK2L?2qpmo)* zYH4QUjvA~>fcDg^xOEQkJ5RIR$$VF}0lkG3ep<}$u~R~;%kn;m1M;Qx)M%9y@)GT+ zxvS2?kF=xC8#38Q{XWgdw>Mr|-8*w(QvB!J{u0OiYhNu`8NcOpMpiM8nH3vvE@6Fw z`jGQ+84eIq2UbdgBoQyx&iFAx#(qjKFA>jv4f|1P7ZXNf&E^?ep;LRNO z5ch#~M(`UfY(Zyu9)`^`fYE1+0KjZbHeSC*G0{@uH5a`dto^=^M8%&Gu!}8F6 z;v(T-0#Zv!!a4}>>FS!|{qL+C$x>diZDcd`ovz&Fs8a*q6i6Cd)TzTfQ^ z)F><9S3_+|?W8|XkMkaA-{QOymF1+_9$yQ;XGlL+#n7~jz}Zhnf-hgBo+g&$QNP=1Yb4wEpPSPmgUa)pZPAv@0- dLA_l8UvOPS36-xauxI$Zg8#<8(6N;({{u)&=nnt@ literal 0 HcmV?d00001 diff --git a/Templates/Full/game/art/shapes/weapons/Ryder/materials.cs b/Templates/Full/game/art/shapes/weapons/Ryder/materials.cs index 3661bcae1..47dc020ea 100644 --- a/Templates/Full/game/art/shapes/weapons/Ryder/materials.cs +++ b/Templates/Full/game/art/shapes/weapons/Ryder/materials.cs @@ -39,7 +39,7 @@ singleton Material(TP_Ryder_Base) mapTo = "TP_Ryder_Base"; diffuseMap[0] = "./TP_Ryder_D.dds"; normalMap[0] = "./TP_Ryder_N.dds"; - specularMap[0] = "./TP_Ryder_D.dds"; + specularMap[0] = "./TP_Ryder_S.dds"; specular[0] = "1.0 1.0 1.0 1"; specularPower[0] = "10"; translucentBlendOp = "None"; diff --git a/Templates/Full/game/art/shapes/weapons/Turret/materials.cs b/Templates/Full/game/art/shapes/weapons/Turret/materials.cs index 4ed4768d9..95b361714 100644 --- a/Templates/Full/game/art/shapes/weapons/Turret/materials.cs +++ b/Templates/Full/game/art/shapes/weapons/Turret/materials.cs @@ -29,7 +29,7 @@ singleton Material(Turret_Base) translucentBlendOp = "None"; normalMap[0] = "art/shapes/weapons/Turret/Turret_N.dds"; pixelSpecular[0] = "1"; - specularMap[0] = "art/shapes/weapons/Turret/Turret_D.dds"; + specularMap[0] = "art/shapes/weapons/Turret/Turret_S.dds"; useAnisotropic[0] = "1"; castDynamicShadows = true; materialTag0 = "Weapon"; From ef437835d778e5a8d71c32c7b4a63b1148a2d341 Mon Sep 17 00:00:00 2001 From: Marc Chapman Date: Mon, 12 Feb 2018 16:20:18 +0000 Subject: [PATCH 2/2] Profile change for specular files --- Engine/source/materials/processedMaterial.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/materials/processedMaterial.cpp b/Engine/source/materials/processedMaterial.cpp index 1622d50e6..b38e0a400 100644 --- a/Engine/source/materials/processedMaterial.cpp +++ b/Engine/source/materials/processedMaterial.cpp @@ -456,7 +456,7 @@ void ProcessedMaterial::_setStageData() // SpecularMap if( mMaterial->mSpecularMapFilename[i].isNotEmpty() ) { - mStages[i].setTex( MFT_SpecularMap, _createTexture( mMaterial->mSpecularMapFilename[i], &GFXStaticTextureProfile) ); + mStages[i].setTex( MFT_SpecularMap, _createTexture( mMaterial->mSpecularMapFilename[i], &GFXStaticTextureSRGBProfile) ); if(!mStages[i].getTex( MFT_SpecularMap )) mMaterial->logError("Failed to load specular map %s for stage %i", _getTexturePath(mMaterial->mSpecularMapFilename[i]).c_str(), i); }