Commit Graph

5876 Commits

Author SHA1 Message Date
MEEP of Faith
bfd04e2683 Store building pos instead of start pos
Fix an explosion hitting the same building multiple times if it's larger than 1x1.
2022-09-06 17:52:58 -07:00
Anuken
6d2251c52d Merge remote-tracking branch 'origin/master' 2022-09-06 00:05:56 -04:00
Anuken
90fe7b75d1 CommandAI counter-attack timer 2022-09-06 00:05:49 -04:00
JniTrRny
ffb3535f56 Generation quick copy & paste (#7520)
* several UI changes

* block ID bad
2022-09-05 14:59:21 -04:00
xStaBUx
c437a98b40 Copied. (#7519) 2022-09-05 13:38:05 -04:00
Epowerj
48e5846587 Tweaked research costs 2022-09-04 21:19:09 -04:00
Anuken
08d5ca1912 Removed shield breaker block 2022-09-04 16:32:13 -04:00
Anuken
1f4372ebc7 Don't allow mixtech in new maps 2022-09-03 11:00:01 -04:00
Anuken
b48053cda4 ClassMap update 2022-09-03 07:57:06 -04:00
Anuken
1748753a20 Fixed #7508 2022-09-03 07:46:18 -04:00
Anuken
80774820dc More unit cargo loader capacity 2022-09-02 17:15:20 -04:00
Anuken
c8f5862582 Merge remote-tracking branch 'origin/master' 2022-09-02 14:39:34 -04:00
Anuken
bd049d4c8d Minor liquid current tweaks 2022-09-02 14:39:26 -04:00
router
5e5b8711a3 Update Pump.java (#7500) 2022-09-02 08:58:31 -04:00
Anuken
2b6a7eac45 Fixed #7501 2022-09-02 08:57:57 -04:00
Anuken
e699e199ea Merge remote-tracking branch 'origin/master' 2022-09-02 08:35:00 -04:00
Anuken
ceb5c832bd Fixed armored duct blending 2022-09-02 08:34:53 -04:00
Epowerj
8b629b9b8b Merge remote-tracking branch 'origin/master' 2022-09-01 20:56:42 -04:00
Epowerj
c1775bf16b Tweaked tech tree for caldera 2022-09-01 20:56:14 -04:00
Epowerj
2bbcf601aa Tweaked research costs for caldera unlocks 2022-09-01 20:56:06 -04:00
MEEPofFaith
e9d3adfef3 Options for SectorPreset overriding plant launch fields. (#7478)
* Preset overriding loadouts

* a

* You know I should really learn what this actually does
2022-09-01 20:47:53 -04:00
Anuken
b854b0ca22 Better item selection UI 2022-09-01 17:49:29 -04:00
Anuken
61295bc89c Slightly longer data timeout 2022-09-01 16:49:17 -04:00
Anuken
bc1ff011af parens 2022-09-01 10:49:41 -04:00
Anuken
2d47ff893b Misc fixes 2022-09-01 08:57:43 -04:00
Anuken
56856c8166 Merge remote-tracking branch 'origin/master' 2022-09-01 08:46:36 -04:00
Anuken
5ecd73bdb0 Fixed #7495 2022-09-01 08:46:31 -04:00
Epowerj
be2160c9df Tech tree updates for caldera 2022-08-31 18:56:27 -04:00
Epowerj
7e6ba4a98e Added caldera to the campaign 2022-08-31 18:15:56 -04:00
Anuken
fb24953dc2 Added support for non-reactive liquids 2022-08-31 08:08:07 -04:00
Anuken
8f4251db3a Merge remote-tracking branch 'origin/master' 2022-08-30 21:17:44 -04:00
Anuken
4cd78aad91 Fixed #7484 2022-08-30 21:17:39 -04:00
Epowerj
a0cc74891a Merge branch 'map1' 2022-08-30 15:53:09 -04:00
Epowerj
26dc90e5a2 Hold back slag heater unlock until [4] 2022-08-30 14:56:58 -04:00
Epowerj
953b43e041 Tweaks to afflict research cost 2022-08-30 14:52:37 -04:00
Epowerj
9dbdb05ede Rearranged tech tree for turrets 2022-08-30 14:43:47 -04:00
Epowerj
19ca24825c Tweaks to surge block research costs 2022-08-30 14:05:05 -04:00
Epowerj
9996f3b6f5 Set a capture wave for ravine 2022-08-29 20:06:27 -04:00
Anuken
2f6ef4cefe Merge remote-tracking branch 'origin/master' 2022-08-29 18:57:27 -04:00
Anuken
55c54b34f9 Fixed #7477 2022-08-29 18:57:20 -04:00
Epowerj
715dfb16ca Adjusted tech tree for ravine 2022-08-29 18:46:34 -04:00
Epowerj
697e6d503f Added ravine to campaign list 2022-08-29 17:44:19 -04:00
MEEPofFaith
2703c0cbc4 alwaysShooting (#7475) 2022-08-29 17:23:20 -04:00
Anuken
0d3c27dd59 Minor bundle tweaks 2022-08-29 14:26:29 -04:00
Anuken
e4fe73b332 Minor balance tweak 2022-08-29 13:40:15 -04:00
Anuken
d7f4b15d3d WIP descriptions 2022-08-29 12:08:12 -04:00
Anuken
d5b34f0b73 Fixed #7469 2022-08-28 16:08:09 -04:00
Anuken
8453c52353 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-27 19:39:58 -04:00
Anuken
2a062b96ec Changed internal name of sand 2022-08-27 19:39:53 -04:00
router
91440e7055 drill mined item sensing (#7460)
* add drill sensing

* PROPERLY
2022-08-27 11:18:14 -04:00