Commit Graph
19899 Commits
Author SHA1 Message Date
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 bc350afdea Network ping packet fix 2025-02-23 00:59:02 -05:00
Anuken 851817a049 Merge remote-tracking branch 'origin/master' 2025-02-11 11:07:59 -05:00
Anuken 9507292107 LCanvas cleanup 2025-02-11 11:07:51 -05:00
Github Actions 3222a5bd50 Automatic bundle update 2025-02-10 22:06:09 +00:00
Anuken 4768bf0aeb Merge branch 'master' of https://github.com/Anuken/Mindustry 2025-02-10 17:05:03 -05:00
Anuken e46d1a6e6b Merge branch 'MEEPofFaith-mod-dependencies' 2025-02-10 17:04:58 -05: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
Github Actions 46018a57b6 Automatic bundle update 2025-02-10 21:30:24 +00:00
Anuken b0b240993c arc 2025-02-10 16:28:40 -05:00
Anuken 4c300afab4 Merge branch 'Atomic-Laboratory-patch-6' 2025-02-10 16:28:09 -05:00
Anuken 3bdb871f10 Merge branch 'patch-6' of https://github.com/Atomic-Laboratory/Mindustry into Atomic-Laboratory-patch-6 2025-02-10 16:24:40 -05:00
AnukenandGitHub 70f187d6c4 Update core/src/mindustry/ui/dialogs/JoinDialog.java 2025-02-10 16:24:20 -05:00
Anuken e3b355b3c9 arc 2025-02-10 16:22:53 -05:00
Anuken e95ff98abf Merge remote-tracking branch 'origin/master' 2025-02-10 16:22:01 -05:00
Anuken 5622b295e6 Logic canvas fixes 2025-02-10 16:21:51 -05:00
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 0db7c1e36a Merge branch 'SomeonesShade-balancing_burst-drill-optional-multiplier' 2025-02-10 15:53:54 -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 084e97ceab Merge branch 'code-explorer786-logic-jumps' 2025-02-10 15:51:17 -05:00
Anuken 9a9e4611cd Logic jump PR cleanup 2025-02-10 15:51:02 -05:00
Anuken 27bc2918fd Uncomment flaky test 2025-02-10 14:52:40 -05:00
Github Actions a7482f78ef Automatic bundle update 2025-02-10 19:25:38 +00:00
AnukenandGitHub 7a6222aa18 Revert "Allow markers to be used as light sources (#9733)" (#10490)
This reverts commit 8626082068.
2025-02-10 14:24:46 -05:00
Anuken a3987fde71 More base schematics 2025-02-10 14:00:44 -05:00
Anuken c32b304c78 Sync core units with spawner block database tab 2025-02-10 13:50:27 -05:00
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
KochiyaUenehaaaandGitHub 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
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
summoner001andGitHub e7e1e1f786 Update bundle_hu.properties (#10487)
* Update bundle_hu.properties

Fix consistency of the word lekérés/lekérdezés (fetch)
Sorry no more bundlehu fixes today. This is the last one for this translation.

* Update bundle_hu.properties

Translating new strings
2025-02-09 21:51:24 -05:00
Anuken d20f9ebb17 Support for sector presets without unlock requirements 2025-02-09 15:52:30 -05:00
Anuken f77803dffc Merge remote-tracking branch 'origin/master' 2025-02-09 13:05:59 -05:00
Anuken 8ee00e0c3a Fixed broken team palettes 2025-02-09 13:05:51 -05:00
Github Actions 9f2997982d Automatic bundle update 2025-02-09 17:11:32 +00:00
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
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 e77708b55b Merge branch 'master' of https://github.com/Anuken/Mindustry 2025-02-09 11:20:04 -05:00
Anuken 925bfad30f Merge branch 'MEEPofFaith-mining-beam-weapon' 2025-02-09 11:19:47 -05:00
Anuken 0b09d0438a I'll do it myself 2025-02-09 11:19:31 -05:00
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
summoner001andGitHub f664aeae9b Update bundle_hu.properties (#10486)
Translate new strings. (Sorry, but I just noticed that there were several changes in the bundle. These had escaped my attention until now.)
Fix minor consistency and misspells.
2025-02-09 11:15:49 -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
summoner001andGitHub f6f4ad1afb Update bundle_hu.properties (#10485)
Update bundle_hu.properties
Translating new string.
Follow the changes of the english bundle:
  -rewording
  -icon changes
Minor consistency fix
2025-02-09 10:02:16 -05:00
Anuken f6e9cffa9c Fixed #10484 2025-02-09 10:00:27 -05:00