From 27e74490a09d66c6382a09a2e1355cba566e0708 Mon Sep 17 00:00:00 2001 From: Regalis Date: Wed, 22 Feb 2017 22:02:33 +0200 Subject: [PATCH] New wire sprite and switched the body from circle to capsule, tweaked physicsbody position lerping logic (catches up with the server faster) --- Subsurface/Barotrauma.csproj | 3 --- .../Content/Items/Electricity/signalcomp.png | Bin 13503 -> 15418 bytes .../Content/Items/Electricity/signalitems.xml | 19 ++++++++++-------- Subsurface/Content/Items/Electricity/wire.png | Bin 1568 -> 0 bytes .../Content/Items/Jobgear/captaingear.xml | 2 +- Subsurface/Source/Physics/PhysicsBody.cs | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 Subsurface/Content/Items/Electricity/wire.png diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj index 221dfe0c6..6395be753 100644 --- a/Subsurface/Barotrauma.csproj +++ b/Subsurface/Barotrauma.csproj @@ -742,9 +742,6 @@ PreserveNewest Designer - - PreserveNewest - PreserveNewest Designer diff --git a/Subsurface/Content/Items/Electricity/signalcomp.png b/Subsurface/Content/Items/Electricity/signalcomp.png index 9c82d1c9b36a02046cf1a3a6f3a464bd7c658c79..3bcb1978613e2fe6401953ad8bd745f602fd9942 100644 GIT binary patch literal 15418 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 literal 13503 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⁡yXIhfqbF51S>fR5 z%J=8w>US&XPyd!)L+cl-|Gq@+(`z$>&Er;QW`Ytq;uSH!XDTi-s}MB&&VVdSs%Day zmn06yiJQ{+nBn2WZ8}Ab$=?8xih421=Y0kAZrpj-QXQ5_x50+Vi)O*|O?)-_6cxM& zab2atg1h1Fn3}5&Un%jND)n}l(DtQ=FWk2}K3~uO1RrUCo^Pw4OkO8`ST*WgZb^7r z?icq@8HYilrci>nCp(^lGu~G%Ge1Pf;~c1v_)m`sML{Z?Lr$~p05_>EsPBy*Y{woC z=MVPx0VaR_*f!EBjiThV$SJ~Pn*h{QIm6Dg{Ofy>)9nORGs6xmih*K#t~RGQNzqp0*C45Ap`7JmcY+%{D%za;-@eY1W$ zXu%U?8fsh-nJm1P2R(}5@DkL!U8@_I=lyTPP4V3A|di%EDOC^*$*^pzne6hCayn(c)FLrqE zowUPnmw^VzslV!!Dr2~ZM21d`XOV5a=?TxX_&OF;q<43j6RXGox6`EdE!<}A9O@h? z^b^!>t6q$y7I+dsWb0^LB(x9(dA(Xo>_wYo5LC+;K?*k(1Vsz*pPbYrgT`uUVF#RW zZ*tBpy@dmOW33xU#0G3jsYZuqF~vM5aU;@xb?=y|!;^%D#!2@If7#lzE|`K zYA_E95U8#m9)8v&TP{b&$5l5FkwJmvlnP3OY34sDTWGMGyrWeZq8gHe_Dsv6rA_Dx zprFKog(5=4!dRhbngpc;wcGA^NB^dTk@@6X@l%Ecl6QqziONIh6=Yt8Gd&Ah7Z z=CGoI!5Gr&jp@~~Q$aUHTwYUy%g5$yda0dpxSX9Bzqz?N)zi}x*4dT5P@zxH4;GPG zzZ17r>RrA`R~I-i4Ss{Pgf?3<&+)$1fpi@k>5B*RAzd42>#DrEhuM#(Q0XxjqSh z5d2sI6Uu3rdl>_>2IC_CC~|$t_;7NiKK}>cAA~8`aB6P*!^U7L3zVuI>6V6IgogVN|WipKu znndo)<}?2bR<)9eS0l3Z&USv#OFqCiyHD94t>dDNV@v_%(kb=`RQ?G9#@Ez-{nllk zmhs-W?UDyvd^^SGOk&iIUJ4)!!v9R!BvNqFb%>iZVj`2%GxcRV+nD3!`@X4rwt~7n zCu+y7SYwSekh$>PG;PX$vTbo~ON3cXPsnv#{pDnguS-V0(DxoXO7DMvn@b$=nddm0 zb6_!g5eY+m<7i;grzlpXebDNyNdNNHGU=o#*l}}pq^SZ0Eu=e1;QHL zD@pa4Yht`zEP~8x2EyA3?Fyhg9zA6fr3ZLgph%npkLAbvL&0&zlq;@tq76_ZY~F9{ zR-(OpOtjzeP%1rr-r39Ld!la%JLNKO|EIARlzu0zAS3 zOIK!CR^ET+XbMfN2F+KV+U#lZYY3@i3A%xL5ei>e&yBPj8x+io4-EcN&Lsjn&WkN{ z3Iov~lXFv_bO}^Ei}yQ@y#ecQ_p`WVf}{vBw|^5Sx|Hg$GSLt2q;oB4u&Gi(3!9*6 zIxKR^5LV?BQPyeN`?!^-o4K$HWb`yx?g!MG^2RVjekvDaTGe>{BbFyecWfuac-w=n zMAo2>GI>IZC-;~4Di%^bCW+RMIfS2ivF~pdh3pV_8WsCxn1XTD65j&!PWr=>!ne+?(Q6~dLqB#1BiSbn4|cqm zY@a{g*=uHZGur!c0y;zw-aUZ^nE$kr`mbkSBHLbG*m&9@-=?K)MQ;bz?TDsdoYbYU zkp>|AYVc2;Rjd8Je@+%pu9W`hy=I*boc-9$^DXFf)0Y$~i>Ct63do?z(kMYW@1VWPDn7~kZjvwK0u`aHqf4OER&s$7ow{y4 zYZthVo>=d*dXx+D+U(@yL*6wLtu@C^kBde*k&U%J3_*l$pQ>ifU)Epd+yIRyU;p3*Y2JXkl+K$E zob~w|v(wl=3`O^5TqI>W4jrhd5X41C9LYZpe^r0N`ef{(>SLxZ_N)WS5q3=g zg!(DG%B@sNY`lrhyNZg6DDT@}+fm_;t?7J}R09!jknUjYp!FKti}%sh3uc+_@Hx0H zWG}}ryEo$ft5C`?dAuTB_WD{IBcsnL+H+Jei>^HA@wj#P>Un**-D{+fAF44Vqg)TS z#2w%rk@e=(+ICN(L7nhvwGUa!RgIBVzW1z|w-uL4^zoUFhX-F}bw69s{ zl2Ai=!~+!~|LnDIn%f-2%>464KJ1^2oWDH#0_LCh>g(znc({Zj0aMbNBZ^wQBKm)> zh~tR|BO7o6Oo9a4Z~gEWVs#AgyGbA1efG#6!jVSC_-c>uKVlUk!r_X96sQszwfQI> zEd9ei%a0l$aW@Xx-`_VeG4bcj^d7+a}mGN>=N0L`TPb&X0UoRP6<2&J|XaNdYubcqUk0XvN-rb{_?n8s$$2~6L^d(IeNTXDT zm<-snG_XliSXfcd9{!3cC7x2yMmvN7ZgS!;)2*s;6Tdr(>oNd?i${;;u#$i{eem^h z!620fx*vPg6{Id^!wzgZ7j_YD*3VS$U~hQZmDi1v9rs@!s-I7T-`mr#M~mMWH$FGy zI1Lh}aQS$0k_y^wm-CM8?wiN#-YnbYh@#g1z@7u=%x^g0YEJA0U~+CeIgi7ZQw$B& z6PXAjypLM#`!H4yG*@1>@$b(4UK+FU0m(W%Qrg7TPA4*4aPvy~=DVnJP~k!@o1^({T= z!5h6`CY?B4E^Z!qAhJ7p%9)WbbC@i_H7gOw&|QiSfh7rJ$B9@$&S2)`&+6El_ePS+ z5MF$Ixsado$4M!#IbrNL*Yj(!rnyb~r0=y#b?%0mj5m+=GC#e4Z(8z!-O`&~+kLk@ z&0B2lA~+I}U-3up)~5owt0rxUPj3|?qa$ZvXO;L+R=Mm4rhmNLT$x7q$G;>#2_~+` zmsqY#)Y+NYnod($QU*Uxwtd*|{`v2w8%N4h$?}9hroFn8_;wdydzxuVZp4hCPBEFRFcgeTsDWhCZtumw~TO2vr#pF=96hfd{;vgMxwx zk^RiWRfC&M3g@$zV>?q39hjXTB^txM#rp|AeI8307sB*cZg)c;v_K5~Wv^1cO>h3m z3O6VyudkYDF{4J9}w4HPchF-IMp=O*T05&PpCi;ZQ9CH~-lAe-4T976$2!hf8IO#aeas^>HBj zLH?bldqzRia{7$XttOm~#z!2yFgla_m$#J`4wo8YlvG1DIfj(tf;Q}N$MblKXjt5^um#Uz<3^_xS_D54lq@ppw+{nDxT99J?5s1!#uB6w zmVai13`ZSAb-m{nsnDT%!BbqavZ8)rh2eFP)_bYfVs|Wc?)Nt^uXL1oJ;VH*+SmNx zc2)J?F0(v34aCd@FM2Ba0SpxbKSO3mnKNA^Ycx8m1hgx3HCV{$1JQ`( z-a+ZI)XcSsm@N!>i_rpEWyjC?wW;v{@5$kG&)=cgOKF z@ZsD}em1QFS)3M#Iyn64A6_D?@B9fpTT6X8u3m<(d$ZAAm*^X(ZcCcPa$`&@t9b>0%ihbEF3Ib zL88}mgihA1w^YFkho02Em`0S5I>h>-iX3UhK{4oMdiXpfIF~){Np%SE9PT)fzyk8QKm+WtM^eZ-*o8(m;co4dDdYo_qMQ&VgA^&O|c>GRh6tljKv z8Rz>aM2z6dp?xMewY>dya7Rr=KrmI^2%v-NKoNbxbrq z^5!@$EibFPMD!j#VUsdd=*xVA$#+R_J3G|sYpt$Yd>uQ!xVUdIzzfs%eNG#H+OHu2>@^}WH$tmF@ta;{t8pkB51Ip;A&d`sV2fCCAI%uk^0oo9fJrR(LKNG z`>$8lq@n-yI*~M#_jh2xH8>2t@8O{Y3oAD;*GO?_0@wQ4a|$v)C2CJGXmitCt#yEU z>cNcl|9z3odn|!5&?st_M2(KPYOr5ynQ>OYah+!Oz2m1FVdEdjGvypY?;g(fXoa2JXlCZh>HAT0Jiw>XB+R$y)6)wlX!_C0@ zdwD-8El*d(tnBRM6_tQ@qUSvcBRLY35H?alTWMxF2!wSGOvGV0(Cm7|)o0=7**~7T z&=}UWRG;Z_@WsF<=GA#Z%9ea^8<8V-$_$2LKYOoegKe^x2 z`fT^QJ1lAm=xq4<`wLt9=}-6PBU3y;cwivv-qbSQ0^~9RzUwM^v-d#r$UKCPWU>^f53hg%IoaoUp3x3FSzA zz2Fxx7$*h>oX-9j(Wf)tv%|yffr98r z9;X0Fz=Cy>s^2{&j_^#6$B2yOW11-=z`-!DBs&pEPA%GK)$qAp8M=MochadEM^<`EMsx3-r4No`sa zTB)m#Es?`*9^!Fiux^b5*TVDMT4CfqBFKOps-UM9(9X&44wUGMtNIjbglOU2)FINF zwX&k%vDcg1cHXVV>{zX(L6Q=ul|d3KJT%DZLX7uu0oi#N?O|H?Pf8CV%GaL$qaN{> zuo&kaO$8cgq2F@|d!-(;W*Bmr@2j!PXxj5$p7*qZUGqVa2zh^+E+ma6DAXVuSr5Vm zh6&*?oMI3`ZIlh?%jUZ!;9B;ILpQcO#HVX^-pFlvB7BF9f<(UgRDeBZC*`xehfSoc zA^wMzH8pK*e7Gjuhp6hmdGj4eMpvR!5<;yCH_^4VwU&-`rzO2o-PSpVQ|)2^*_6F#vGuR^+>kN0$;DNAPtRsK1p|?+Eb{zQHxL({_?9dlWGv_h+oYfFk-9`@bB#a#4n}is2 z>S(=clfNNer%kBimuTIwYinzbGt0CyaeTNmpycvvjG>+1a3$j9X-~rWKPAEx==<_} zn4{&RaCp}~6T=v6J$Z-QlD)g#_>6qpBhHO?YV70chzcE^EAPy$Pl!)WnBGCTJ{g?d zUzjBPT$aJr*PeT~9zR4_-#&e_^H`G!XC9VB!273%(il=rI%eM9qQ81$lKjS%CZ;kO zQ|!AOSLLyF5I7H`E56{_4->W!l92yASIuA+dt}3`d_6B<^tlPDINY8-z|xW(%r*sT zKm-UwNQe!Pk&uuK;9$%-^LtgWW9eP`n!S0-S}AEArD2_s{4@PS!X!Mk!iCH*7h)4B zZGYBKe_O-NhO0LmI%lyvzBlT;cbeFXU_fGHW7_IY-3BT17C*;uugP)|W_QU&e_}}j zCB4)?XPyW1zMKZWp2J>E9$b{2o$-b18jbRGcgK4cgy6hW|IJDb|Mc#eVNLJW`lRFM zl-K5SOA7tg)VYH;KjI}mjj9CW8nX|Nr!8(emzMeah3^CoV_?FH)WksGcKhS$+iot= z%}nR%1*}d9vaf3gic)VYEmgW^Ef$>^XB0>Yd{z?Vt z9n0uAW&p_w-5hXj+225j1w#Vn>QsLVeb>M)ziic=X`+4Xh{CrvLg3Xfi7evMG_i0` z;4#}^;J7Br55u}ByEp?R6kdD>2jD3gaO-Hme=Kz3Dj zTWw!E#Gi_P#x&l-nfuh&W{)PKeTk{;8%*Ev zK&b5Z!0X-rcTxV~8tJVlSMkl|BX63(oAGj-0FHjw116$47G+4|p<1n(j>|2L_ zBJ212Z5^$T(`kk;w{WgTdWZ=}gZWdw=bLp@wjVeLR%d#iYx-Z=6SaPCHtp>{j{3NV zA?M+8rr+Hzn>p_1>KqpC1#Z|O9i!Jp#!QQI|1fN>tMrCIhy_9jr8UeCx12a_JRUl9qPX-b7gJXxN z<5cp4=v02LTqR_b==}0Nt!2E-5qt_=_We!@m%DUWqI4#aTH_b_-hM1|DuO);Aw7mj zKXrn=v~?~{c^ZAi!mf{MB%TkX3L=QOGgYRVUtj8ohmSuvJCLJRV8eQ8l+RitqWoT* zg-uTsWPvXrAslJ>wqW*H!mVy*>UN09Mi|u{8W;DyJ_TD+7m{`K=t!AMG9wDjKtY?ltSF=mhMb@^5`#j^50oEUQ~H?(Vo@>LoS2RUm{Iqq1RC z_%!Cv48$fzR_WKS*Y5C4cg4P?y!!qG3bux-5K6(5YtB6TMfBmRU80&y18Jo*Pgo|w zxOl>ZWU=^LC*&ZXZ{L7Ln0?jKM`Ay0J;f+lQ)D)>(<)my9sc!kJq^g;NvhfcPEjcI z@sT-2$ex_={|f`H-&TK{mK38MNM|Q0(yq9EepAX&Ew9b;$-2il&gHNi7Zs&5s9ux; zSxr8)iav;nxo3$$RN_~?M2+wBvbH2#z;ZC5^@Rp>(gX!Mi9U7qPlo7H1E(LZ!f_Rj zkA%W7R4{X85RdAj)721^++jBW4N~sFGmp|A+2q7k-=&9dcmjf=yu^n3N@mvat1zgK zhgDgWls^2SC7Lzw(}0ssxk0IU6i1ca*+Qxyl3@E1I_#x-aw<4hMcJJUhK@Z2}avNi$=eb2|!fAXnY!Vng&gd5PhPM*51o~ zkh|z|N4COyF$}5BWck`$9%7xEp6u*?7Uso5{^`Un!hlXNxUh#X02|CJg1AfopkeL2 z&`NCj#FOzoU8}84Yl;ThnT&C&E{d9wzN|ZzfjR9=$fb!R=JvYAyZfO8=2p(;0np-V z(Xq^NAt9H4#?Y4DK&0)PC?hzjAxJ$E!cs%X-9`7lR!B)aRq5Y!OTzdlsjvLuCSIS4 z8Tm7a`!nch@SqJKlrH&o?+)y(SqQh##5}ish29FuDO+G@qQn?52 zC@OK?=i-smp%x>+hpyPDzDTtizj=htkk-UUySemP)6i(2Q&XFUD4>iy8mO~#01djA zBNJr$?9a?hmzPL4{N*9iw4U20I;PZF&Vo6yyq7x!p+f&%NI7;lw)XM59H4qJ^}3YH zq6_@1;S`lNlK*MGg~PnBdPpx8PaTxF7x!L2x%)tj*^Q4gT~U_|}`(Z>(D^M_!OC_@dSMFC54fM5_I zE1^Dg!HQ1}D;EcPXb{>!B=OQkT5ma#>iWOY;Oe#5^ZNS4v5jrVA z75ln}m*1#w^oTQIRDe>Vq=>|6id zFNvviB8Y~`uNK$nRZNC5Hj8Q4=u=NepHs7DV}@TF!|y*i-U}9HcktrxocZ zgvFbd-%-6`zzy}l5m+Qb~8cKu+dkp#!lZ1i)DF@BeF;h|9q%1s_nbhev1rUZDW`S5x zaJg5W7#W#V%?+yvYYwch+t!E<r=VQ!cQ9L>{Q}iQ$k8vwE>crX8c-!wbOokNMNV#7 zde`deTMdaCVR0b0UDK8j&Z0^@6&gJ4l7In2D7wp;EEX|LR&8hYAdT?qbdDR9#^nOPUQoDR%v77eT;oLD9G%bpp|vHXISr*k6WWgT z+iI5(|J(g~Nd|+)Zr0#+++7EXUJT@Tyo#&`o&D7LCAEU&j)Bl31}JpG)zYj$adE5r z?KBIXD_@pn$O<3p{uqCAqx9z%@a2+*)(~6u5Esc;*aB9t=SUCh4oFfWfB3NW+?dq15V=7 zi8eQbfvm}nWW@8k>If#csQx%LC{u%Uq#>9t4T81(ksQC;8LTPabJcnH3!d^v$TD<4 zM0LaU{r%8JX7UY6Q%qbd@+}XJE~VCFGnbp?f`~#^MNoI%>lFvihwbN;*LA;c zSHi&{(yTe#Gz^rJU73-b)i2}o;?A;kfGiH zBQcG15XM3lLiOzm#ZfawJ0(?NA((|*h$lqHzzb1(kYJQuHI6a1gszNB)OtQzXM2Y4 zw7naSq%0;JlZq(MQ=*4O2<>3xZEiDn$Bl4pBkTh{1Bh0~PHLoL1YyZ zE3h2>odAdmy_*ZMduCxYNfJVXV!$PgjAh!!(P>x9(V32G?ox=V618fGIw8z+g2*V| z1gfQ~rQi#FJJpv1Usa-XYb zzcjIPl>!i^LsG_{d(H~2_!T(1eP{x}&q7O9geqA$Y4bKNBT>bbWOxm^YMlR-n=}nE zfkkh|2`J7Cuk8<@o2Xb?W4N7h&r)sipP{;==bA3t?iknL%NF%jqWY6e@8AGBReo$z zq5}Af1lxNABuy9*a?knS1g#PP_(RH+&VK*6&;Ri^YGgiPt@yZi6$}1WBmppi7BC2~ zvS^R=OO_=!PDA{AiUe5fbpJXv9u;qLK{V00)qS@ouk=pshsivuBn(u=y`F`P%&+vm zIsuT&Sn(tutD+R}83@QXy`DFs;Cipv*HOGR{vn~KBfD;WUe^o3-A-g^Yi6Mrz~yn> za*mmAz9ULS&TC{VgF1m-1;RpHc8HP3cl=d5z=7gFxN8I>iVZ{fCvH;yBd;F9km2_+ zH(@_?*2X(Ven&$s?Pm)IfZ^;l3IIgOj{1Wz+xfIqk~6R9!dCX)Z*DO}iKz%s4MC8! z>p!*Ec}e$whRvP`qeG44jsr7D<<@v>;2e8)wg2UwvotQw`%$1-@y;xZ8N?ad@I#*##Gytah@HVH7LTwz+GQT7`f;;LfIl7 zua)7Ba5CVFiMYW^TLKIjKIk`p{B0{9NMw|2O6;SFkL; zmwEvcz_E&8CrE=AwdKQW)M#tEkA!|fl^jC1dkfkY1mXutMAk0zd;i8it?mKh<;|s3 zC@B1Wgsws&^poELfMHZ8dxPTx$q}M8iH|vAsNlhEUt#PZI(0LGQ2i%bU>6FNDuT&- zek6!lrtMQ31Mzn{+LE}G)#N@tfu%-wV9 z(66R^V=%dg;L?p2zz0Gco^$jY)%n~BK?JBwoswQY6|)4sNLBd1e - + - + @@ -38,8 +38,9 @@ - - + + + @@ -59,8 +60,9 @@ - - + + + @@ -80,8 +82,9 @@ - - + + + diff --git a/Subsurface/Content/Items/Electricity/wire.png b/Subsurface/Content/Items/Electricity/wire.png deleted file mode 100644 index b7e47f30194334b48daa242eb47362187e1aa71b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1568 zcmV+*2H*LKP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ>rb$FWRCwClS6z%>;M?q6<{Q*p)ErxMG#3;sKE#;*~tN}rg_(HEU zd(Z}Bd@vy~7&I}y_|oFTJ$HI*NDPT0;X#cSPzg;b5Qz#tP$`BO#XiU=I`^KRz1Q;P zT!Ph^&WsQecd~Mlot?G6z1FwBwGNpXUdzRJjhB1191jMAZOr@*BAO+ly=Hcqs@@%A z{N}3yU@#bXB6=4yUrj`x5RprWXe%>=h@h%4v)uq*IRIr@o=d=S8eBH~|m zAyoA=fXB`3K{NZonLcQKPWk&B540H&Az3BZq4^?m@SRQ0*V#l;s^^Rp=c z!{P7-5xI+qf|*rj_JEl^(%G+LjLYlwwP65DOG^ht`jx;e)9>}J!rApoP% z==P#0?r_c_=lo*RH20|L^JcbUW`6|mjH;eoE99F3P?qIZ=iI>%!c8Fr5D}WDLEE+f z01*KI5HK?{bFugSC&S_J`b|Y(X=&*|Q51KI2vSN_O6l9Gddz$O)eyoJ9T(6v&9f<` zd(G?*M061|U+29)ZyJ@RX~rp~I6puCy>$a9%kn)%QT)n#-%BagP1Ag(Q?@UA?_ck| z2Qwq3gsQ5lobxlxd|XwJ0{ATvea1O=oA-W(nbEc_nx?sBetv$iE&zuQAO2AY;c6m6 zUDpo*P!ZYF3624H4#2XRovW(vWM*OJDF+@?)f)k9@!lT|A#CmZR87-d9%FoRO%9Z0 z`4MLRxS64C+ou4$#W}Z!h>&ysVcWJJZklFp|Ni~&Z`<|~RlPLl{KcH}JpgKEzFb6( z0eGQp+iTjkoiH=J_dOB0<*dCxM7|~>lygogrAL_ghVEsfe!u^@m!Dl+T&w{6uCqgB zS?&^%dx_|L5qT)*JePAGsOpzQ1k8NZnpIGi<*bP877>`)Ujgi9<~OS9@s!emvsF!u z@!_2FJ~LY;qV3Flx2oQsQi7R*h~Bm)0A{|{d+$4OdC|f~ zKI)u9Q55jrPq&|6D+TY%Ib$-J{9*$_-I2>N-oV#ku zr=0V&TRyRB3RHDRcW?>7n?>XxGs8KD5CY8X^G(xSIU0?gHnZQT>TxqW7GoR_27?|E zUC7Kg6-Dt$=iFRT6mZU=6ExIyJ;^yATor(saaSs7VPWCWXf*l|5q-A19G#lYn%OK7 zUDK84sUt^@{JkiOH;Bk~=bZQ6Lqs4Vn5ML@YowIE5Mz8|EfVHV&$j_UN@;&pRUzkm zy_uP+KB=k@k=YP}@AY~xvmKqlOiTBr0cHB~s;ba5&9~;~=f8WlGW>n_y>>7dNQ|*f zDcxMx_0g0P<(zkRqxL_|%sP^y*XtpKfa%Mp(@|Ab7>~!O>-zS7zkl0V2NG2scA9?y z0O-s-zGMQjJ9%DQnFIQD{W53`3#<~ZRvMl!i z_;ZZ$=`;3;i1sq`E+RS~z)m9CK}5wFJW6JEN>z`mY8hiZ`HGI^|95}K{~7=zMqV0F SPo%p50000 - + diff --git a/Subsurface/Source/Physics/PhysicsBody.cs b/Subsurface/Source/Physics/PhysicsBody.cs index 4e6f9a296..ad1e881d9 100644 --- a/Subsurface/Source/Physics/PhysicsBody.cs +++ b/Subsurface/Source/Physics/PhysicsBody.cs @@ -500,7 +500,7 @@ namespace Barotrauma { //if there are more than 2 positions in the buffer, //increase the interpolation speed to catch up with the server - float speedMultiplier = 0.9f + (float)Math.Pow((positionBuffer.Count - 2) / 5.0f, 2.0f); + float speedMultiplier = (float)Math.Pow(1.0f + (positionBuffer.Count - 2) / 10.0f, 2.0f); netInterpolationState += (deltaTime * speedMultiplier) / (next.Timestamp - prev.Timestamp); newPosition = Vector2.Lerp(prev.Position, next.Position, netInterpolationState);