Commit Graph

10144 Commits

Author SHA1 Message Date
Epowerj
b8d3318d0b Added objectives to split 2022-07-14 15:27:35 -04:00
Epowerj
251404f29e Rearranged some transport tech on the tree 2022-07-14 14:54:47 -04:00
Epowerj
a68b2fad11 Fixed research tree issue that prevented unlocking split 2022-07-14 14:49:41 -04:00
Anuken
9dce4f36f7 Collaris tweaks 2022-07-14 10:06:15 -04:00
Anuken
62332fbebb WIP chnages to collaris weapon 2022-07-13 22:57:13 -04:00
Epowerj
e79763d139 Changed payload build requirements 2022-07-12 20:36:57 -04:00
Epowerj
ecc9dd7a7f Made reinforced container cheaper and smaller 2022-07-12 19:03:23 -04:00
Anuken
a734f8423c Fixed #7167 2022-07-12 13:50:02 -04:00
Epowerj
352fa4e18f Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 23:08:33 -04:00
Anuken
fc5e40a857 Crash fix 2022-07-11 21:57:53 -04:00
Epowerj
b29b6b38e7 rearranged tech tree 2022-07-11 21:36:31 -04:00
Anuken
4230e3b8c2 ConsumeGenerator liquidOutput -> outputLiquid 2022-07-11 18:44:49 -04:00
Epowerj
4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Anuken
72b36d97bd RTS max squad size 2022-07-11 18:18:22 -04:00
Epowerj
9413a399cd Merge branch 'master' of https://github.com/Anuken/Mindustry into maps
 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
2022-07-11 17:14:39 -04:00
Anuken
2fd8134700 First phase of generator cleanup 2022-07-11 16:59:07 -04:00
Anuken
411b6d7460 Shockwave tower block 2022-07-11 14:37:57 -04:00
Epowerj
1124f5f369 Fixed issue with level four unlocking early 2022-07-10 17:05:23 -04:00
Anuken
4ea1e26c73 Merge remote-tracking branch 'origin/master' 2022-07-10 07:37:06 -04:00
Anuken
55e78c9dce Minor bugfixes & requirement tweaks 2022-07-10 07:37:01 -04:00
code-explorer786
29085b95b7 Fix setblock block not accepting @air (#7160) 2022-07-09 21:21:29 -04:00
Mythril382
af80db0dfd SwitchBlock clickSound (#7158) 2022-07-09 11:29:39 -04:00
Anuken
311118ae58 Hastily implemented final endgame turret 2022-07-09 00:33:15 -04:00
Epowerj
e6502dad75 Changed requirements for split 2022-07-08 18:35:47 -04:00
Anuken
8b0a86e883 oh no 2022-07-08 17:54:05 -04:00
Anuken
3da0486320 Indonesian bundle loading hack 2022-07-08 17:07:49 -04:00
Anuken
0c09c10741 Misc minor bugfixes 2022-07-08 16:38:25 -04:00
Anuken
6f6bf0cf77 Fixed #7145 2022-07-07 16:01:13 -04:00
Anuken
64a30adb9b Fixed #7143 2022-07-07 11:09:01 -04:00
Anuken
a8a87e94be Ran update script again 2022-07-07 10:27:52 -04:00
Anuken
2a3a3359fa Misc bugfixes 2022-07-07 09:53:38 -04:00
Anuken
9cb51640c0 Fixed #7141 2022-07-06 22:07:42 -04:00
Epowerj
92e45559cc Added objectives to lake 2022-07-06 21:14:20 -04:00
Anuken
3b083cf7e1 Higher range for large power node 2022-07-06 18:51:26 -04:00
Epowerj
6ed64e6504 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-06 18:01:05 -04:00
Anuken
9c7eb36431 Fixed #7133 2022-07-06 07:37:17 -04:00
Anuken
69a26900fe Don't draw shape parts at 0 rad/stroke 2022-07-05 20:15:34 -04:00
Epowerj
3e393b80d6 Added some maps and moved tech tree around.
Not tested yet.
2022-07-05 18:46:59 -04:00
MEEPofFaith
45bc4dcb00 Underflow duct (#6957)
* Underflow Gate

I'm not sure why ClassMap decided to import OverflowDuct instead of using the full path when being generated.

* Better top sprite

Also fix base asymmetry

Co-authored-by: Anuken <arnukren@gmail.com>
2022-07-05 18:41:13 -04:00
Anuken
7ddbc40720 Minor BE update fix 2022-07-05 18:30:43 -04:00
Anuken
e2c0eec3e1 Ravage turret cleanup 2022-07-05 17:02:20 -04:00
Anuken
4d8bcfebf2 Halo draw part + Ravage halo 2022-07-05 12:34:18 -04:00
Anuken
b33f19b048 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-07-05 10:44:38 -04:00
Anuken
8fa6a98027 Fixed some squished liquids 2022-07-05 10:44:36 -04:00
Goobrr
fe51500e8e Use new drawers (#7127) 2022-07-05 10:44:15 -04:00
Anuken
a4e482f55a Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-07-04 20:23:08 -04:00
Anuken
5ce61b863b New WIP turret 2022-07-04 20:23:05 -04:00
MEEPofFaith
4e8736de6c alwaysContinuous weapons have no reload (#7124) 2022-07-04 17:28:23 -04:00
Anuken
5b1d1a2ce4 Misc minor fixes 2022-07-04 16:52:18 -04:00
Anuken
02dd74b113 Merge remote-tracking branch 'origin/master' 2022-07-03 18:38:07 -04:00