Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,543 Commits 4 Branches 180 Tags
5597765232d5baca7d587ce6e957dec2c1047085
Commit Graph
2352 Commits
Author SHA1 Message Date
Anuken d5fb0e924a Merge remote-tracking branch 'origin/master' 2020-10-19 16:26:03 -04:00
Anuken 6e8732387b Better weather classes 2020-10-19 16:25:59 -04:00
Sunny KimandGitHub 3c2e12621e rainbow liquid 2020-10-20 01:01:45 +09:00
Sunny KimandGitHub efb42296cf remove final 2020-10-20 00:57:08 +09:00
Anuken cab08de1f7 Merge remote-tracking branch 'origin/master' 2020-10-19 11:34:59 -04:00
Anuken 2ff749bd17 Unified stat system 2020-10-19 11:34:52 -04:00
AnukenandGitHub 073b82b70f Merge pull request #3029 from abomb4/patch-mod-environment 
Json in Mod should be able to define OreBlock type
 2020-10-19 10:43:53 -04:00
abomb4andGitHub 9e79ed8a26 Json in Mod should be able to define OreBlock type 
That in mindustry.world.blocks.environment package
 2020-10-19 22:34:52 +08:00
Anuken 59e1fd1eb6 typo 2020-10-19 10:04:30 -04:00
Anuken d1d674cfc9 Merge remote-tracking branch 'origin/master' 2020-10-19 10:04:13 -04:00
Anuken 80f801db36 Fixed #3023 / Fixed #3020 2020-10-19 10:04:10 -04:00
GlennFolkerandGitHub cae66a1e6d allow mods to easily load icon region 2020-10-19 19:13:06 +07:00
Ilya246andGitHub ad5d3581f6 armor defined twice in mega 2020-10-19 10:09:39 +04:00
Anuken 7f21d61078 Crash fix 2020-10-18 19:54:52 -04:00
Anuken c7622198fd Cleanup 2020-10-18 19:21:59 -04:00
Anuken 3a52fb2afe Merge branch 'router' 2020-10-18 19:03:13 -04:00
Anuken dac236b0e9 Better launch selection 2020-10-18 18:34:19 -04:00
genNAowlGitHubSummet
 		7a7fa74e65 Update core/src/mindustry/world/blocks/defense/Wall.java 
Co-authored-by: Summet <summet.dev@gmail.com>
 2020-10-18 14:26:48 -07:00
Leonwang4234 db3db47ca1 Add wall stats + other changes 2020-10-18 13:35:20 -07:00
Anuken 97fd9abd8c Merge remote-tracking branch 'origin/master' 2020-10-18 15:46:24 -04:00
Anuken 00d6997b5a Hex/bin logic number support 2020-10-18 15:46:20 -04:00
AnukenandGitHub 58ff6c60aa Merge pull request #3012 from summetdev/typo 
Grammatical fix
 2020-10-18 14:57:26 -04:00
AnukenandGitHub 7fc2d6be18 Merge pull request #3010 from summetdev/units-payload 
Units payload.
 2020-10-18 14:43:23 -04:00
summetdev bd6aebb961 fixed a typo in comment 2020-10-18 21:38:01 +03:00
summetdev 801eca5ca3 prevent sending extra packets 2020-10-18 21:26:32 +03:00
summetdev 12e35b643c sync fix 2020-10-18 20:24:09 +03:00
Anuken 563e99aded Fixed #3009 2020-10-18 13:02:55 -04:00
summetdev 8625ef09cc Units payload 2020-10-18 19:54:10 +03:00
Anuken ce6292cc53 Recipe display for reconstructors 2020-10-18 11:53:36 -04:00
Anuken 14c42c5652 Removed issue workaround from README 2020-10-18 09:29:49 -04:00
Anuken c1c41a19c8 Cleanup 2020-10-18 09:08:47 -04:00
Anuken 521d44714d Disabled spawnpoints during ongoing attack maps 2020-10-17 19:49:13 -04:00
Anuken 4ab0c8a1ca Merge remote-tracking branch 'origin/master' 2020-10-17 18:37:57 -04:00
Anuken 7349af4753 Various small tweaks 2020-10-17 18:37:54 -04:00
AnukenandGitHub 55a8ae083b Merge pull request #2992 from DeltaNedas/planetdraw 
allow modded planets to customize drawing
 2020-10-17 17:56:12 -04:00
Anuken e9131b4631 Minor payload acceptor fixes 2020-10-17 17:05:34 -04:00
Anuken 5d9beb4c28 Fixed #2582 2020-10-17 14:37:51 -04:00
Anuken a47432c20b Merge remote-tracking branch 'origin/master' 2020-10-17 13:03:03 -04:00
Anuken 8043c09e2b Breaking logic change: Coordinates are now tile-based 2020-10-17 13:02:57 -04:00
DeltaNedasandGitHub 091593c84d Merge branch 'master' into planetdraw 2020-10-17 16:59:28 +00:00
AnukenandGitHub 1324e75eea Merge pull request #2996 from DeltaNedas/universe 
add universe draw events
 2020-10-17 12:52:26 -04:00
Anuken c99873c823 Added bool to enable editor cliff button 2020-10-17 11:02:48 -04:00
DeltaNedas ef2bf2e129 add universeDraw event 2020-10-17 15:38:12 +01:00
Anuken 46ec457819 Cleanup 2020-10-17 10:37:28 -04:00
DeltaNedas 35a86a1aac add universe draw events 2020-10-17 15:34:00 +01:00
Anuken be394c4b33 Checks to prevent uncaptureable sectors 2020-10-17 10:10:29 -04:00
Anuken c3d0819cc1 Fixed #2988 2020-10-17 09:17:16 -04:00
DeltaNedas 8e0c5023c9 hh 2020-10-17 12:28:46 +01:00
DeltaNedas 54b0d308be h 2020-10-17 12:16:47 +01:00
DeltaNedas 05b77d787e hide orbits of hidden planets 2020-10-17 12:10:52 +01:00