Commit Graph

6681 Commits

Author SHA1 Message Date
Anuken
659c481c83 cleanup 2020-12-15 11:15:39 -05:00
Anuken
a18e1854ab Null checks & cleanup of upgrade pathing 2020-12-15 10:58:03 -05:00
Anuken
6c67dc1266 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-15 10:52:38 -05:00
Slava0135
0c581c520f Conveyor upgrade system (#3912)
* conveyor/conduit upgrading system

* style
2020-12-15 10:52:20 -05:00
Anuken
c6c18696c0 Cleanup 2020-12-15 10:28:12 -05:00
Anuken
8a5bd7571e 121.3 2020-12-14 22:55:58 -05:00
Anuken
ff93c21269 Merge remote-tracking branch 'origin/master' 2020-12-14 16:31:01 -05:00
Anuken
cec1eb5608 Fixed jitpack build error 2020-12-14 13:42:48 -05:00
Anuken
16f7a8e9d2 Merge remote-tracking branch 'origin/master' 2020-12-14 13:29:59 -05:00
Anuken
f4d0dfd0da Less junction capacity (again) 2020-12-14 10:36:37 -05:00
Skat
aee5d46dfa Code formatting (#3904) 2020-12-13 23:56:13 -05:00
DeltaNedas
ffa7256e5a add ContentInitEvent (#3951)
* add ContentInit(ialized)Event

* a

* a
2020-12-13 23:43:27 -05:00
Anuken
bbf84185cc Fixed #3973 2020-12-13 23:40:06 -05:00
Anuken
901c23f295 Fixed #3969 2020-12-13 18:01:22 -05:00
Anuken
e25f0c6ae2 Merge pull request #3967 from DeltaNedas/version
disallow descriptions after mod version
2020-12-13 16:26:23 -05:00
Anuken
484b480076 Fixed #3968 2020-12-13 16:25:36 -05:00
DeltaNedas
926497ba77 disallow descriptions after mod version 2020-12-13 19:30:21 +00:00
Anuken
ddd9f2259c Fixed #3960 2020-12-13 10:27:44 -05:00
Anuken
d6546a38c0 #3830 2020-12-12 18:49:24 -05:00
Karl-Robert Ernst
4aebba0a0c fix units aiming sidewards missing their aim 2020-12-12 22:11:19 +01:00
Anuken
8afb6006ce Merge pull request #3941 from DeltaNedas/public
make some proc stuff public
2020-12-12 13:27:22 -05:00
Anuken
768d14088a Fixed #3943 2020-12-12 13:26:30 -05:00
Anuken
8fa6b76bf9 Fixed #3936 2020-12-12 11:14:17 -05:00
DeltaNedas
19af1a0cc8 make some proc stuff public 2020-12-12 15:57:43 +00:00
Anuken
e6c4a6cf69 Fixed #3932 2020-12-11 23:52:43 -05:00
Anuken
7c80af85e3 Property cleanup 2020-12-11 19:28:03 -05:00
Anuken
6983f57459 circleTarget unit AI parameter 2020-12-11 18:54:03 -05:00
Anuken
98c4ee6e74 Merge pull request #3855 from AFFalcons/patch-1
[QOL] Ability to Disable Weather Effects
2020-12-11 12:52:07 -05:00
Anuken
87f9a077ac Increase wave spacing by 10sec every sector defeat 2020-12-11 12:43:43 -05:00
Anuken
bc26d3ba7b Merge remote-tracking branch 'origin/master' 2020-12-11 11:48:27 -05:00
Anuken
daaea591e4 Implemented #3486 with some minor changes 2020-12-11 11:48:20 -05:00
Anuken
c444cbf623 Merge pull request #3908 from buthed010203/patch-2
Delete old bleeding edge builds on update
2020-12-11 10:52:19 -05:00
Anuken
c54f398063 Fixed Parallax not moving players serverside 2020-12-10 18:21:39 -05:00
Anuken
2d6db1583b Improved approach behavior in formations/logic 2020-12-10 12:51:07 -05:00
buthed010203
b3beb92557 fixed 2020-12-10 12:18:11 -05:00
buthed010203
0f8304674f now 100% less readable 2020-12-10 11:54:47 -05:00
buthed010203
3b3daf0e25 Delete old bleeding edge builds on update 2020-12-10 11:41:50 -05:00
Anuken
28e18332a0 Decreased junction item capacity 2020-12-10 09:58:09 -05:00
Anuken
dcc4764914 Merge remote-tracking branch 'origin/master' 2020-12-10 09:50:12 -05:00
Anuken
ee4ace1146 Fixed #3902 2020-12-10 09:50:06 -05:00
Patrick 'Quezler' Mounier
2da7afc081 Update Accelerator.java 2020-12-10 12:15:29 +01:00
Patrick 'Quezler' Mounier
e5b341c63e Prevent accelerator from blending with conveyors 2020-12-10 12:14:57 +01:00
Anuken
a544888f16 cleanup 2020-12-09 20:20:22 -05:00
Anuken
57ad1d5366 Fixed #3899 2020-12-09 20:19:54 -05:00
Anuken
42d66d1136 Sector item system cleanup 2020-12-09 16:26:50 -05:00
Anuken
999cc9c651 Fixed #3890 2020-12-09 14:02:38 -05:00
Anuken
c93bc0e457 Fixed #3884 / Fixed #3881 / Fixed #3880 2020-12-09 10:49:26 -05:00
Anuken
1460a15942 Fixed #3874 2020-12-08 21:36:20 -05:00
Anuken
e07a203d56 Don't use mods for floor decoration 2020-12-08 16:43:23 -05:00
Anuken
8d4ab2d7fb Cleanup 2020-12-08 14:23:13 -05:00