Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,615 Commits 4 Branches 180 Tags
73bde0d3afba9332f5552212f58b83fbad907021
Commit Graph

2384 Commits

Author SHA1 Message Date
KochiyaUenehaaa
73bde0d3af fixed RepairTower (#10489) 
* fixed RepairTower

* oops
 2025-02-10 10:46:24 -05:00
Anuken
90dc291b66 Unit assembler shader fix 2025-02-09 22:12:59 -05:00
nullevoy
8ee02562c3 Make assembler plans support items and liquids, allow changing sap bullet regions (#9413) 
* make assembler plans support items and liquids, allow changing sap bullet regions

* leftover copypaste

* hhhhhhhhhhhhhhh

* may want to add this as well

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-09 21:53:52 -05:00
Anuken
3378475f6a Closes #6940 2025-02-09 11:49:26 -05:00
Anuken
3246c0c39b Configurable block build time 2025-02-09 11:24:34 -05:00
Anuken
f6e9cffa9c Fixed #10484 2025-02-09 10:00:27 -05:00
MEEPofFaith
e8a4ecc61e Formatting Icons (#10359) 
* formatIcons

* Smarter end check

I think it's smarter?

* unecessary

* oop

* Update UI.java

* Just don't check for adjacent colons.

The hasUnicodeStr already checks for validity

* Copy from I18NBundle

* Revert "Copy from I18NBundle"

This reverts commit ac660fcd9f.

* If get and format refer to parent, then just set the existing bundle as parent

* Test with Ground Zero objectives

* Update MBundle.java

* That didn't work

* Slip the method into reasonable places like objectives and chat

* Check for Icons as well

* More testing with objective text

* Apply to hints

* Optimized formatIcons

No longer scans through every character

* TIME UPDATE THE BUNDLES YIPPEEEEEEEEEEE

* residual

* Apply to message blocks

* IntelliJ lied

* Suggestions

* Format before sending
 2025-02-09 00:05:43 -05:00
Anuken
a77f64f2d0 Cleanup 2 2025-02-08 21:28:02 -05:00
Anuken
e7c3c1f898 Cleanup 2025-02-08 21:21:59 -05:00
MEEPofFaith
e9ecb2a576 Hovering over blocks with a selection displays the selection (#10323) 
* Selection display

Should this go in building or block?

* Apparently serpulo liquid icons are not square???

* simplify

* simplify further

* Add disabling w/ setting

Probably needs a better name

* Better name

* h
 2025-02-08 21:21:09 -05:00
MEEPofFaith
07e573ac42 minRangeChange + draw min range (#7504) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-08 20:37:02 -05:00
Anuken
b96191f6d6 Closes #8590 2025-02-08 19:33:23 -05:00
Anuken
ebaf88e80d Fixed logic IDs not loading / Accelerator animation tweaks 2025-02-08 16:04:04 -05:00
Anuken
710895fab5 Closes #9664 2025-02-08 00:07:58 -05:00
Anuken
c100d8c13c Fixed #10467 2025-02-06 23:58:32 -05:00
Anuken
eaaa4f9bd8 Possible door config fix 2025-02-06 21:05:49 -05:00
MEEPofFaith
ed42bcb4f6 ShieldDamageMultiplier for bullets (#6331) 
* ShieldDamageMultiplier + Dynamic damage multipliers

* Add to stats

* That's not right

* merge typo

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-06 16:57:17 -05:00
Anuken
d08d17a309 Cleanup 2025-02-06 15:52:20 -05:00
MEEPofFaith
4a0bf40431 reloadWhileCharging (#6889) 
* reloadWhileCharging

* stat?

should include or nah?

* hshchqqqjwvejqwoofpvoeqviwfojpieqwvwcqekpoivmopijr

* Update core/src/mindustry/world/blocks/defense/turrets/Turret.java

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-06 15:44:19 -05:00
MEEPofFaith
527e2ee09c Fix loop sound persisting after the payload carrier is removed. (#8034) 
* Properly remove units and blocks in the case that the carrier dies

* added = false

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-06 13:23:11 -05:00
Anuken
3ec6a74c1f Merge 2025-02-06 12:17:56 -05:00
Anuken
9a8ae81af2 Allow landing pad config in more situations / Small power node build time increase 2025-02-05 20:22:19 -05:00
BlackDeluxeCat
108b101669 Logic sensor accesses more infos of payload (#8766) 
* Added Logic Sense Payload

* Update UnitComp.java

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-05 19:36:26 -05:00
overdramaticpanromantic
5140c37ed4 Allow updateEffect spread to be customized or disabled for GenericCrafter (#10422) 
* Allow updateEffect spread to be customized or disabled for GenericCrafters

* i think that fixed it?
 2025-02-05 18:50:59 -05:00
Anuken
2665599520 Closes #10440 2025-02-05 18:47:16 -05:00
Anuken
c08ebc149a Revert "Make liquid production blocks dump as much output as possible" 
This reverts commit 574ae0bf
 2025-02-05 10:24:44 -05:00
Anuken
0e992f9bc0 Merge remote-tracking branch 'origin/master' 2025-02-04 20:40:40 -05:00
Anuken
574ae0bfb1 Make liquid production blocks dump as much output as possible 2025-02-04 20:40:31 -05:00
MEEPofFaith
22d62067a0 Multiple blocked items for drills + Blocked items for beam drills (#8527) 
* Multiple blocked items for drills

Works similarly to output item with GenericCrafters

* blocked items for beam drills
 2025-02-04 15:52:04 -05:00
Anuken
b96e93917c Cleanup 2025-02-04 14:49:30 -05:00
MEEPofFaith
939506ffae Fix multi-item boosters displaying multiple times (#10297) 2025-02-04 14:38:01 -05:00
Sh1p*nfire
336eafdb6a SeaBush draws on block's layer (#10086) 2025-02-04 14:19:13 -05:00
Mythril382
7f3134f0fc chain effect (#10310) 
MAN do i want to change "openfx" and "closefx" to "openEffect" and "closeEffect"
 2025-02-04 13:52:59 -05:00
Maxiron794
aa8e3b4a37 fix of diode's strange behavior (#10454) 2025-02-04 13:32:52 -05:00
SomeonesShade
0b4a7b3b16 Added scaleLifetimeOffset and Centered Ripple Projectiles (#10292) 
* Added scaleLifetimeOffset
Changed ripple to have its shot centered, calculated by: (1 - velocityRnd/2)^-1

* unneccessary parenthesis

* Update Turret.java

one last adjustement, hopefully
 2025-02-04 13:24:47 -05:00
Anuken
9f03050d04 Allow launch/landing pads outside of campaign as voids/sources 2025-02-03 21:55:33 -05:00
Anuken
024a084a7a Fixed #10461 2025-02-03 20:14:59 -05:00
Anuken
4e225f9190 Internal support for legacy launch pads (hidden) 2025-02-03 19:27:08 -05:00
Anuken
55e32f9580 Fixed some landing pad state not saving / Renamed pad 'heat' to 'cooldown' 2025-02-02 23:19:43 -05:00
Anuken
ccda69bda0 Minor launch/landing pad tweaks/fixes 2025-02-02 20:33:12 -05:00
Anuken
7aee34bafa Finalized launch pad mechanics 2025-02-02 18:10:15 -05:00
Anuken
c6d82bec66 Allowed drills to output multiple items per frame 2025-02-02 10:54:51 -05:00
Anuken
18b78f4bf6 Launch pad rework progress, base mechanics done 2025-02-01 20:46:08 -05:00
Anuken
ab65c9d29a WIP launch pad rework 2025-01-31 17:58:35 -05:00
Anuken
e308afb2a0 Fixed accelerator timing 2025-01-28 23:28:36 -05:00
Anuken
6c31853c11 WIP Interplanetary Accelerator animation 2025-01-28 21:30:38 -05:00
Anuken
22538840a1 Interplanetary Accelerator re-added with functionality (WIP) 2025-01-23 20:10:20 -05:00
Anuken
6c42b30309 Rotate unit with assemblers / Reduced impact drill water cost to 10/s 2025-01-19 23:06:27 -05:00
Anuken
34cc625e33 Fixed #10436 2025-01-19 15:07:11 -05:00
Anuken
59e64ab37c Fixed scathe bugs 2025-01-12 20:49:06 -05:00