Commit Graph
100 Commits
Author SHA1 Message Date
Anuken f14d631ff9 Internal changes for surface-less floors 2020-10-08 14:44:02 -04:00
Anuken 6aa1144429 Hot rock + basalt generation for sectors 2020-10-08 14:37:51 -04:00
Anuken e05ac5ae41 Cleanup 2020-10-08 13:08:49 -04:00
Anuken eb0ab3b3e5 Fixed #2870 2020-10-08 12:59:57 -04:00
Anuken ac496a60b7 More tests 2020-10-08 09:22:42 -04:00
Anuken 3ec243a49b Fixed #2866 2020-10-08 09:15:33 -04:00
Anuken 29ccc5010a Removed debug log 2020-10-07 17:24:48 -04:00
Anuken a97f7eeef8 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-10-07 17:24:25 -04:00
Anuken 903b62be98 IO fixes 2020-10-07 17:21:48 -04:00
Anuken 773e4c7053 Unified command 2020-10-07 16:37:48 -04:00
AnukenandGitHub 4acb2ecfa6 Update bug_report.md 2020-10-07 16:05:16 -04:00
Anuken 261c1b1611 (2) 2020-10-07 14:20:23 -04:00
Anuken 8ba4458a1a Select effect 2020-10-07 14:20:09 -04:00
Anuken 30f5340a22 Mobile manual aiming / Mobile control changes [UNSTABLE] 2020-10-07 14:19:08 -04:00
Anuken 583a12a47b Fixed #2856 2020-10-07 11:13:11 -04:00
Anuken be66a15287 Extra mod field parsing (untested) 2020-10-07 11:00:02 -04:00
Anuken d4513fab19 IO schema files for previous commit 2020-10-06 17:08:28 -04:00
Anuken b23dc62c86 Save unit flags 2020-10-06 17:07:10 -04:00
Anuken 79bd9f1f81 More logic commands 2020-10-06 16:27:02 -04:00
Anuken 2d539565c3 More logic commands 2020-10-06 14:03:21 -04:00
Anuken 9182b48b85 Various unit logic additions 2020-10-06 11:26:25 -04:00
AnukenandGitHub 06925e70c8 Merge pull request #2841 from genNAowl/healbullets-bullets
Merge `HealBulletType` with `BulletType`
2020-10-06 09:09:18 -04:00
Anuken c87f0c27b3 Logic tweaks 2020-10-05 19:59:15 -04:00
Anuken 5cc6ac0216 Small tweaks 2020-10-05 17:44:06 -04:00
Anuken e8e9c14ec9 Merge remote-tracking branch 'origin/master' 2020-10-05 17:09:30 -04:00
Anuken efbc871967 Pathfind command 2020-10-05 17:09:27 -04:00
AnukenandGitHub 93e21c6bf9 Merge pull request #2806 from genNAowl/burning-affects-tiles
Incendiary Bullets Make Fires When Hitting Tiles
2020-10-05 16:35:13 -04:00
Anuken c24112e405 arc 2020-10-05 15:42:55 -04:00
Anuken fb4498d2fb Merge remote-tracking branch 'origin/master' 2020-10-05 15:42:48 -04:00
Anuken 7088ae89b3 Logic unit control 2020-10-05 15:42:37 -04:00
AnukenandGitHub dda77dad4c Merge pull request #2572 from Recessive/patch-5
Update servers.json
2020-10-05 11:12:33 -04:00
Anuken 8e49d73765 Nullable region arrays 2020-10-04 15:22:41 -04:00
Anuken d0d0f5a26f Fixed #2834 2020-10-04 15:06:13 -04:00
Anuken 9d454f208c Merge remote-tracking branch 'origin/master' 2020-10-04 12:48:37 -04:00
Anuken 702ba0ae84 Bugfixes 2020-10-04 12:48:33 -04:00
AnukenandGitHub b02a3de117 hhh 2020-10-04 12:32:38 -04:00
AnukenandGitHub 22debcc95a hhh 2020-10-04 12:32:37 -04:00
AnukenandGitHub 4156ae4692 hhh 2020-10-04 12:32:27 -04:00
AnukenandGitHub 46ab9e77e1 Update bug_report.md 2020-10-04 11:03:57 -04:00
AnukenandGitHub dd9ca10c7f Update bug_report.md 2020-10-04 11:03:16 -04:00
Anuken 605a370679 Fixed turrets firing without power as players 2020-10-04 09:58:53 -04:00
Anuken c4fb84c359 Weapon charge sound 2020-10-04 09:42:49 -04:00
Anuken 55feb38cb7 Merge remote-tracking branch 'origin/master' 2020-10-04 09:11:42 -04:00
Anuken 3ad5167dc9 Fixed #2827 2020-10-04 09:11:38 -04:00
AnukenandGitHub 0653d38075 Merge pull request #2825 from Gdeft/patch-3
Fix spelling in CrashSender.java
2020-10-04 09:09:52 -04:00
Anuken b561b38b56 Fixed #2824 2020-10-03 19:07:16 -04:00
Anuken 187c98b830 Merge remote-tracking branch 'origin/master' 2020-10-03 15:35:29 -04:00
Anuken 06f9aa5f84 things 2020-10-03 15:35:26 -04:00
AnukenandGitHub 9a92e0246e Merge pull request #2807 from MEEPofFaith/patch-1
Define payload capacity of payload conveyors on the conveyor itself.
2020-10-03 10:37:41 -04:00
Anuken 58a62ad19c implicit nullable types 2020-10-03 10:19:00 -04:00
Anuken 7a307bbe9c cleanup 2020-10-02 23:15:52 -04:00
Anuken 99bc330ce4 arc 2020-10-02 23:11:35 -04:00
Anuken 35af71c613 Moved Nullable to utils package 2020-10-02 23:11:26 -04:00
Anuken ae2a4ea2d6 Merge remote-tracking branch 'origin/master' 2020-10-02 20:23:46 -04:00
Anuken 43936b536e Cleanup 2020-10-02 20:23:37 -04:00
AnukenandGitHub b73660eb4f Merge pull request #2803 from SkinH/patch-2
Update servers.json
2020-10-02 20:03:16 -04:00
Anuken 5861fe61b2 Cleanup 2020-10-02 19:51:30 -04:00
Anuken 10dd2b4b33 Fixed javadoc errors 2020-10-02 12:06:16 -04:00
Anuken a3224b7082 Improved replacement system 2020-10-02 11:14:18 -04:00
Anuken 138434d029 Fixed #2799 / Fixed #2797 2020-10-02 09:54:08 -04:00
Anuken 215cfaa42f Fixed #2793 2020-10-01 16:03:13 -04:00
Anuken 68c41774e4 More contrast for specific colors 2020-10-01 14:22:48 -04:00
Anuken 4074a241d2 Cleanup 2020-10-01 14:07:33 -04:00
Anuken c1970b4da5 Merge branch 'campaign'
# Conflicts:
#	core/src/mindustry/world/consumers/ConsumeItemFilter.java
2020-10-01 13:37:25 -04:00
Anuken 1170880127 Merge remote-tracking branch 'origin/master' 2020-10-01 13:33:55 -04:00
Anuken 199be4d13d Implicit non-nullability for fields 2020-10-01 13:33:43 -04:00
Anuken 085bc2ee9c campaign progress 2020-10-01 11:19:42 -04:00
AnukenandGitHub 2604a2d649 Merge pull request #2783 from Quezler/patch-45
Move cryofluid mixer emoji back to the old number
2020-10-01 08:56:28 -04:00
AnukenandGitHub 6f4f0eef57 Merge pull request #2786 from Quezler/patch-46
Clarify stack conveyor recharge property
2020-10-01 08:42:11 -04:00
Anuken 4264b960cd Merge branch 'master' of https://github.com/Anuken/Mindustry into campaign 2020-09-30 22:46:33 -04:00
Anuken b15cdfef46 sprites repacked 2020-09-30 22:37:32 -04:00
AnukenandGitHub d3441f4ac9 Merge pull request #2781 from genNAowl/cryofluidmixer-cryofluid-mixer
change "cryofluidmixer" to "cryofluid-mixer"
2020-09-30 22:35:10 -04:00
Anuken 54c991e611 Removed outOfTime pause 2020-09-30 22:25:28 -04:00
Anuken f3c642d0d7 Fixed #2779 2020-09-30 19:55:22 -04:00
Anuken a0394e4382 Balance 2020-09-30 18:56:37 -04:00
Anuken 7eb0da82de Added enemy lights setting 2020-09-30 17:44:13 -04:00
Anuken 326640d32a Cleanup 2020-09-30 17:21:05 -04:00
Anuken 781d9b3c38 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-30 16:42:10 -04:00
Anuken 1697fec311 Tsunami balancing 2020-09-30 16:40:45 -04:00
AnukenandGitHub 0b2c2c49b0 Anuken/Mindustry-Suggestions/issues/653 2020-09-30 15:12:38 -04:00
Anuken 27089f1057 Merge remote-tracking branch 'origin/master' 2020-09-30 15:01:50 -04:00
Anuken d07c74b60f Re-added tap event for servers 2020-09-30 15:01:46 -04:00
AnukenandGitHub 8dc610a091 Update CONTRIBUTING.md 2020-09-30 14:53:56 -04:00
Anuken 059c729a2c Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-30 14:50:09 -04:00
Anuken 03d676403f Cleanup 2020-09-30 14:50:05 -04:00
AnukenandGitHub 6645e3a473 Merge pull request #2772 from LeoDog896/pathfinder
Remove nearGround in favor of !nearLiquid
2020-09-30 12:59:55 -04:00
Anuken d2728c2bf0 Fixed #2774 2020-09-30 12:45:01 -04:00
Anuken f5e5f82d47 Merge remote-tracking branch 'origin/master' 2020-09-30 11:19:46 -04:00
Anuken 0963de4022 Cleanup 2020-09-30 11:19:38 -04:00
AnukenandGitHub b35fa21c79 Update gradle.yml 2020-09-30 11:13:17 -04:00
AnukenandGitHub b38e7f66ad Merge pull request #2770 from LeoDog896/autotiler
Autotiler docs and cleanup
2020-09-30 10:49:42 -04:00
AnukenandGitHub ba53d76d8d Merge pull request #2769 from Voz-Duh/packed-liquid-drawer
Packed Liquid Drawer
2020-09-30 10:46:45 -04:00
AnukenandGitHub 957e06470d Merge pull request #2768 from LeoDog896/master
Remove unused package
2020-09-30 09:43:12 -04:00
Anuken 3c3c15dcf4 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-29 23:55:59 -04:00
Anuken 2b2a12267a Long-range 4x4 turret (wip) / Java 14 language upgrade 2020-09-29 23:55:55 -04:00
AnukenandGitHub 0e2f62f8b4 Merge pull request #2765 from summetdev/file-chooser-default
Save last FileChooser's directory to settings.
2020-09-29 17:29:34 -04:00
Anuken c3274622b2 Fixed #2763 2020-09-29 11:53:45 -04:00
Anuken 521ca1aea4 Fixed mechs not having animations on multiplayer 2020-09-29 10:57:06 -04:00
Anuken 5523ea4752 Slag light 2020-09-28 19:37:18 -04:00
Anuken c89d6f6b74 Re-packed sprites from PR 2020-09-28 18:42:09 -04:00