Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,873 Commits 4 Branches 180 Tags
4e1b46dda77bbecfeaf5ae1c9ac25e47f0e737c9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 4e1b46dda7 CI 2020-10-09 17:08:15 -04:00
Anuken d21e321c80 CI 2020-10-09 17:03:32 -04:00
Anuken 9f28750063 CI 2020-10-09 16:42:00 -04:00
Anuken 532263b417 Different Android version code system 2020-10-09 16:19:58 -04:00
Anuken 8d738c31e7 arc 2020-10-09 16:17:23 -04:00
Anuken 36463f920d Signed Android releases, maybe 2020-10-09 15:58:55 -04:00
Anuken 7639f8102f Bugfixes 2020-10-09 15:34:25 -04:00
Anuken 7da400608c Bugfixes 2020-10-09 15:18:13 -04:00
Anuken 81633dace4 Merge remote-tracking branch 'origin/master' 2020-10-09 13:52:15 -04:00
Anuken c78088ab5f Harder default waves 2020-10-09 13:52:07 -04:00
AnukenandGitHub d75be3fcd6 Merge pull request #2888 from Quezler/patch-50 
Update leak behaviour in plated conduit description
 2020-10-09 13:18:11 -04:00
Anuken 96656bac6b Bugfixes 2020-10-09 12:59:59 -04:00
Anuken 99539bbab0 Merge remote-tracking branch 'origin/master' 2020-10-09 10:02:12 -04:00
Anuken 22f1c3b2d1 Bugfixes 2020-10-09 10:02:08 -04:00
AnukenandGitHub 1d34b8474b Merge pull request #2877 from genNAowl/pierce-cap 
Adds a Pierce Cap Variable
 2020-10-09 09:59:53 -04:00
AnukenandGitHub ecd152a114 Merge pull request #2882 from Quezler/patch-49 
Prevent plated conduits from leaking
 2020-10-09 09:57:47 -04:00
AnukenandGitHub c59263037b Merge pull request #2879 from Quezler/patch-47 
Console yes command
 2020-10-09 09:46:16 -04:00
Anuken e2b58528d0 New waves for sectors, quite possibly broken 2020-10-08 19:33:54 -04:00
Anuken 68f11df55d arc 2020-10-08 19:11:34 -04:00
Anuken 0a0af9c291 Random derelicts in sectors 2020-10-08 19:11:20 -04:00
Anuken 2d70e00193 getChild -> remove 2020-10-08 15:15:47 -04:00
Anuken c7f1204119 space 2020-10-08 15:14:28 -04:00
Anuken 2c905cdbf1 Merge branch 'space' 2020-10-08 14:47:41 -04:00
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 d06449f311 space 2020-10-08 14:06:07 -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