Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Conflicts: core/assets/logicids.dat core/src/mindustry/content/Blocks.java gradle.properties
2021-09-28 18:45:09 -04:00
parent 8a3d46b4a7 71543f2ab2
commit 5f3cef251b
53 changed files with 450 additions and 146 deletions
@@ -91,6 +91,10 @@ public class BulletType extends Content implements Cloneable{
    public boolean collidesAir = true, collidesGround = true;
    /** Whether this bullet types collides with anything at all. */
    public boolean collides = true;
+    /** If true, this projectile collides with non-surface floors. */
+    public boolean collideFloor = false;
+    /** If true, this projectile collides with static walls */
+    public boolean collideTerrain = false;
    /** Whether velocity is inherited from the shooter. */
    public boolean keepVelocity = true;
    /** Whether to scale lifetime (not actually velocity!) to disappear at the target position. Used for artillery. */