From 1df7ee962abb538cd769fea1a98337c19651f716 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Fri, 28 May 2021 04:04:15 -0400 Subject: [PATCH] Update to Godot 3.4 --- effects_shared/BlastMesh.mesh | Bin 11051 -> 0 bytes effects_shared/BlastMesh_Sphere.mesh | Bin 0 -> 9682 bytes ...arrelSmoke.mesh => BarrelSmoke_Plane.mesh} | Bin 4488 -> 3117 bytes .../impact_effect/LightRaysMesh_Plane.mesh | Bin 0 -> 771 bytes .../red_robot/laser/impact_effect/Plane.mesh | Bin 2126 -> 0 bytes .../laser/impact_effect/impact_effect.tscn | 4 +- ...article.mesh => SparkParticle_Sphere.mesh} | Bin 8946 -> 7577 bytes enemies/red_robot/red_robot.tscn | 4 +- menu/menu.tscn | 12 ++-- player/bullet/bullet.tscn | 2 +- player/crosshair.png.import | 1 + player/model/MuzzleFlashParticle.mesh | Bin 2645 -> 0 bytes .../muzzle_flash_particle_mesh_Cone.mesh | Bin 0 -> 1286 bytes player/player.tscn | 2 +- project.godot | 56 +++++++++--------- 15 files changed, 41 insertions(+), 40 deletions(-) delete mode 100644 effects_shared/BlastMesh.mesh create mode 100644 effects_shared/BlastMesh_Sphere.mesh rename enemies/red_robot/laser/{BarrelSmoke.mesh => BarrelSmoke_Plane.mesh} (58%) create mode 100644 enemies/red_robot/laser/impact_effect/LightRaysMesh_Plane.mesh delete mode 100644 enemies/red_robot/laser/impact_effect/Plane.mesh rename enemies/red_robot/parts/sparks_effect/{SparkParticle.mesh => SparkParticle_Sphere.mesh} (71%) delete mode 100644 player/model/MuzzleFlashParticle.mesh create mode 100644 player/model/muzzle_flash_particle_mesh_Cone.mesh diff --git a/effects_shared/BlastMesh.mesh b/effects_shared/BlastMesh.mesh deleted file mode 100644 index 728834128a0721b6a19ddeb7ed061acc22352d44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11051 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 MIU!k3y0G7_(EWB= z;F_Z>p+!l{kgO*^@OugAemgC&x<{m=Af=n~mwB~a_uFZKrHQr9k|l}C-^IGLP50Yr zfeQ(FNx!j26aMYEFTAJw?X*Byg0W=0@YnIW-rqh2}!pDCkDCdLBldZkwc`ZFqn-J-^=hgnoS@uzz^!YJ8Fgd=~*=5f# z<@_b<#$gmzN~hDx8OMpW3L;kLdw^yOxX>&N^P7A7y-nCG~}~*4O7psbA^} z_Y=~7cG>+{?r{Gh?O&fCrTUl^m>t0pNeY{VFa~}0~>3K*l z@6)WfLgtUmXZihZ)$@>C=1*C|Ag)*Dv*CTWv7ekjBn-1``7uoRnJ4Df1V$?Ug11hu2;`P2ejxv^v7tT6f&-Y|}g(dZc zv)0%1J*i*n3ilH#kbd-hPx`Uk;r>I~znV5I;anCP?L4gK)y3TRt72fL zoF)H2&#Q~MPi4jZ%=#&u>;BZ(`Kq2*7qfnHj>=pR&a*1Na;(<#>SEsSk&bkF6wY!! zyj0JtidNKJ^+!=X6kSf zV}Iyy{quzE+$=`?_ooWI`J|ztY0C#84NW`z20l)yk2c2}ku*dj@f%5QKwIFANgAQI z;Wv@oh_=Lyxz)UD#*jBQ4M=W6Tj6!c<@1jw_{}5@(AIcek~(Np{4XRoqit|Ghp&r9 z;J1+c1#OGhC#i=v!<(4)RBOT~BklQ)u2gGny5UVpd zU))3DM$>R7i39D2$MG?euubE&o+M7RKi-`@4o$)DHlwI^w|M~XYlcy+uelFTBe@$L zjrSwziw?(onR~S6XkP12(hv3FDdfG-!T11@{^$tYOCo3e_u>Od2B7!jsU%)>2tJ5p zAUYE7O_GWZ#qS~+gpR`dkn~1};rE*?D%@}U_z;s$g(2o)d?d;J=y-f6$q+OHA4M_} zoq!J`8HzrFKR_}HorvE@G7QbcN0U5&X5+(2?nB4o_m~Iu+Ov7hM=~58hYu#d2Ym=1 zLE=NR@Ow!Hqv?3InL)K|GZPVPCTY!?yf%(xESir$ME)Q;8P6gahZf-J zBoCoea6d^FT8KYPl8)x!<4NQ^dK#WV@-UiJ-` zkt{{m;m?pfjlPU8Cs~I66@QlG8T4=X3XiU*H)6OK-c4slP^Zs;7^jQ zL|??0kUWk)hp!@e5`77Of@BH07GG^%(VFk@)7G0UR9kP}#Mh9oMqkBWBw3G^;m?t* zL0`jPB6$(rimxSk4&8)rAbAOW3xA$uExH-sNU{M9;_FDBM_m-}e9r)WML3B6%2FdH_hxj`rZ=-wg zEhKNCJMmY{d&*%Cuf0jK1ue&4C4U9ohL@4NiH7jkNM1$X$G4J{p}X)+B(I?#;BS#^ zML)vJ&8Ji=H=p6#%qLXaX7=JCl5+GA{yxbzv;yBn5<(B-ACSC{?!!MK*@b?NZzuTx z-H(4v@)7z4zJp{tdH~-|@-cb@|Bz${dJx}3vKu{$?T{>@H3{G3TI3W{-ybr3SXM@ z_*s%O=#Thuk}uKk@G6qC=q3CslH=$F{A-db^fG>eiTE}DPfKatd;rp`6K z;~%6ynBVbl%+FfW)cJ{8zmry*f8yVge}n#l*N{}Bf8ggyzD0k`#{4&WU^iTYIk_+fn{04Tn@`pv&x7Po&`F@cX3-do*C&xzZsKeF)cl;x>$~+<#dS26m-Nq*WZx{$CY*hRJ;S-nNrfg;7pMVSR9U?q$|(sZ&cn~q?7 zKu%&_s$OntaR!4qNO*Duo25Ljt delta 1526 zcmZWpJ8u**5O#OLBaVJ@3c)a>hHM1HFv>Ol$!PiECjJ#j?{XARUf|0 z7R&@IN9+q(yP!JCJxnL!c{xQ+>yiwpP@jyI#g%$19bsZnLOao<1Xt0d6#}$z7Eme| zh$9hMXu(ABlx`U6R?fH}xgzMI>@&)xuK9KBQ)6vNbZDcjbY1hY)>W7f40!aYW(Gp< z;0GHVl&7tFlyws9U1F>{WpI1sbC*%DJvmle=M{IrkjnmD-qzgD_mn%3tst zBYGJX80^H2WxzDJxp=&^vqHu5hgR zWy(F$qn%dV3;7`5Tw(`Mss^k@lV>8h*|f1Z%tWyY!4o35fEEUR0Bora?W{!0JyeN~ z=cI3ug0Uh&x5ei7R0bg^2dSX<2nDO7OTqcm0$*p?74sIE{lkto?hq1Z6Y9~LWbGg& z8vW79^OmRle4cz;z&e0RtLbz06=|(aq2T2)JK5`>S8zIPxw?*+1gFDh8P`s5K5Gy! zli;(=J=gvk*Zw-!{*r5;T0vH*c=`C?7P_VFBx_noIpfy`1=mJHoxm#WJ$b&a5*!un zm2~#&%L_8ZCHito#!>6O+uhw0->xt&#O~R@H~6;2*oYqk#EbRFL(*UlfHbCGu|XK) zOvL}0>|+RUdcY?~^fIB`1D}94h&gKAF^czOb9-(5@f&})UUEq8^O2cV9MAKz{}1&m B(5CTCw%EL_Hq@PiQaU2kvHc4?aP;F~ zSQXyrLM5-F;gV_j-&m;~(;AS%o{f^zm5TNctC1}etpXktT;?i{bj8Z~oM{Q58OP+E z(t0qUMXcjE47K5y?T{QEO|VtMglGzW1V=4lYt#R5Z+u2o(1cStn^at<_ zXfE99qlo9+s=9Ba+Lh@S;n*YG7f&yKQq%L2yyx|XeE%3DT|ME{&J6$i{a8+ZA}ewV zLo}>iFywR&IvMt?-Z`du>R7#35MOiDeY7Fke5GKM=Y7^arKCQPUE^q*bdKaxPmz6A zUo7a5Sf`fiu!Ek^lYxwPSGot4YxVI0U2@F4*UoO+Z2eY!v`~D|HTSvInNwEx792|Y zV13rf{>De5b|Jc2EVI2MPf@+U9BJ&H>ydpmmR!Yk5b1l}1OzC>ZKb|k4hhYNtRow? zm$P5#$lKZ`svK+TDl2gqeK-=pJ`Itz2~lKZ5f(dgNqsIFCa+C!A!;~8NssmvM^DH$ zjg}!Y5^?I1u5HucR2OP42PQoAYz9YhBp_Q8LCo~^h$1QzD!gt4@2}t(^E%S*mK0|_ z>z%E0TPk6aaw8YBM(bP^C{9`t_FI%^%)L}2IaY72^lc0~_364V;cSF#_9SekbMB6QU8w9?%-t%S13O(c_V8edDGty@H3XbhJRrqse3 z>_XEd&SmakyY?xpIYBT(VqaoBiaI+Hb#^N1?3Sn_RM6O3VsSt9BT{FEltZV9s!G9sM4Akz z&3Cd<>aHw!Rz~voo6Q5IUj?qzLs>Gh1(O-wSve79a>Y=Eym6E`ZfqxGRZ5^~WT6$XBuLb&5*5UB;Kk~x!r+Ti`9}2(fT<}K)op1r4tMh_S{MRqQIsO$n6aR=8Ip?El zH2g9X2MIi`%$H@sF0>RCyR6(@`_(!m0=Fw1zAJAq0~^^)m<7RQ(BP4uXxvwDlL14W9Hi!uvJz)Bc_q}ya!HXEV% z;DU_QqEx-y)Zz>V50Loe4mMdOQ6M9@Ah9SrAhD<Y!23{9y3@lE-Lf+{4=RP7Ov3PRkdgj#Wqyc5q%)J!r;vfVA0`2n2vgpl|b z{4*|y8+K+UyW6g`+WOgkah~n;=i5J@wvLXEK8oS9Nxz$mt*;yJ7u8;Omn@G~p_i@K z&g*z4t`lZ)9%Tz5hVbQ(~G8kC#K=%j0*V2(RWzhy5f@hC&5 z=p)Xh(N$MRZ7cC0yR4H6+gQtpA&Q3?=TlmzZInTO!xgTX^F~o=x;0?Ii>;he>N%=D zd|54+2`WeIb6GlHbX2>qCgMfTBBymxdMr?%jyDS{_ft2Mq89Ktzw;~VW2tJj`2us%*25oj%DR9 zcuo*o8457iiJQxS%Db6(y0nu*rmcZubqLOjTjU%%m_$rtwrpu6;l(wIX)uB@x=7`Y zh8$%|Gt#4-E_fDFBA=XN2T&F@Sc@j@gm=@bwm9rWwlcvpBDjEN25ta0bPw&UM9VXz zM8|v5k4VN?5wDwUb3Y4%;0p&aqxT5~tAmT)wPzW=!LZBbZ8H1Djwe1LBupnXqb14O zL5#Heqm%b7ZTa~+`81EEha#?)&($l^TANJ4kH_?MuWzs5a@cZZ888Yiht0gMo#1-b zAbw1In`G{}_Sd-f*SYqWTm#h#vO>j=PwU-WH}pEmk{+Z~@hgLZ??y`5-q(*bDR1iVzh~K|9{%yZx QSK5H_OxAZ~=6?hK0eqs@KmY&$ diff --git a/enemies/red_robot/red_robot.tscn b/enemies/red_robot/red_robot.tscn index 13fa39e..acbd7bf 100644 --- a/enemies/red_robot/red_robot.tscn +++ b/enemies/red_robot/red_robot.tscn @@ -14,9 +14,9 @@ [ext_resource path="res://enemies/red_robot/audio/explosion.wav" type="AudioStream" id=17] [ext_resource path="res://enemies/red_robot/audio/hit.wav" type="AudioStream" id=18] [ext_resource path="res://enemies/red_robot/audio/walk.wav" type="AudioStream" id=19] -[ext_resource path="res://enemies/red_robot/laser/BarrelSmoke.mesh" type="ArrayMesh" id=20] +[ext_resource path="res://enemies/red_robot/laser/BarrelSmoke_Plane.mesh" type="ArrayMesh" id=20] [ext_resource path="res://enemies/red_robot/laser/BarrelSmokeTexture.png" type="Texture" id=21] -[ext_resource path="res://enemies/red_robot/parts/sparks_effect/SparkParticle.mesh" type="ArrayMesh" id=22] +[ext_resource path="res://enemies/red_robot/parts/sparks_effect/SparkParticle_Sphere.mesh" type="ArrayMesh" id=22] [ext_resource path="res://enemies/red_robot/parts/part.gd" type="Script" id=24] [sub_resource type="SpatialMaterial" id=1] diff --git a/menu/menu.tscn b/menu/menu.tscn index 1c7577c..4031b1b 100644 --- a/menu/menu.tscn +++ b/menu/menu.tscn @@ -560,12 +560,12 @@ custom_constants/separation = 50 margin_right = 646.0 margin_bottom = 57.0 size_flags_horizontal = 3 -custom_styles/hover = ExtResource( 18 ) -custom_styles/pressed = ExtResource( 18 ) -custom_fonts/font = SubResource( 17 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color_hover = Color( 1, 1, 1, 1 ) custom_colors/font_color_pressed = Color( 1, 1, 1, 1 ) +custom_fonts/font = SubResource( 17 ) +custom_styles/hover = ExtResource( 18 ) +custom_styles/pressed = ExtResource( 18 ) text = "Apply" __meta__ = { "_edit_use_anchors_": false @@ -576,12 +576,12 @@ margin_left = 696.0 margin_right = 1342.0 margin_bottom = 57.0 size_flags_horizontal = 3 -custom_styles/hover = ExtResource( 18 ) -custom_styles/pressed = ExtResource( 18 ) -custom_fonts/font = SubResource( 17 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color_hover = Color( 1, 1, 1, 1 ) custom_colors/font_color_pressed = Color( 1, 1, 1, 1 ) +custom_fonts/font = SubResource( 17 ) +custom_styles/hover = ExtResource( 18 ) +custom_styles/pressed = ExtResource( 18 ) text = "Cancel" [node name="Loading" type="HBoxContainer" parent="UI"] diff --git a/player/bullet/bullet.tscn b/player/bullet/bullet.tscn index 8cc347c..0a602c8 100644 --- a/player/bullet/bullet.tscn +++ b/player/bullet/bullet.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=63 format=2] [ext_resource path="res://player/bullet/bullet.gd" type="Script" id=1] -[ext_resource path="res://effects_shared/BlastMesh.mesh" type="ArrayMesh" id=2] +[ext_resource path="res://effects_shared/BlastMesh_Sphere.mesh" type="ArrayMesh" id=2] [ext_resource path="res://player/bullet/bullet_explode.wav" type="AudioStream" id=3] [ext_resource path="res://player/bullet/effect/BlastMaterial.tres" type="Material" id=4] [ext_resource path="res://player/bullet/effect/light_rays_material.tres" type="Material" id=5] diff --git a/player/crosshair.png.import b/player/crosshair.png.import index 221b1f8..2a348aa 100644 --- a/player/crosshair.png.import +++ b/player/crosshair.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/player/model/MuzzleFlashParticle.mesh b/player/model/MuzzleFlashParticle.mesh deleted file mode 100644 index 4aeaf206f72adfce350c2214677326c276427028..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2645 zcmbVO-EJH;6m}qO`DvlF4GF(}0hFX6l~9OC5E55JLMiu_cjoM_RgXQfy~!p5r4PWn zM1o6H@&M#A*IXk-LPCgp&gU7=PBvVz(q!WA9DnEd{EhdY?SCcO->dx2&l~*zm)@)6 zJqqKj@W0=?ymN&gPr*%mLDINF85x}n1z8er^<`F7Bd9qP_*rAg^GK^K}j$p^tssP8^Gr5J7O7U(79g>eUl}3-oQQMJt z)Jd$9CDm~(BZVlIIvhr7r)`u$pHPqL$azz;XSz1ZDlgvYwhZ-@%0_+WtTF>C9kWm6 z&>=v^iEsqpazDdss@_l(43)1KsHP~$-;T&h)m`yWrFyC zEwraDoN->_Kq|<_pLEb`VjUXK5E+iRs)8)_aEM)%D=BSg@laDSG0HarWUCdho3?CF zM5RSp*EHbr3~XXvdUbSz#b`_NNSAS(DxqbW%SE=RjTt!QTdN5B4asw&nyXP65_f0v zk#|Spz1cd2$JArRsyYPc#XT0b*-H^j6*fy}foYx^>GKk3D|W@bb6E3Y!GuHOa@$@L&QHuZuu-jqowYi_Y%fD z4ZSMjyz?aoTAPjnLt}FIq)jcn!O9JXfnu6FSkC$s-dsa4LwucL+)!;?quRJmwQ+;0 zhxDj0b87FVy5gZEhdhT`hXqc?%^a2GDUbxIvFCKo%|LHi~)x={11z>?@LB+ zF^bXhA11^Oz`0nTqXYkYc*6s{$8(}>`z-ty1knP*-<`#+EO z;&6>W=W$*?$N47S=8OG7X!pS=n97H&l={6L7QsZ!l(zMf2H)rX@maDgwe`Yo|6 z7R4RD5ZvbJ|46*X<@%6I_a1M*%VXz$nzIiQA$qi-D%`v=6g%I4cuMeRKe@5U2;9Ix z;HyHV8t;~WSV%BLsnc=M$vMTF7rUJIFYtyE261>!h9VFDwBut&@XLqn50lhleTDQ% O%gv3@`6rp;aZtwqr7_Xgw{K*iF3?3o_(538w=0Htq$Xy7v|T#z5F=mbAgZ4aQqHl=rHc+%q)M}m^NJ8=9zJ< zv36$pQ0Mn!4fslb4YxY$d>j8d?&RTuzP-nFzRmMxe05)lho9CC{6y(Yy%l~kLJ@I& zSK&O#1y#JeAnt+j_x177OSC~1&^Kw1%BZ6UbQKTwK3&6e-9-WHVEHzR_YU0#`(7@{ z#aKvP-i%8o)j