Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,636 Commits 4 Branches 180 Tags
324e5151aa503ef8805308c6a8bd9c1931e01362
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 324e5151aa Block cleanup 2021-10-17 22:40:21 -04:00
Anuken 3c963fb1bc Merge remote-tracking branch 'origin/master' 2021-10-17 19:55:45 -04:00
Anuken af3467035b Building tile referernce cleanup 2021-10-17 19:55:37 -04:00
Anuken 0acd339e33 Payload loader crash fix 2021-10-17 16:46:39 -04:00
Anuken e897458e94 Sound codegen fixes 2021-10-17 16:12:47 -04:00
Anuken a72adef051 Fixed off-tinted cells 2021-10-17 16:03:05 -04:00
Anuken a8ffd6c520 Merge remote-tracking branch 'origin/master' 2021-10-17 15:30:56 -04:00
Anuken 9cb8c6d83d Added liquid container to tech tree 2021-10-17 15:30:52 -04:00
Anuken 994f6f7e84 Redundant codegen cleanup 2021-10-17 15:21:41 -04:00
Anuken ba91fb8eb7 Bugfixes 2021-10-17 15:14:19 -04:00
Anuken e6d7330f6e Fixed #6182 2021-10-17 15:01:29 -04:00
Anuken be1561b0cb Don't allow constructing banned blocks 2021-10-16 23:17:54 -04:00
Anuken b271f5b630 Fixed #6174 2021-10-16 23:06:07 -04:00
Anuken d5a2f13442 Payload loader tweaks 2021-10-16 22:33:17 -04:00
Anuken f03d3d89f3 Fixed large units fitting into deconstructors 2021-10-16 18:43:43 -04:00
Anuken 717a620ff4 Unpause game in logic variable dialog if necessary 2021-10-16 14:51:53 -04:00
Anuken 9dfd4d0049 Merge remote-tracking branch 'origin/master' 2021-10-16 13:01:07 -04:00
Anuken 290450de5b Fixed deconstructor not accepting direct unit payloads 2021-10-16 13:01:03 -04:00
Anuken b7f030eb13 Added logic variable display window 2021-10-16 12:30:00 -04:00
Anuken f43e308dad Merge remote-tracking branch 'origin/master' 2021-10-16 10:22:24 -04:00
Anuken bd329f57d6 Add sensing of reconstructor config 2021-10-16 10:22:20 -04:00
Anuken 902f3695ee amend 2021-10-16 09:03:21 -04:00
Anuken d5e239c610 Fixed #6168 2021-10-16 09:02:40 -04:00
Anuken 36064c63e3 Fixed #6166 2021-10-15 22:26:52 -04:00
Anuken 01a8a8bb4d Merge remote-tracking branch 'origin/master' 2021-10-15 21:40:13 -04:00
Anuken 4a979058c2 Crawler shootOnDeath 2021-10-15 21:40:09 -04:00
Anuken 956cbe792b Fixed #6164 2021-10-15 18:48:59 -04:00
Anuken e9e5fea306 Merge remote-tracking branch 'origin/master' 2021-10-15 17:04:39 -04:00
Anuken f683496440 cleanup 2021-10-15 17:04:34 -04:00
Anuken 816ab161df Make Unit type default to Alpha 2021-10-15 12:07:07 -04:00
Anuken bccdd86f30 Merge remote-tracking branch 'origin/master' 2021-10-15 11:41:00 -04:00
Anuken 9a5ac14bc3 Fixed #6158 2021-10-15 11:40:55 -04:00
AnukenandGitHub 18c5f508b1 Update README.md 2021-10-14 22:41:33 -04:00
Anuken d8cf65e24c More permissive json type re-declarations 2021-10-14 21:59:02 -04:00
Anuken 3de9cfa1d7 Don't crash on invalid research 2021-10-14 21:26:34 -04:00
Anuken df156444e7 Prioritize mod content in parser 2021-10-14 21:24:19 -04:00
Anuken 8a3dd53aa2 ClassMap regen 2021-10-14 21:01:20 -04:00
Anuken b855849e4a Merge remote-tracking branch 'origin/master' 2021-10-14 20:58:13 -04:00
Anuken 6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
Anuken b30eb26eb7 Merge remote-tracking branch 'origin/master' 2021-10-14 11:16:57 -04:00
Anuken b5f639f518 AGP 7.0.3 2021-10-14 11:16:53 -04:00
Anuken a2f40a5565 Fixed #6148 2021-10-13 19:35:04 -04:00
Anuken 1f1a5bde3e Removed unused PayloadLaunchPad class 2021-10-13 14:00:31 -04:00
Anuken 4a4b336814 Added logic payEnter command 2021-10-13 10:18:34 -04:00
Anuken 1a839bce86 Merge remote-tracking branch 'origin/master' 2021-10-13 08:51:54 -04:00
Anuken 2e747a481a Generator unit cell color tweaks 2021-10-13 08:51:48 -04:00
Anuken 9e01d1a69d Merge remote-tracking branch 'origin/master' 2021-10-12 18:25:43 -04:00
Anuken 5e8a3137c1 FX cast cleanup 2021-10-12 18:25:37 -04:00
AnukenandGitHub 5b9e11cc6c Revert "Update this bundle (#6081)" (#6143) 
This reverts commit 10b1ce2a3d.
 2021-10-12 15:18:56 -04:00
Anuken 90d589939a PR cleanup 2021-10-12 14:15:28 -04:00
Anuken da225d15c7 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-10-12 14:14:56 -04:00
Anuken 25c8623e30 router 2021-10-12 12:35:46 -04:00
Anuken d5f7fc842c Fixed #6140 2021-10-12 08:25:00 -04:00
Anuken da0fea5186 Merge remote-tracking branch 'origin/master' 2021-10-11 10:30:44 -04:00
Anuken 6abb458c27 Increased world stream chunk size 2021-10-11 10:30:40 -04:00
Anuken 9f070323c2 a 2021-10-10 14:11:12 -04:00
Anuken 8ae70f5f9a Merge remote-tracking branch 'origin/master' 2021-10-10 14:04:13 -04:00
Anuken f5cb6f2542 Fixed arguments resetting red in server errors 2021-10-10 14:04:08 -04:00
AnukenandGitHub a9bb8b1310 Update TRANSLATING.md 2021-10-10 13:47:44 -04:00
Anuken b2de197050 Merge remote-tracking branch 'origin/master' 2021-10-10 12:37:11 -04:00
Anuken c60bd6f0dc Customizable chat formatting (Closes #5387) 2021-10-10 12:37:07 -04:00
Anuken 919db8cc76 Merge remote-tracking branch 'origin/master' 2021-10-10 10:24:16 -04:00
Anuken 5ce5f347aa Jitpack gradle tweak 2021-10-10 10:24:10 -04:00
Anuken d24f7cb549 Merge remote-tracking branch 'origin/master' 2021-10-09 12:54:26 -04:00
Anuken f5d6313399 Redundant effect paren cleanup 2021-10-09 12:54:20 -04:00
Anuken 1ada42738f Merge remote-tracking branch 'origin/master' 2021-10-07 14:35:13 -04:00
Anuken 04df23b88a Generation tweaks 2021-10-07 14:35:09 -04:00
Anuken 083321d6c7 Merge remote-tracking branch 'origin/master' 2021-10-07 12:07:32 -04:00
Anuken 00be5b7fa5 Converted soundtrack to ogg 2021-10-07 12:07:26 -04:00
Anuken d43157fd22 Fixed negative recoil 2021-10-06 13:29:31 -04:00
Anuken 60a430025a Merge remote-tracking branch 'origin/master' 2021-10-06 13:09:53 -04:00
Anuken 3f53315a07 Proper implementation of #6099 (untested) 2021-10-06 13:09:45 -04:00
AnukenandGitHub df5c31a0e7 Update SERVERLIST.md 2021-10-05 22:22:27 -04:00
Anuken 785ba7910d Merge remote-tracking branch 'origin/master' 2021-10-05 17:06:17 -04:00
Anuken 3030308f09 Make naval units only slow down on "shallow" water 2021-10-05 17:06:09 -04:00
Anuken 0d0fe394d3 Serpulo water tweaks 2021-10-03 13:12:20 -04:00
Anuken aed57aaac3 Added InputHandler lock system 2021-10-03 11:21:53 -04:00
Anuken b20cdb97c5 Reset chat font cache color 2021-10-02 13:01:54 -04:00
Anuken d95662233c Fixed #6090 2021-10-02 12:05:02 -04:00
Anuken ce7e91f17b Merge remote-tracking branch 'origin/master' 2021-10-02 08:42:12 -04:00
Anuken db6b8abce6 Fixed #6089 2021-10-02 08:42:07 -04:00
Anuken 60fe1e5570 arc 2021-10-01 12:10:50 -04:00
Anuken 67ed6ddd18 arc 2021-10-01 09:44:45 -04:00
Anuken b265ddac03 Don't suggest changing the mod disable option 2021-10-01 09:28:23 -04:00
Anuken ee26f51d7a Cleanup 2021-09-30 18:32:31 -04:00
Anuken 0483e3f900 Serpulo naval wave support 2021-09-30 18:22:50 -04:00
Anuken 9939d6065a Merge remote-tracking branch 'origin/master' 2021-09-30 17:33:23 -04:00
Anuken c226127648 Display jump statement destination 2021-09-30 17:33:17 -04:00
Anuken 6f6590d5bb chargeShootEffect / Effect startDelay 2021-09-29 22:39:33 -04:00
Anuken 603c871e6e apparently the --illegal-access flag is still needed 2021-09-28 18:52:48 -04:00
Anuken 71543f2ab2 Improved Serpulo water edge generation 2021-09-28 17:20:20 -04:00
Anuken 7f415588f4 Cleaned up duplicate SettingsMenuDialog code 2021-09-28 14:41:35 -04:00
Anuken c6c374f672 Merge remote-tracking branch 'origin/master' 2021-09-28 11:28:58 -04:00
Anuken d226ffe633 Fixed #6071 2021-09-28 11:28:53 -04:00
Anuken 8f53822a6e Merge remote-tracking branch 'origin/master' 2021-09-27 21:11:25 -04:00
Anuken c814ef0012 Slightly increased item charge damage 2021-09-27 21:11:21 -04:00
Anuken f5a0528c73 Merge remote-tracking branch 'origin/master' 2021-09-27 19:02:10 -04:00
Anuken f5a2ed900d Make hint.presetLaunch more likely to show up 2021-09-27 19:02:06 -04:00
Anuken 13b92519f1 Added missing revision 2021-09-27 15:07:34 -04:00