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

11584 Commits

Author SHA1 Message Date
Anuken
02d56d27db Merge branch 'mining-beam-weapon' of https://github.com/MEEPofFaith/Mindustry into MEEPofFaith-mining-beam-weapon 2025-02-09 11:18:16 -05:00
Anuken
e57e47617c Closes #10302 2025-02-09 11:15:33 -05:00
Anuken
c3aabdcfc5 Closes #9498 2025-02-09 11:09:11 -05:00
Anuken
f6e9cffa9c Fixed #10484 2025-02-09 10:00:27 -05:00
MEEPofFaith
3e8a40b1e6 Mention default value 2025-02-08 21:52:31 -08:00
MEEPofFaith
70e9d6d4f8 oops 2025-02-08 21:45:28 -08:00
MEEPofFaith
6eb463f5ed oops 2025-02-08 21:44:56 -08:00
MEEPofFaith
35972a6fd9 oops 2025-02-08 21:44:33 -08:00
MEEPofFaith
78aa3b1848 Move back to UnitType 2025-02-08 21:43:56 -08:00
MEEPofFaith
3561562624 oopsies 2025-02-08 21:41:26 -08:00
Anuken
44cd05f8b6 Privileged read/write fix 2025-02-09 00:40:29 -05:00
Anuken
b0f27c94bc Merge branch 'master' into pr-readwrite 2025-02-09 00:38:18 -05:00
MEEPofFaith
81b576e8d3 Mine beam wobbles 2025-02-08 21:38:10 -08:00
MEEPofFaith
178f98b6ea Mining beam weapon 2025-02-08 21:33:43 -08:00
MEEPofFaith
848249a6dd Consistent engine whites (#10482) 2025-02-09 00:32:34 -05:00
MEEPofFaith
d7589ca97c Make mining beam drawing consistent with build beam drawing 2025-02-08 21:29:30 -08:00
MEEPofFaith
f724e5639f BuildWeapon call super 
idk if it matters if name is null, but just in case
 2025-02-08 21:18:02 -08:00
Anuken
4183a2a485 Minor chat formatting improvements for desktop typing 2025-02-09 00:11:26 -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
aaf335d06c Closes #9903 2025-02-09 00:03:05 -05:00
Anuken
7dedf6c488 Misconfigured planet crash fix 2025-02-08 23:41:51 -05:00
Anuken
48afcddf1a Cleanup 2025-02-08 23:35:07 -05:00
Anuken
03c3414305 Merge branch 'port-field' of https://github.com/antsif-a/Mindustry into antsif-a-port-field 2025-02-08 23:26:40 -05:00
Anuken
5cbb358522 Checked button fix 2025-02-08 21:43:34 -05:00
Anuken
5cdee0e765 Allow commanding while planning on mobile 2025-02-08 21:41:36 -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
f8ff370dbe Merge branch 'master' into port-field 2025-02-08 19:36:26 -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
f8b6600fe7 Closes #5033 2025-02-08 10:48:44 -05:00
Anuken
ce5bca120a Fixed #10475 2025-02-08 10:15:00 -05:00
Anuken
710895fab5 Closes #9664 2025-02-08 00:07:58 -05:00
Anuken
49f68be2cb Closes #6790 2025-02-07 21:19:25 -05:00
Anuken
88cfb10621 Fixed #10474 2025-02-07 20:49:21 -05:00
Anuken
d5bf4f46e8 Console injection fix 2025-02-07 16:55:57 -05:00
Anuken
c100d8c13c Fixed #10467 2025-02-06 23:58:32 -05:00
Anuken
423d635efe More base generation fixes 2025-02-06 23:11:11 -05:00
Anuken
eaaa4f9bd8 Possible door config fix 2025-02-06 21:05:49 -05:00
Anuken
e630f21aae Base part fixes 2025-02-06 20:44:25 -05:00
Anuken
5fca75734c Closes #9314 2025-02-06 17:15:40 -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
Twcash
03ab78b3a1 crawling (#10110) 2025-02-06 16:35:49 -05:00
Anuken
67ba6e2914 Closes #8520 2025-02-06 16:21:53 -05:00
Anuken
d08d17a309 Cleanup 2025-02-06 15:52:20 -05:00
Ilya246
ba622cb76b Improve router bundle (#6269) 
* router

* optimise
 2025-02-06 15:51:32 -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