mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-07-24 22:57:50 +07:00
Merge branch 'master' of https://github.com/Anuken/Mindustry
This commit is contained in:
@ -1181,10 +1181,6 @@ public class UnitType extends UnlockableContent{
|
||||
drawShield(unit);
|
||||
}
|
||||
|
||||
if(mech != null){
|
||||
unit.trns(-legOffset.x, -legOffset.y);
|
||||
}
|
||||
|
||||
//TODO how/where do I draw under?
|
||||
if(parts.size > 0){
|
||||
for(int i = 0; i < parts.size; i++){
|
||||
@ -1212,6 +1208,10 @@ public class UnitType extends UnlockableContent{
|
||||
}
|
||||
}
|
||||
|
||||
if(mech != null){
|
||||
unit.trns(-legOffset.x, -legOffset.y);
|
||||
}
|
||||
|
||||
Draw.reset();
|
||||
}
|
||||
|
||||
|
@ -408,12 +408,12 @@ public class Weapon implements Cloneable{
|
||||
}
|
||||
|
||||
shoot.shoot(mount.totalShots, (xOffset, yOffset, angle, delay, mover) -> {
|
||||
mount.totalShots++;
|
||||
if(delay > 0f){
|
||||
Time.run(delay, () -> bullet(unit, mount, xOffset, yOffset, angle, mover));
|
||||
}else{
|
||||
bullet(unit, mount, xOffset, yOffset, angle, mover);
|
||||
}
|
||||
mount.totalShots++;
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -139,4 +139,8 @@
|
||||
"name": "OMNIDUSTRY",
|
||||
"address": ["109.94.209.233"]
|
||||
}
|
||||
{
|
||||
"name": "New Campaign Like",
|
||||
"address": ["n5.yeet.ml:6568"]
|
||||
},
|
||||
]
|
||||
|
Reference in New Issue
Block a user