Anuken
b545e0296f
Fixed #10591
2025-04-04 12:12:16 -04:00
Anuken
b7dbe54d76
Merging changes from private branch
2025-04-04 11:47:35 -04:00
Ovulam5480 and GitHub
edffc24cca
Fixed shockwaveTower efficiency ( #10538 )
2025-03-17 12:37:03 -04:00
Anuken
7aaf0f3475
Merge remote-tracking branch 'origin/master'
2025-03-09 10:19:16 -04:00
Anuken
f7b13b7924
Fixed mixtech vault item dupe
2025-03-09 10:19:09 -04:00
WayZer and GitHub
fd597080a6
Update CargoAI.java ( #10494 )
2025-02-23 01:35:37 -05: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
bc350afdea
Network ping packet fix
2025-02-23 00:59:02 -05:00
Anuken
9507292107
LCanvas cleanup
2025-02-11 11:07:51 -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
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
Anuken and GitHub
70f187d6c4
Update core/src/mindustry/ui/dialogs/JoinDialog.java
2025-02-10 16:24:20 -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
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
9a9e4611cd
Logic jump PR cleanup
2025-02-10 15:51:02 -05:00
Anuken and GitHub
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
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
KochiyaUenehaaa and GitHub
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
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
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
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
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 and GitHub
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 and GitHub
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
Ovulam5480andGitHub
WayZerandGitHub
KochiyaUenehaaaandGitHub
MEEPofFaith