Commit Graph

1564 Commits

Author SHA1 Message Date
Anuken
7472fe5c12 Merge remote-tracking branch 'origin/master' 2025-04-04 13:39:29 -04:00
Anuken
01a7b6e68f Closes #10521 2025-04-04 13:39:22 -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
8efd62e668 PR cleanup 2025-02-10 17:03:46 -05:00
Anuken
5a56825801 Merge branch 'mod-dependencies' of https://github.com/MEEPofFaith/Mindustry into MEEPofFaith-mod-dependencies 2025-02-10 16:31:56 -05:00
ivan71kmayshan27
0d96a68e84 Allow configuration of minimum and maximum camera distance in main game screen (#7603)
* Variable min and max zoom

* Variable min and max zoom

* Variable min and max zoom

---------

Co-authored-by: ivan <ikamyshan@evolution.com>
Co-authored-by: Anuken <arnukren@gmail.com>
2025-02-10 16:09:35 -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
7a6222aa18 Revert "Allow markers to be used as light sources (#9733)" (#10490)
This reverts commit 8626082068.
2025-02-10 14:24:46 -05:00
Redstonneur1256
8626082068 Allow markers to be used as light sources (#9733)
* Allow markers to be used as light sources

* Better light source markers

* Move PointMarker drawLight to LightMarker

* Add a rule for unit lights

* Optimize marker rendering

* Update core/assets/bundles/bundle.properties

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2025-02-09 12:10:45 -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
MEEPofFaith
74596a222c Merge branch 'master' into mod-dependencies 2025-02-08 20:48:39 -08: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
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
Anuken
f8ff370dbe Merge branch 'master' into port-field 2025-02-08 19:36:26 -05:00
Anuken
e34c8f58a0 Closes #7473 2025-02-08 10:22:25 -05:00
SomeonesShade
1579a3b068 Merge branch 'Anuken:master' into balancing_burst-drill-optional-multiplier 2025-02-08 16:28:05 +08: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
588faad6f9 Rule for extra core no-build radius per-team 2025-02-06 14:27:35 -05:00
ApsZoldat
dcddabf8c1 Rules dialog changes (#9792)
* Info buttons on mobile

* Better banned content dialogs

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2025-02-06 13:32:02 -05:00
Anuken
3ec6a74c1f Merge 2025-02-06 12:17:56 -05:00
Anuken
9a60275652 Closes #10014 2025-02-06 11:30:34 -05:00
1ue999
c4e25e312f Printchar (#10451)
* Added PrintChar operation

* Added 1ue999 to contributors

* Added PrintChar description, and improved the design of it.

* Ok intellij, removing the int cast

* Added capability to print content icons (@flare or @router)
https://github.com/Anuken/Mindustry/pull/10451#discussion_r1941282280

* Formatting changes (hopefully all of them)

* Update core/src/mindustry/logic/LStatements.java

* Update core/src/mindustry/logic/LStatements.java

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2025-02-04 19:39:33 -05:00
Anuken
92a95e8fdc Merge remote-tracking branch 'origin/master' 2025-02-04 14:17:48 -05:00
Anuken
37d0ba65e0 Closes #8467 2025-02-04 14:17:40 -05:00
sasha0552
1ecdcb14f2 Ability to disable fetching a list of community servers (#10283)
* Ability to disable fetching a list of community servers

* Addressing review comments
2025-02-04 14:09:27 -05:00
MEEPofFaith
17b470bacb Percentage modifier stat for status effects (#10306)
* Percentage modifier stat for status effects

* Merge true by default

Make percentage symbol inherit the color as well

* Multipliers instead of percentages
2025-02-04 13:58:24 -05:00
SomeonesShade
a2f196a50e Unit Mine Speed Game Rule Implementation and World Processor Set Rule for Unit Mine Speed (#10318)
* unitMineSpeedMultiplier Creation
added unitMineSpeedMultiplier
added unitMineSpeed(Team team)

* World Proccesor: SetRuleI unitMineSpeed Implemented

* World Processor: SetRuleI unitCrashDamage Implemented

* Revert "World Processor: SetRuleI unitCrashDamage Implemented"

This reverts commit 1b7187b046.

* Forgor to add, unitMineSpeedMultiplier is now editable per team
2025-02-04 13:52:25 -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
ab65c9d29a WIP launch pad rework 2025-01-31 17:58:35 -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
SomeonesShade
2423d859cf Merge branch 'master' into balancing_burst-drill-optional-multiplier 2025-01-22 17:46:10 +08:00
Anuken
224e74cc5f Closes Anuken/Mindustry-Suggestions/issues/5397 2025-01-19 14:59:27 -05:00
Anuken
3acac7da98 Fixed #10329 by timing out when UDP snapshots are not received 2025-01-14 10:56:49 -05:00
Anuken
0d5a4636c8 Fixed #10399 2025-01-12 10:00:01 -05:00
Anuken
a84a99aed6 Large cliff crusher block / Erekir ammo tweaks / Android file chooser fixes 2025-01-07 20:35:35 -05:00
Anuken
f28781dc00 Small heat redirector / Carbide ammo for breach 2025-01-04 17:46:50 -05:00
MEEPofFaith
bed8361a03 Display mod version (#10358) 2024-12-05 09:55:55 -05:00
Anuken
286fff5a34 Added 2 post-PLT challenge maps 2024-11-07 23:44:34 -05:00
Anuken
6250b93656 Grammar fix 2024-10-19 02:16:22 -04:00
Anuken
c7def5fa54 Better error for writeable dex mod import failure 2024-10-18 19:35:14 -04:00
Anuken
e262bb8254 Allow research dialog to be viewed on clients 2024-10-14 00:11:05 -04:00
Anuken
3545ed100c More descriptive address in use error 2024-10-12 11:06:11 -04:00
Anuken
9c8429deae Bundle entry for frontier submission 2024-10-09 23:08:04 -04:00
Anuken
aec0d43976 Buildable scrap walls / Various map fixes / Desolate rift submission 2024-10-08 23:53:34 -04:00
Anuken
ddc8f85396 Bundle update 2024-10-06 15:21:20 -04:00