Commit Graph

14232 Commits

Author SHA1 Message Date
Epowerj
fce48cd92e Changed reinforcedLiquidRouter requirements to use graphite instead of tungsten 2022-05-02 17:54:20 -04:00
Anuken
068c0dbe4d Walker in tech tree 2022-05-02 17:51:40 -04:00
Anuken
4d54b8251d Map rename 2022-05-02 16:33:41 -04:00
Epowerj
383beb3e8d Map 4 mostly done 2022-05-02 16:31:42 -04:00
Epowerj
85fb2bfa85 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-02 15:47:36 -04:00
Epowerj
c259a36922 Map 4 mostly done 2022-05-02 15:47:31 -04:00
Anuken
3542bd9e90 T3 tank done 2022-05-02 15:37:43 -04:00
Anuken
5f0ef9b27e WIP T3 tank 2022-05-02 14:29:32 -04:00
Anuken
07c24d7164 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-01 23:50:52 -04:00
Anuken
1d249f233f UnitType docs 2022-05-01 23:50:49 -04:00
Epowerj
0cb6f00ed2 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-01 20:19:29 -04:00
Epowerj
b982f987c8 Map 4 tweaks 2022-05-01 20:19:25 -04:00
Kerunope
6cb318518d
Server change list (#6743)
* Server move to 7.0

The players wanted it, so I do

* Delete server on 6.0 list

Server have been moved so i delete this
2022-05-01 20:03:28 -04:00
Anuken
5e7428f034 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-05-01 17:45:40 -04:00
Anuken
f85fba264a Fixed crawler targeting 2022-05-01 17:45:36 -04:00
Epowerj
51a6260798 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-01 16:57:18 -04:00
Epowerj
20a1094f42 Map 4 tweaks 2022-05-01 16:57:14 -04:00
Kerunope
117b292c3f
Update servers_v6.json (#6735)
New PvP server
2022-05-01 15:10:03 -04:00
Anuken
3914f45c2c Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-01 14:49:32 -04:00
Anuken
865a5d56ed Two units complete 2022-05-01 14:49:30 -04:00
Epowerj
0540017ef2 Map 4 tweaks 2022-05-01 13:44:40 -04:00
Anuken
41a8be1b29 Hover unit thingy done 2022-05-01 10:14:55 -04:00
Anuken
8ea9c094ab Unit repair tower sprite/effects 2022-04-30 23:24:28 -04:00
Anuken
1c84e6d7ea Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-30 23:00:38 -04:00
Anuken
25208d0797 Hover unit stuff 2022-04-30 23:00:35 -04:00
Epowerj
eab9b7eb48 Map 4 tweaks 2022-04-30 21:19:19 -04:00
Anuken
f833a4e1bb Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-30 21:11:20 -04:00
Anuken
512fbe0199 T1 walker thing done 2022-04-30 21:11:17 -04:00
Epowerj
bf1f621bbe Wave set up for map four 2022-04-30 21:07:18 -04:00
Epowerj
5e7bd82f39 Start working on fourth map's objectives 2022-04-30 20:15:29 -04:00
Anuken
59be28b5eb Time to begin adding the new units 2022-04-30 18:08:40 -04:00
키에르
40feb0a074
Update servers_v6.json (#6742) 2022-04-30 13:28:28 -04:00
Anuken
fe62e1b6e3 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-30 09:02:51 -04:00
Anuken
79ffe22b7f Build consistency tweaks 2022-04-30 09:02:45 -04:00
Epowerj
045d59fedf Start working on fourth map's objectives 2022-04-30 02:45:20 -04:00
Anuken
2dd8cb01ec fixed router update 2022-04-29 22:10:40 -04:00
Anuken
76ec6591a5 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-29 21:44:49 -04:00
Anuken
c61e058231 fine 2022-04-29 21:44:46 -04:00
Epowerj
7153797b5a Continue working on level four 2022-04-29 20:47:54 -04:00
Epowerj
58941ba2d7 Start reworking four 2022-04-29 18:54:36 -04:00
Anuken
b696e1c89a Radar only on Erekir 2022-04-29 18:38:58 -04:00
Anuken
712fa95e88 File chooser bracket escape 2022-04-29 16:48:01 -04:00
Anuken
30685e2865 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-29 15:00:00 -04:00
Anuken
dcb51ca73f Misc balance/bugfixing 2022-04-29 14:59:57 -04:00
Epowerj
7db5e551f1 Added a couple vents back to three 2022-04-29 13:27:43 -04:00
Epowerj
22b4d11b36 Updated map three to have arkecyte earlier 2022-04-29 13:18:21 -04:00
Epowerj
ffdd04a278 Changed time before nuke to 8 minutes 2022-04-29 12:53:52 -04:00
Anuken
db7e567832 All stat stuff converted to non-enums 2022-04-29 12:10:49 -04:00
Anuken
a2d4363c9f Slower enemy build speed in map3 2022-04-29 11:33:05 -04:00
Anuken
e3c1b7ba30 Better objective indicators for 3rd map 2022-04-29 10:08:50 -04:00