Commit Graph
100 Commits
Author SHA1 Message Date
Anuken 75a4d2901f Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-20 14:22:27 -05:00
Anuken 40a6a9e1c7 Comment cleanup 2020-12-20 12:04:36 -05:00
Anuken c39f4c1b7d Fixed #4051 2020-12-20 09:50:29 -05:00
Anuken 082b04a143 Merge remote-tracking branch 'origin/master' 2020-12-20 09:47:52 -05:00
Anuken 4f683cac8b Fixed #4054 2020-12-20 09:47:45 -05:00
Anuken f9fe396d1f Fixed #4044 2020-12-19 13:02:20 -05:00
Anuken a4f4b9367f Tweaks of merged PR 2020-12-19 12:32:03 -05:00
Anuken 9e05f7604d Fixed #4043 2020-12-19 12:28:56 -05:00
Anuken e5982faf35 Merge remote-tracking branch 'origin/master' 2020-12-18 20:39:23 -05:00
Anuken 7f863abb06 Hide map when opening planet map 2020-12-18 20:39:16 -05:00
Anuken 0dd3c2cb5a Fixed #4033 2020-12-18 17:22:01 -05:00
Anuken 9d9cbdffd5 Pulsar nerf 2020-12-18 16:33:43 -05:00
Anuken 8d43590657 Multiblock damage calculation bugfix 2020-12-18 14:56:14 -05:00
Anuken 6783069f95 Merge remote-tracking branch 'origin/master' 2020-12-18 13:36:22 -05:00
Anuken b33b3a7919 Always-on weather rule support 2020-12-18 13:36:18 -05:00
Anuken b0bf80d8b7 Cleanup 2020-12-18 13:21:51 -05:00
Anuken 5de2c0c512 Merge remote-tracking branch 'origin/master' 2020-12-18 12:41:23 -05:00
Anuken bd25294096 Generic node/bridge placement system 2020-12-18 12:41:13 -05:00
Anuken d80678dfeb arc 2020-12-18 09:43:17 -05:00
Anuken a4f9518d1e testing winMM 2020-12-18 09:42:57 -05:00
Anuken 6815f3305f Better bridge linking 2020-12-17 18:35:50 -05:00
Anuken 0cc3340bd6 Fixed texture packer Gradle dependencies 2020-12-17 14:37:13 -05:00
Anuken 8da18984d2 Removed redundant Block#isVisible code 2020-12-17 12:38:22 -05:00
Anuken 9f5183b36f Building cleanup 2020-12-17 11:38:03 -05:00
Anuken 0d81681af5 Merge remote-tracking branch 'origin/master' 2020-12-17 10:46:53 -05:00
Anuken 4b1554db54 arc 2020-12-17 10:46:49 -05:00
Anuken b8efed9eaf Better space skybox scaling 2020-12-16 19:52:10 -05:00
Anuken cd7d2163b9 Merge remote-tracking branch 'origin/master' 2020-12-16 19:47:43 -05:00
Anuken 59c85a486f Fixed phase deflect achievement 2020-12-16 19:47:40 -05:00
Anuken d0bf3d6fa1 Merge remote-tracking branch 'origin/master' 2020-12-16 19:33:36 -05:00
Anuken bc2c7be45d Fixed #4010 2020-12-16 19:33:29 -05:00
Anuken 3db04da20a Payload tweaks 2020-12-16 13:35:55 -05:00
Anuken d0cba1aff2 Code cleanup 2020-12-16 10:39:28 -05:00
Anuken 4ad234ad75 Merge remote-tracking branch 'origin/master' 2020-12-16 09:28:11 -05:00
Anuken e6717b37ce Fixed #4000 2020-12-16 09:28:06 -05:00
Anuken 446dd6abe5 Consistent water bullet drag 2020-12-15 19:25:23 -05:00
Anuken ff254d4fdf Fixed #3997 2020-12-15 19:09:33 -05:00
Anuken eaa5e6f5a1 Increased foreshadow coolant multiplier 2020-12-15 18:39:44 -05:00
Anuken b90f51224c Fixed #3996 2020-12-15 18:07:15 -05:00
Anuken 475bef1d78 Fixed sprite antialiasing 2020-12-15 17:43:01 -05:00
Anuken dd9095bfba Cleanup 2020-12-15 15:31:45 -05:00
Anuken 50125166a6 Merge remote-tracking branch 'origin/master' 2020-12-15 15:24:14 -05:00
Anuken 47e321f57d Removed atlas outputs 2020-12-15 15:24:09 -05:00
Anuken 6ab96e2787 Fixed #3987 2020-12-15 14:15:06 -05:00
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
Anuken c6c18696c0 Cleanup 2020-12-15 10:28:12 -05:00
Anuken 5ab090f28d Merge remote-tracking branch 'origin/master' 2020-12-14 22:56:06 -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 0512e54df5 Merge remote-tracking branch 'origin/master' 2020-12-14 13:42:52 -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
AnukenandGitHub 889c53dc1b Update SERVERLIST.md 2020-12-14 13:26:42 -05:00
Anuken f4d0dfd0da Less junction capacity (again) 2020-12-14 10:36:37 -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 1c8d368d3b Merge remote-tracking branch 'origin/master' 2020-12-13 16:28:32 -05:00
Anuken 37ebae20d7 Removed tools.jar 2020-12-13 16:28:29 -05:00
AnukenandGitHub 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
Anuken ddd9f2259c Fixed #3960 2020-12-13 10:27:44 -05:00
Anuken d6546a38c0 #3830 2020-12-12 18:49:24 -05:00
AnukenandGitHub d171048004 Merge pull request #3950 from Auswaschbar/master
Fix units aiming sidewards missing their aim
2020-12-12 16:47:01 -05:00
AnukenandGitHub 8afb6006ce Merge pull request #3941 from DeltaNedas/public
make some proc stuff public
2020-12-12 13:27:22 -05:00
Anuken d117eb249e Merge remote-tracking branch 'origin/master' 2020-12-12 13:26:34 -05:00
Anuken 768d14088a Fixed #3943 2020-12-12 13:26:30 -05:00
AnukenandGitHub 86f16bfc94 Merge pull request #3934 from LottieVixen/fix-issue
fixed an error in global.js
2020-12-12 11:31:36 -05:00
Anuken 8fa6b76bf9 Fixed #3936 2020-12-12 11:14:17 -05: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 adeeaa6e27 Merge remote-tracking branch 'origin/master' 2020-12-11 12:56:10 -05:00
Anuken 075e7cf5d8 Disabled poly spawns 2020-12-11 12:56:07 -05:00
AnukenandGitHub 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
AnukenandGitHub 175d66ad72 Merge pull request #3843 from Nikolass1000/patch-6
Update achievements.vdf [PL]
2020-12-11 11:13:54 -05:00
AnukenandGitHub 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
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
AnukenandGitHub 1faffadcab Merge pull request #3905 from Quezler/patch-81
Prevent accelerator from blending with conveyors
2020-12-10 09:35:33 -05: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
AnukenandGitHub 9537051590 Merge pull request #3836 from Nikolass1000/patch-5
Update polish bundle
2020-12-09 11:10:02 -05:00
AnukenandGitHub 827372633d Merge pull request #3838 from YellOw139/patch-3
[Bundle][RO][Ready-for-Stable] Translation Update
2020-12-09 11:09:42 -05:00
Anuken dcf0b15b2c Fixed #3888 2020-12-09 11:08:22 -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 15a07a4a18 Merge remote-tracking branch 'origin/master' 2020-12-08 16:43:27 -05:00
Anuken e07a203d56 Don't use mods for floor decoration 2020-12-08 16:43:23 -05:00
AnukenandGitHub cead92b2c7 Merge pull request #3865 from Ordoviz/master
Improve German translation
2020-12-08 14:31:26 -05:00
Anuken 8d4ab2d7fb Cleanup 2020-12-08 14:23:13 -05:00