From e1685ef46c0376140a7a15f27547e58fc0a5f23e Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Fri, 26 Nov 2021 08:05:50 -0800 Subject: [PATCH 1/4] BlueWolf does not want MoveLightningAbility to mirror (#6376) --- .../mindustry/entities/abilities/MoveLightningAbility.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/src/mindustry/entities/abilities/MoveLightningAbility.java b/core/src/mindustry/entities/abilities/MoveLightningAbility.java index cec4332dd2..d91a0d6cc8 100644 --- a/core/src/mindustry/entities/abilities/MoveLightningAbility.java +++ b/core/src/mindustry/entities/abilities/MoveLightningAbility.java @@ -36,8 +36,6 @@ public class MoveLightningAbility extends Ability{ public Effect shootEffect = Fx.sparkShoot; public boolean parentizeEffects; public Sound shootSound = Sounds.spark; - - protected float side = 1f; MoveLightningAbility(){} @@ -66,7 +64,7 @@ public class MoveLightningAbility extends Ability{ public void update(Unit unit){ float scl = Mathf.clamp((unit.vel().len() - minSpeed) / (maxSpeed - minSpeed)); if(Mathf.chance(Time.delta * chance * scl)){ - float x = unit.x + Angles.trnsx(unit.rotation, offset, width * side), y = unit.y + Angles.trnsy(unit.rotation, offset, width * side); + float x = unit.x + Angles.trnsx(unit.rotation, offset, width), y = unit.y + Angles.trnsy(unit.rotation, offset, width); shootEffect.at(x, y, unit.rotation, color, parentizeEffects ? unit : null); shootSound.at(unit); @@ -78,8 +76,6 @@ public class MoveLightningAbility extends Ability{ if(bullet != null){ bullet.create(unit, unit.team, x, y, unit.rotation + bulletAngle + Mathf.range(bulletSpread)); } - - side *= -1f; } } From c0554072498219060dc25070518aafe528bdc70d Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Fri, 26 Nov 2021 13:45:27 -0500 Subject: [PATCH 2/4] Fix editor camera panning (#6380) VSync being disabled will make the camera move unbearably fast currently as it isnt tied to frame time. --- core/src/mindustry/editor/MapView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/editor/MapView.java b/core/src/mindustry/editor/MapView.java index e1e0512c43..a2502e4b8a 100644 --- a/core/src/mindustry/editor/MapView.java +++ b/core/src/mindustry/editor/MapView.java @@ -181,8 +181,8 @@ public class MapView extends Element implements GestureListener{ if(Core.scene.getKeyboardFocus() == null || !(Core.scene.getKeyboardFocus() instanceof TextField) && !Core.input.keyDown(KeyCode.controlLeft)){ float ax = Core.input.axis(Binding.move_x); float ay = Core.input.axis(Binding.move_y); - offsetx -= ax * 15f / zoom; - offsety -= ay * 15f / zoom; + offsetx -= ax * 15 * Time.delta / zoom; + offsety -= ay * 15 * Time.delta / zoom; } if(Core.input.keyTap(KeyCode.shiftLeft)){ From 061357e1df9eb49d233247b9f2e93e60b409c5a4 Mon Sep 17 00:00:00 2001 From: Darkness#3729 <79508138+Darkness6030@users.noreply.github.com> Date: Mon, 29 Nov 2021 17:46:45 +0300 Subject: [PATCH 3/4] Reserved 5000 port for a new gamemode (#6385) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 👀 --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 1fa352ca86..6178f0da0f 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -25,7 +25,7 @@ }, { "name": "DarkDustry", - "address": ["darkdustry.ml", "darkdustry.ml:6000", "darkdustry.ml:7000", "darkdustry.ml:8000", "darkdustry.ml:9000"] + "address": ["darkdustry.ml", "darkdustry.ml:5000", "darkdustry.ml:6000", "darkdustry.ml:7000", "darkdustry.ml:8000", "darkdustry.ml:9000"] }, { "name": "Chaotic Neutral", From 582f05fa33fc33ad6e304e7e4623c95fb84af81b Mon Sep 17 00:00:00 2001 From: smol <75618732+SMOLKEYS@users.noreply.github.com> Date: Tue, 30 Nov 2021 01:23:16 +0800 Subject: [PATCH 4/4] Fix a single pixel in Fuse's sprite (#6387) * Create m * Delete m * Add files via upload --- .../sprites/blocks/turrets/fuse.png | Bin 2369 -> 1587 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png index 61ff3c7b2d8c66ba1009678759699db8b695d9c3..16c3d3991c236bff2884a1a89db476f8d129a27c 100644 GIT binary patch delta 1571 zcmV+;2Hg3<60;1DBYy?@NklziS*v6vt0sa1$`Nc5zD}sE8w#DXhv>ia3=Z zO}aD&m%(6EABN!4kS3iQgR3}2s#M7zkROc+1i5f+Fr;yH;US(hH<};sy?Jlut+k&< zcelH z&x_lQ!li&*_$`1Kj}qJoum~UVD8ZG0T=k&|2(DFQJ#izTNBD>*2`&Wm3?K0#VYq-1 z;UgX-3>R?KSp*Db5ipoVz+e^ugINR&W)UzLR{}n}{jvEz{`&jhF8iV4MnKO{JV|gN zpcKYWFMr*6|9|Q2&x<|h)6>^G@26>=xXv%e91k~oJCd~pc%v@EG z!lMLk_!m{%rfI)T0`7nJ`+5Ces;^T}CDf{zT8|bxTqWe;uU6kb`)~X3n~%iT0kMEE zd_-Hq&FjC&4ldxg7vDl}H@mzge56H!NI)ulM1Mx%!S1XKL++ul2B^4#^r|JKu%wR zD}gM46F!0xQeXd6SS{g~$_+_LNRsCs0WINA2Z!~QR=VLME!9!T>7Rd)e~%c7grb1ChL2Drz(7z9O9@#4J;I+8 zRuYl|mhjV9NVp`RC46Y{Ob7Xk?uP($-lVs z=iRH_n}iezqGl*il8_2NysOD=F=$G#3Li+#oG3|X>WBd;3AON%5fUuJN2n51Zbbm0 z1Zwz5PYFH3M`{vOZ^i*20e;5QP$iD@PMVYi)A4{9&VRsq zETML`YEC(+l@m+gd}FDz>2in#NM<#lgj)DWO~Q6tZz)qHq6EpUh877T0WDKXsNo~E zSr3{Mv(BnE*}WdA1h#;d@Tr|P$y}oncwwXj)N-5QY&+gOA+s^z7;gCZx>Z6LCiN`U zzTsBFbW9kLgdct;mC*7qMlT8GV}HUe;fKq(5;Pvh=pn&$OjslQa2;xSnh#@GOE4P~ z)(k&fw^lAEEDsV)#)K`x54XvcF9~V11obgt%kZrjDM5Wqn1WSbqO}b_Lc)%KIfswT zO@hjxyqEA1?-D|G1V{$tVH?VmlD)!5dPsmX8O~@<+0|(&90@o^0RNe&B!59O{Mz3K z3YS|-z{gWL5>#hJVE9N*f@SzA;#=4j65?lrDH2p?Ma1DFv4q~?BbE|!4`!DnsLqPW zg^!?wQQ;#N5^7JyrzEJ(il~K;j1C{smO#1JA4*W26+u}K=+T#Gp~oFglkos+dd@G^ zoLt+Ax&ZCTy)CmNO515ou77RC`Zu$W+ni59;&)^bn1ppwSzD|!LvBR~1tH2^)FdU13!7Ks>^FMyj Vm{j;&0JQ)B002ovPDHLkV1g)P(u4p2 delta 2359 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