Commit Graph

1360 Commits

Author SHA1 Message Date
Anuken
f683496440 cleanup 2021-10-15 17:04:34 -04:00
Anuken
9a5ac14bc3 Fixed #6158 2021-10-15 11:40:55 -04:00
Anuken
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken
ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
Anuken
1f1a5bde3e Removed unused PayloadLaunchPad class 2021-10-13 14:00:31 -04:00
Anuken
4a4b336814 Added logic payEnter command 2021-10-13 10:18:34 -04:00
Matthew Peng
fdfe381b6e Unhardcode Drill Effect Randomness (#6144)
* Unhardcode Drill Effect Randomness

* I should start refusing to make prs for people
2021-10-12 22:32:58 -04:00
Matthew Peng
8c3ecfdb06 Make Burst + Spread Work (#5589)
* Make Burst + Spread Work

* This is why you use an IDE

* h
2021-10-12 17:36:59 -04:00
Anuken
25c8623e30 router 2021-10-12 12:35:46 -04:00
Matthew Peng
4030e71b31 Customizable Force Projector Absorb Effect (#6102)
* Customizable Force Projector Absorb Effect

* Fix everything

* Custom shield break effect
2021-10-10 17:06:59 -04:00
Anuken
3f53315a07 Proper implementation of #6099 (untested) 2021-10-06 13:09:45 -04:00
Matthew Peng
bc3da30d45 Allow for dynamic laser absorption and insulation (#5047)
* Allow for dynamic laser absorption

* Might as well do insulated as well

* null checks are important
2021-10-05 12:36:29 -04:00
Anuken
d95662233c Fixed #6090 2021-10-02 12:05:02 -04:00
Anuken
db6b8abce6 Fixed #6089 2021-10-02 08:42:07 -04:00
Anuken
0483e3f900 Serpulo naval wave support 2021-09-30 18:22:50 -04:00
Matthew Peng
a04b385f56 Fix spread + burst turrets (#6069)
* Fix spread + burst turrets

* spread is 4 by default

set salvo spread to 0

* damnit
2021-09-29 08:38:51 -04:00
Matthew Peng
182dfc5f38 delta in reload for a LaserTurret isn't properly calculated (#6068) 2021-09-28 08:41:40 -04:00
Matthew Peng
94d9ca4727 Pull creating and dumping products out into their own methods (#6047) 2021-09-26 08:31:21 -04:00
Matthew Peng
50cc340b20 Customizable Block Place Sound (#6043) 2021-09-24 21:28:20 -04:00
JrTRinny
47dc9c7b31 add playerControllable for turrets (#6019) 2021-09-18 09:52:31 -04:00
Anuken
087cd2c55a Cleanup 2021-09-12 20:21:55 -04:00
Anuken
35ffbef557 #5932 2021-09-12 11:07:18 -04:00
Anuken
90c2473448 Duct bridge crash fix 2021-09-11 10:07:00 -04:00
Anuken
9e737cd3fe Merge remote-tracking branch 'origin/master' 2021-09-08 20:44:31 -04:00
Anuken
deed84f9a3 Public power graph contents 2021-09-08 20:44:26 -04:00
Matthew Peng
868cd4fb0b Just because a generator doesn't have turbines doesn't mean it doesn't have liquid (#5962) 2021-09-08 20:40:56 -04:00
Anuken
cde192b59a Added Block#allowConfigInventory 2021-09-08 09:04:04 -04:00
Anuken
dd7062f0f7 ParticleEffect#sizeInterp / Log usable RAM 2021-09-07 22:32:27 -04:00
Anuken
4da21ba363 Added cliff support to editor 2021-09-05 20:08:02 -04:00
Anuken
063d2ce6c0 Implemented #5905 properly 2021-09-04 18:07:08 -04:00
Anuken
23d0dfe6bf Deprecated DoubleOverlayFloor 2021-09-04 16:29:14 -04:00
Anuken
24b0f445b8 Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
Anuken
ee8683c734 Do not display overdrive visual for router/conduit 2021-09-04 10:07:13 -04:00
Кирилл Алдашкин
3714077fbe Fixed the display of the oil extractor efficiency (#5915) 2021-09-04 09:58:38 -04:00
Matthew Peng
9b28eaa3b3 Allow for SingleTypeGenerators to use only liquid. (#5900) 2021-08-30 08:23:58 -04:00
Matthew Peng
2f47f13ef7 Adjustable generateEffect randomness (#5901) 2021-08-29 22:55:52 -04:00
Anuken
cc689fd114 Fixed #5895 2021-08-29 10:26:39 -04:00
Anuken
e30d7e998d Allow unit icons for sectors 2021-08-28 20:49:39 -04:00
Anuken
48d568978b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/src/mindustry/entities/Damage.java
2021-08-28 14:17:29 -04:00
Anuken
9a7324ce54 Fixed #5887 2021-08-28 14:17:01 -04:00
SMOLKEYS.exe
800f0f4511 inconspicuous OCD goes to brazil (#5884) 2021-08-28 09:13:57 -04:00
Anuken
4d62b0321f Fixed #5885 2021-08-28 08:44:42 -04:00
Anuken
139d6cd5cc Proper #5872 2021-08-26 15:07:08 -04:00
Anuken
2b6856634c Fixed #5864 2021-08-25 13:22:19 -04:00
Anuken
901d594768 Prevent server sound ear destruction / Particle effect rand param 2021-08-23 20:27:01 -04:00
SoMall-dumpling
3bd3d3aa37 Avoid ambiguity (#5809)
* Avoid ambiguity

When you see 'boost: 150%'
It can be 'increase the speed to 150%' or 'increase the speed to 250%'.
Maybe you will say that the colon has already avoided this ambiguity.
But you know there's always someone who ignores those things, and also translating 'boost' is hard with no 'x' to avoid ambiguity.
With a 'x', it will show 'Boost: x150%', which will never be thought as 250%.

* Update OverdriveProjector.java

When power is low, show 'low power: -{0}%';
When power is high, show 'boost: +{0}%'.

* Update bundle.properties

* Update bundle.properties

* Update OverdriveProjector.java

bugfix(perhaps)

* Update OverdriveProjector.java

what if

* Update OverdriveProjector.java

InTeReStInG

* Update OverdriveProjector.java

back to the past

* Update OverdriveProjector.java

Now using Math.max.

* Update bundle_bg.properties

* Update bundle_de.properties

* Update bundle_fr.properties

* Update bundle_hu.properties

* Update bundle_in_ID.properties

* Update bundle_ja.properties

* Update bundle_ko.properties

* Update bundle_pl.properties

* Update bundle_ro.properties

* Update bundle_ru.properties

* Update bundle_th.properties

* Update bundle_uk_UA.properties

* Update bundle_vi.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_TW.properties

* Update OverdriveProjector.java

Maybe this is necessary.

* Update OverdriveProjector.java

The stats are '+50%' ,etc. now.

* Update OverdriveProjector.java

Necessary, because the previous one is strange.
2.5 does not make sense. 12.5 does.
2021-08-23 12:37:34 -04:00
Anuken
160fdee596 Consistent tile attribute display 2021-08-23 09:12:36 -04:00
Matthew Peng
b860b2bbfb Don't show core ghosts (#5834) 2021-08-22 09:45:17 -04:00
Anuken
f85c078de8 PR cleanup 2021-08-21 11:34:05 -04:00
Matthew Peng
9cc08ada22 Heal Targetting on Turrets (#5820)
* Heal Targetting on Turrets

* Just in case
2021-08-21 11:33:20 -04:00