From 0209464d6597271063efab90b07df9a40ed6bd94 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 19 Apr 2015 20:50:55 -0300 Subject: [PATCH] -Rewritten KinematicBody2D::move to MUCH more efficient code. -KinematicBody2D::move now properly recognizes collision exceptions and masks, fixes #1649 -Removed object type masking for KinematicBody2D -Added a test_motion() function to RigidBody2D, allowing simlar behavior to KinematicBody2D::move there. --- 2d/kinematic_char/colworld.gd | 3 ++- 2d/kinematic_char/colworld.scn | Bin 6367 -> 6596 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/2d/kinematic_char/colworld.gd b/2d/kinematic_char/colworld.gd index d13ff923..fe2dc30b 100644 --- a/2d/kinematic_char/colworld.gd +++ b/2d/kinematic_char/colworld.gd @@ -14,4 +14,5 @@ func _ready(): func _on_princess_body_enter( body ): #the name of this editor-generated callback is unfortunate - get_node("youwin").show() + if (body.get_name()=="player"): + get_node("youwin").show() diff --git a/2d/kinematic_char/colworld.scn b/2d/kinematic_char/colworld.scn index 7b79a1d887e07370da20522a537ba5b6be161e11..6c73e8b126807ba64f335e95095e3922e0e00719 100644 GIT binary patch delta 4330 zcmZuV3v^u7ar53==}Eh?R<=HCS^nJJ)yJ}o*RpJ6Tedv!t-ct4uxt!AuKGLq2q#{D5+~pQ$2vKX(!yeyPimk|3!y0`d6H8K1?r}zP15GX zofT=$>1p?9=H8tj3Ilr?UTe&sVZ8rJ{6L&1gnKO+u+sE*e@qp{HPh zQdXo#BFT{`8?zm)`DzZTl=|Y7I+}>98MZFpXeDgU!+~2_?l1?{w3hc88ON(UGR6MB-NMCSky2AgCW4YrT6f*&LGXRMU-ofoo zu)yhWq8kH|4f0A@$QrN=7tYj7;a(K-Ab*UV2*D50ZHpjJ*+N_JWWG&)*%s>L;d~u_ zma9|V2(E{v><)Yy{lV<#2-q~Uyb5pQrBuRy+JC3=Td7m3!P=6f7Rwlk_+Tdd64sLE znH2m}%%H_pgXM9&{nlHXYnTf+NC%2X)#Qi<9yTAVu^C(C+wcO4SP8Xk87w08Z^sQN z2oXJ%QC1?u3TcOboKKkvJhOl|!JAu6(ycAFAYhBEPQJ%SvsYIB%x+u@tbRXdVQ}bU z;fdhkU=9WO@1_^`Z7MdwM-i$sp?lNok0_18c0H;!9Pj#-7)lJMbt4msclC14(S(@@ zCz6TGctCMN@_~hl%c>Fdv>IVcqs=y7<1n>kER?V7+GF!|knB3^2o0;|kalY}y6R)c zf7sl7-q17JT{Ho+sT{Ou3qKK<(Ebc2mY;=W!vbzpQ?@_&Yt{rtbCL477zzz*88sBr zT6=bL+tdelz%cu*;)P6O0z&^9iD&cMZC8tmP};Rp+TE-!l<%=AB`C;-#9t}gE<%8t2mV%zI`y_ zU2d7rbV-XXCl@lB-I0@^Hoc=B`3O$JPUT<2QSaT{czDGpD?*$eS#cMH*dAVk#r{h+ z)QV9prj8^tA@3m}6%A#Yiq+2rL)SC@O=mV^lrsbW$dzB{d)@{KRNprL#=dta&lfGp z&WAP8pp`tgTiWMM`)d9RyI2_Njn1Ar5q{w?&V2 zNB==vtj%fNN0ddyfkZr|8=B8izf{dyHLEHhovT8n>$Dh(CDphY81$CIMDwW|-tPZ% zo3AY~GlrIl42Fz`cF^x@_3q@gz;M><>lSkJIQ4*9W6c}BS4vprd|HhkzG{^x-VAqJ z?qcmgI;2GtU*o~3FB76#G^Esn8U9W1kopLyjpdM1PqQWHl-uMOH)b?^7auMjNvAa< zqOvc-FEW?^JcMF98=b))7wai)OdW5HEMhM5URk}Bh2(d(anVFD)v(ttUq*H1Kq#uE zsS>zK3b|m8e+}523)*bnwR9~kByvbkh0;bM712yH6sBMgX(_5l;9_+)Urt4&9D7Pe zHNz~FC4sqtqjcrL6{VD{QlW@GlFHa6i-eROy+yP6MNpSp2c=9b9aX8Or7|WZ(lTgg z0@N_dzQD5*41xRsO_kQY8%?~j}+;#n5kuy>;#>52e|39PQe`1 z$L!J|l;xM^HsWv|uv1>Z>oHUDh`zgCnEw4ot1qI*=B9E7ZO0SR9%%dO9#n8OK2Ugw z$wGa>wOnXi+0P&P8B@LJ6DDG+L7D>mXAmp!5FgV=6_LKKm9Y|Y#iK(BZH%(~=})jh zUMmOD8+1}&_+tM1mBqwnAue=Kw*m+7V6NI)h1FDOORBL8lB|o9BbgL--6E0)lE*jM1dPTB`9fvaam8T6`2o zr3wu5bi0PnIZNvH1hYNI0K7c_HvMrf^kWA(l7f$J{&c>K0S+MK7hnLP>vp=@LkQ9! zjgKSrZl%#iuudHL7osjDpjCM#jrY>ZmKP9UK9VGB8X#UtOVm{KJcjV*A@CrHmWU?x zlHgw<^u0>liwoSagpmS$m!@RbeL{2DB3MkSP&-%{i)gY87PBI{0?UbniJ35$6DNOO z{^Df0yL0M8_i?Uu#s79U#Vticu8J$fg48LFe(C#+^(JnVJk%VmpFB1HsWmV26DjRX zgHY&7aGN})1PYd}N9r!Se(+0B$jJ3~{=vwXLh>8=;N(3Ey0a(*Wx@Hre-j1PXI;(3 zyR`$E5kqUR0nScwdf5MQaU`j&N~hutR}tt1Q;*U$MXeRR_X^xqus4R$z~kMEXm$#p z6bem~H|RZv^NRoB!t-*=ZGU3J_wa0fGq$48eZn!4j_PBteF_&FKIOjAE$17h=kX@1 zAR1)~mrF8=(#w=3zG=_9%2Vd5|0!ph%2ixLw(5%Y5Uy8b!sl~tI6?r?-%TE>RI|R{ zQHQdb1Hh-@dJgal(x+U0MLJH7dJOAugl^c4BKBil{*V7^y`M%7w@{?`VIJF! zep`Uxx9D02sheAfArcb84!iwe&vrc8(~c+lYViatU{O3F|24s@_yANh4+gUG_bL1) zQIr?sw}N-zr#(CH4Aijz?kABqO>cb#hw`tGxV<A&!=I4@WO;A0|w3VtR^BGl7-88i?!@foRLd^Z9#F$ZKDnSf`cpzS{+ zxoyvxU@J~SGmGF+dIJZcg|hSt;y8#`?cRg1lI@p1g&Rnw4y#Do6a)w#h1EF`T4^>3 zYiQO+>%V}tOqBhwj;H~+k>)LQDm^J!Pp4Ai$7$(Yej2hHSS1EwBW;<64q^+zCc-;l z^PIR&!fg$yaDbN&c++zS$gP-M2LSI*9O&dj#;;uVD1q2Bz#*<-!*BLa$m;*8E0 zs6q&&fj}8oARUCco*F>J!kb%9-`iPMfa~;yiVg6j6u<`NAfJ*xP(%zJ1a$;56AF7s zHvzl^n+d4mK_~6$fGxyLuhK!=$?Sqn@z_O%3o?P-&0VjdI}|Q1kmMjxjiZRtQG{aV z#=0y8f}gpdgap+UDkKHhb2M|&;ubuCB0)Q5`Fa4QgF;P27x}ZBxkx|{9os-k^b(L8 zp^u=6pr2%A;U?nU0b6q-*?owh3ES9Ta@Whqc%%)EVVhlf8MAe^=Q1p3H{)~Ub`hWX zAGf2xCb;X>%=M+;2S_6MovQBt=l83B^!u^d%CS7aHdX>RGl5;?t}kVxElgvC?p!Hd zMUh|#wzC$g5_T{#TL>@M$ppy-w~+i7U>9M40W8>i_nb@i%*}75`QO6coCvqky~}CW z?L>*gKH@iFKjG_e2VoD~N!Sf{5ne_ukcj6v1uPL%im@gL7YGocxeKCnJ~n|yGGj#O zwdoNDAkHehPVRaoG3sQfUVLW8?ZS|Bbk?&q=)uER1dsGmaDaxO3r%hiEEgnb`v=lV zdi<`rEg+dvmR*=#e^_q6B3_m*!$LMlG(p-giBbn1#$Tg|Z{SoG&(UP7aAJ+SyqxEjO)gSk-A_2;^K2P5{N1<~w<0Cll$3KLWcOU%%6I_%q=RUgz Kb_EOn;P`JHh}fY3 delta 4139 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