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

2848 Commits

Author SHA1 Message Date
Anuken
95e663d1df Misc bugfixes 2025-04-05 10:48:07 -04:00
Anuken
96ca7f797f Closes #10532 2025-04-04 13:43:16 -04:00
Cardillan
6a21b12b11 Adds LAccess.memoryCapacity - sensable property returning the size of a memory block (#10589) 2025-04-04 13:26:41 -04:00
Anuken
1911fced21 Fixed #10540 2025-04-04 12:12:16 -04:00
Anuken
b7dbe54d76 Merging changes from private branch 2025-04-04 11:47:35 -04:00
Ovulam5480
edffc24cca Fixed shockwaveTower efficiency (#10538) 2025-03-17 12:37:03 -04:00
Anuken
f7b13b7924 Fixed mixtech vault item dupe 2025-03-09 10:19:09 -04:00
Anuken
11061d1dd1 Fixed #10502 2025-02-23 01:26:47 -05:00
Anuken
ed05214ea4 Fixed #10497 2025-02-23 01:22:52 -05:00
Anuken
79a9a446c4 PR cleanup 2025-02-10 15:53:46 -05:00
Anuken
fec91eb157 Merge branch 'balancing_burst-drill-optional-multiplier' of https://github.com/SomeonesShade/Mindustry into SomeonesShade-balancing_burst-drill-optional-multiplier 2025-02-10 15:51:47 -05:00
Anuken
c32b304c78 Sync core units with spawner block database tab 2025-02-10 13:50:27 -05:00
patatayui
5f8f0140a2 Allow conveyors/ducts to use duct/conveyor bridges (#10179) 
* Allow conveyors/ducts to use duct/conveyor bridges

* Apply suggestions from code review

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-10 11:04:14 -05:00
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
SomeonesShade
1579a3b068 Merge branch 'Anuken:master' into balancing_burst-drill-optional-multiplier 2025-02-08 16:28:05 +08: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
Anuken
393694aa7d Cleanup 2025-02-06 16:58:40 -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
Anuken
4ea51bccc1 Merge remote-tracking branch 'origin/master' 2025-02-06 14:27:43 -05:00
Anuken
588faad6f9 Rule for extra core no-build radius per-team 2025-02-06 14:27:35 -05:00
Twcash
a74460c49a Give X Y offsets to DrawCruci and DrawArc and make DrawRegion support x y and rotation in DrawPlan (#10412) 
* Allow DrawRegions plan to support X Y and rotation

* Give DrawArcSmelt and DrawCruci X and Y offsets

* fixes
 2025-02-06 14:27:00 -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
Anuken
0377ef3a08 Merge remote-tracking branch 'origin/master' 2025-02-05 19:44:31 -05:00
Anuken
2e19fbf417 Closes #7921 2025-02-05 19:44:24 -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
0826a6edfe Merge remote-tracking branch 'origin/master' 2025-02-04 14:49:38 -05:00