Commit Graph

14146 Commits

Author SHA1 Message Date
Anuken
c28db45c4b Assembler module block stuff 2022-05-04 16:55:27 -04:00
Anuken
22905de094 Cleanup of some GL stuff 2022-05-04 15:25:39 -04:00
Anuken
771c2270df Phase tech tree fix 2022-05-04 00:57:00 -04:00
Anuken
7640fa0bf0 Misc cleanup & target/hit movements 2022-05-03 20:39:54 -04:00
Anuken
8b9eb0b466 Cleanup 2022-05-03 15:27:30 -04:00
Anuken
a784d184aa Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-03 14:42:15 -04:00
Anuken
210481703f Lots of balancing/tweaks 2022-05-03 14:42:11 -04:00
Epowerj
bc1de34296 Tweaked objectives for level 1 2022-05-03 14:41:49 -04:00
Anuken
459428ef25 Crash fix, begin rebalancing 2022-05-03 11:23:24 -04:00
Anuken
6c3eb3fe1e Delta fix 2022-05-02 22:41:37 -04:00
Anuken
4dcfdbe82f Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-02 22:24:48 -04:00
Anuken
78f3e23f0b WIP bullet shotgun for T4 tank 2022-05-02 22:24:45 -04:00
Epowerj
9f255f8178 Tweaked level three 2022-05-02 20:28:17 -04:00
Anuken
de9a41159f Discord link in desktop menu 2022-05-02 19:41:43 -04:00
Anuken
61d145e233 Advanced reconstructor in tech tree 2022-05-02 19:26:21 -04:00
Anuken
6553ff9e56 diffuse in tech tree 2022-05-02 18:54:39 -04:00
Anuken
02eec0e43c Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-02 18:53:15 -04:00
Anuken
98b01953a4 Diffuse turret 2022-05-02 18:53:12 -04:00
Epowerj
e0062edc42 Tweaked level three 2022-05-02 18:42:07 -04:00
Epowerj
be13df6bd8 Tweaked level three 2022-05-02 17:54:30 -04:00
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
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
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
Anuken
fe62e1b6e3 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-30 09:02:51 -04:00