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

 Conflicts:

	gradle.properties

2021-11-10 14:36:45 -05:00

..

ArtilleryBulletType.java

Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00

BasicBulletType.java

Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00

BombBulletType.java

AI bugfixes / Balance

2020-07-29 21:09:58 -04:00

BulletType.java

Homing on healing bullets does not take collided into account (#6276)

2021-10-31 13:03:19 -04:00

ContinuousLaserBulletType.java

Let bullets have speed = 0

2021-06-04 08:53:39 -04:00

EmpBulletType.java

Pointless if (#6310)

2021-11-06 21:12:38 -04:00

FireBulletType.java

Refactored fireball into FireBulletType

2021-08-08 13:37:55 -04:00

FlakBulletType.java

Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00

LaserBoltBulletType.java

Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00

LaserBulletType.java

Let bullets have speed = 0

2021-06-04 08:53:39 -04:00

LightningBulletType.java

Let bullets have speed = 0

2021-06-04 08:53:39 -04:00

LiquidBulletType.java

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

2021-09-20 09:19:16 -04:00

MassDriverBolt.java

Refactored fireball into FireBulletType

2021-08-08 13:37:55 -04:00

MissileBulletType.java

Logic battery control + Slight swarmer range buff

2021-01-08 12:22:32 -05:00

PointBulletType.java

Long-range 4x4 turret (wip) / Java 14 language upgrade

2020-09-29 23:55:55 -04:00

RailBulletType.java

Fixed RailBulletType effect length

2021-08-27 22:33:56 -04:00

SapBulletType.java

No payload source power

2021-06-04 11:35:01 -04:00

ShrapnelBulletType.java

No payload source power

2021-06-04 11:35:01 -04:00

SpaceLiquidBulletType.java

Cleanup

2021-08-20 12:28:05 -04:00