Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2022-08-19 20:08:12 -04:00
parent a8900d28f9 bec3de9d67
commit b9e633a10e
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/entities/effect/ParticleEffect.java
View File

@@ -44,6 +44,7 @@ public class ParticleEffect extends Effect{
//line only //line only
public boolean line; public boolean line;
public float strokeFrom = 2f, strokeTo = 0f, lenFrom = 4f, lenTo = 2f; public float strokeFrom = 2f, strokeTo = 0f, lenFrom = 4f, lenTo = 2f;
public boolean cap = true;
private @Nullable TextureRegion tex; private @Nullable TextureRegion tex;
@@ -77,7 +78,7 @@ public class ParticleEffect extends Effect{
rv.trns(realRotation + rand.range(cone), !randLength ? l : rand.random(l)); rv.trns(realRotation + rand.range(cone), !randLength ? l : rand.random(l));
float x = rv.x, y = rv.y; float x = rv.x, y = rv.y;
Lines.lineAngle(ox + x, oy + y, Mathf.angle(x, y), len); Lines.lineAngle(ox + x, oy + y, Mathf.angle(x, y), len, cap);
Drawf.light(ox + x, oy + y, len * lightScl, lightColor, lightOpacity * Draw.getColor().a); Drawf.light(ox + x, oy + y, len * lightScl, lightColor, lightOpacity * Draw.getColor().a);
} }
}else{ }else{

2
servers_v6.json
View File

@@ -9,7 +9,7 @@
}, },
{ {
"name": "Omega Hub", "name": "Omega Hub",
"address": ["n1.yeet.ml", "n1.yeet.ml:6568","n1.yeet.ml:6569" , "n1.yeet.ml:6570" ,"n1.yeet.ml:6571", "n1.yeet.ml:6609"] "address": ["n5.yeet.ml", "n1.yeet.ml:6568","n5.yeet.ml:6569" , "n1.yeet.ml:6570" ,"n1.yeet.ml:6571", "n1.yeet.ml:6609"]
}, },
{ {
"name": "RCM", "name": "RCM",

2
servers_v7.json
View File

@@ -22,7 +22,7 @@
}, },
{ {
"name": "Omega Hub", "name": "Omega Hub",
"address": ["n1.yeet.ml:6572", "n1.yeet.ml:6573", "n1.yeet.ml:6604", "n1.yeet.ml:6605", "n1.yeet.ml:6608","n1.yeet.ml:6599"] "address": ["n1.yeet.ml:6572", "n1.yeet.ml:6573", "n1.yeet.ml:6604", "n5.yeet.ml:6605", "n5.yeet.ml:6606", "n1.yeet.ml:6608","n1.yeet.ml:6599"]
}, },
{ {
"name": "KMWStudios", "name": "KMWStudios",