Commit Graph

9764 Commits

Author SHA1 Message Date
Anuken
06e08c1074 Compact player list 2022-08-11 12:06:14 -04:00
Luna
e28dbfad69 Community server search (#7305)
* basic community server search

* normalise capitalisation

* localise "Search:"
2022-08-11 11:36:10 -04:00
Anuken
e4c6822cca JSON payload stack support 2022-08-11 08:43:58 -04:00
MEEPofFaith
3f96799c2e Make PayloadAmmoTurret accept units (#7320) 2022-08-11 08:38:45 -04:00
Lucky Clover
b3f43dbc03 worldCell.targetable = false (#7345) 2022-08-11 07:23:11 -04:00
MEEPofFaith
3fc0957197 Shielded wall shield size (#7343) 2022-08-10 14:52:20 -04:00
BlackDeluxeCat
5e63b89f4f Fixed ucontrol approach not applied to ground units (#7340) 2022-08-10 08:06:12 -04:00
Epowerj
648a4b5e61 Tweaked tech tree for peaks 2022-08-09 19:45:51 -04:00
Epowerj
1d25b9e0bc Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-09 18:57:26 -04:00
Epowerj
43937db6df Added peaks to tech tree 2022-08-09 15:50:45 -04:00
Epowerj
63cf6f6fb2 Reduced breach tungsten damage 2022-08-09 15:49:51 -04:00
Epowerj
2344cc442b Added peaks to code 2022-08-09 15:47:43 -04:00
Anuken
6e11418fa4 Fixed #7331 2022-08-09 09:11:11 -04:00
Epowerj
901d0106c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-08 17:45:06 -04:00
Anuken
bae64cb98a Median error fix 2022-08-08 17:34:46 -04:00
Epowerj
f4798f5adc hid a bunch of stuff from the tech tree for now 2022-08-08 15:54:33 -04:00
Anuken
469a49b3d6 Cleanup 2022-08-08 14:27:10 -04:00
BlackDeluxeCat
0802941cb8 Fixed HeatCrafter Consumes Less Liquid (#7288) 2022-08-08 14:24:45 -04:00
Anuken
fae3360dfc Fixed #7327 2022-08-08 14:05:01 -04:00
Anuken
94d13267e8 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-07 22:54:30 -04:00
Anuken
01c3738275 Misc cleanup 2022-08-07 22:54:05 -04:00
JniTrRny
6a2c6e3a74 the return of deselectable (#7319) 2022-08-07 13:10:12 -04:00
Anuken
a28601d91c Interplanetary accelerator beta info text 2022-08-06 17:31:21 -04:00
Anuken
39ebc046ad Fixed objectives dialog scaling 2022-08-06 14:06:24 -04:00
Anuken
ecdedf383a Merge remote-tracking branch 'origin/master' 2022-08-06 13:38:35 -04:00
Anuken
32f3190762 Less stacking in objectives dialog 2022-08-06 13:38:31 -04:00
Lucky Clover
e4255755ec liquidTank should be consistant as well (#7311) 2022-08-06 13:32:13 -04:00
Anuken
9d1c03ccd9 Merge remote-tracking branch 'origin/master' 2022-08-06 13:30:52 -04:00
Anuken
45e5ab8ecc Fixed #7310 2022-08-06 13:30:47 -04:00
SoMall-dumpling
aa5ba1a3aa Update FlakBulletType.java (#7313)
fix erekir core unit make flak bullets explode
2022-08-06 13:29:47 -04:00
Anuken
e9eb713a39 Fixed #7309 2022-08-06 00:12:34 -04:00
Epowerj
dc92222d98 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-05 17:06:47 -04:00
Anuken
36ce1ea2af Faster beryllium drilling with burst drills 2022-08-05 16:27:23 -04:00
Anuken
6a5d7da4ae Fixed #7303 / Fixed #7302 2022-08-05 14:25:37 -04:00
Anuken
8b6d3a67f3 Fixed #7299 2022-08-05 09:39:45 -04:00
Anuken
0f831d598d Fixed #7296 2022-08-05 09:35:04 -04:00
Anuken
11d3b1d973 Fixed #7292 2022-08-04 20:20:46 -04:00
Epowerj
f728bd643a Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-04 19:02:22 -04:00
Anuken
62d0d62d22 Fixed squished pump liquid icon 2022-08-04 18:45:51 -04:00
Anuken
bf926d139d Fixed akrycite output 2022-08-04 18:43:38 -04:00
Epowerj
f6b5962997 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2
 Conflicts:
	core/src/mindustry/content/Blocks.java
2022-08-04 14:55:14 -04:00
Anuken
1bb45fe91c Minor bugfixes/cleanup 2022-08-04 13:49:22 -04:00
Anuken
46f8838d1a Fixed #7284 2022-08-04 10:23:49 -04:00
Anuken
1d8166669b Fixed #7283 2022-08-04 10:14:13 -04:00
Anuken
db8e7675c8 Merge remote-tracking branch 'origin/master' 2022-08-03 23:44:10 -04:00
Anuken
243a672a5b Disabled NetworkIO entity writing 2022-08-03 23:44:07 -04:00
MEEPofFaith
ff28daa3a4 FlakDelay (#7281) 2022-08-03 17:08:53 -04:00
Epowerj
00d6a73c27 Tweaked tech tree and for marsh 2022-08-03 16:33:14 -04:00
Anuken
58246747ee Fixed shielded wall being available on Serpulo 2022-08-03 16:09:05 -04:00
Anuken
a54907583b Neoplasia reactor 2022-08-02 21:26:15 -04:00