Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,316 Commits 4 Branches 180 Tags
6bc98bbe6729cdbbd6c953063ea78a03a8c19d61
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 6bc98bbe67 Configurable lights 2019-11-18 16:58:39 -05:00
Anuken 5e2dd89d3b Entity type cleanup 2019-11-18 16:24:57 -05:00
AnukenandGitHub 425f63c673 Update Blocks.java 2019-11-18 12:43:04 -05:00
AnukenandGitHub 7523f20d85 Update BuildVisibility.java 2019-11-18 12:40:03 -05:00
Anuken 13cc136fe2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	CONTRIBUTING.md
 2019-11-18 08:30:25 -05:00
Anuken c41cbc8bea Added formatting file 2019-11-18 08:29:52 -05:00
AnukenandGitHub d232d249e9 Update CONTRIBUTING.md 2019-11-18 01:07:26 -05:00
Anuken e0a52f4779 More guidelines 2019-11-18 01:04:37 -05:00
Anuken 8d431e5b40 Contribution guide cleanup 2019-11-18 01:00:16 -05:00
Anuken dcb1f0b00a Merge remote-tracking branch 'origin/master' 2019-11-18 00:55:49 -05:00
Anuken 9b732017a9 Added contribution guide 2019-11-18 00:55:33 -05:00
Anuken dc1b073882 Revert #961 2019-11-17 15:45:47 -05:00
Anuken fad6fe9a2a Added armored conduit / Lighting improvements / Moved liquid package 2019-11-17 13:51:36 -05:00
Anuken c8eee3b825 Made solar panels less efficient in darkness 2019-11-17 11:35:32 -05:00
Anuken 73b6cc73ff Fixed tests 2019-11-17 11:30:03 -05:00
Anuken 2593e96999 Bugfixes 2019-11-17 11:20:36 -05:00
Anuken 629999a1cd More unit tests / Lighting improvements 2019-11-16 23:45:31 -05:00
Anuken 4d3e268972 Merge branches 'lights' and 'master' of https://github.com/Anuken/Mindustry 2019-11-16 23:29:33 -05:00
Anuken 84968c9f73 Added color picker / Customizable lighting rules 2019-11-16 23:27:42 -05:00
Anuken d73b99945f Minor light optimization 2019-11-16 22:49:36 -05:00
Anuken 1d15316cbb Configurable ambient light, darkness 2019-11-16 20:18:00 -05:00
Anuken 913a703d41 Illuminator textures 2019-11-16 20:06:11 -05:00
Anuken 5d949f6bc0 Correct reactor consumption display 2019-11-16 20:05:52 -05:00
Anuken faf64f11f2 More lights 2019-11-16 19:57:33 -05:00
Anuken 430c4fa1d0 Fixed #1077 2019-11-16 16:54:51 -05:00
Anuken a90f2545d9 Disable reactor explosions on servers by default 2019-11-16 16:43:31 -05:00
Anuken eba0a96b6d Merge remote-tracking branch 'origin/master' 2019-11-16 15:51:51 -05:00
Anuken f9ffb78b33 Added configurable global server rules 2019-11-16 15:51:35 -05:00
AnukenandGitHub 083f2e38d4 Update BuilderTrait.java 2019-11-16 09:37:09 -05:00
Anuken 1f6ef9d9ae Merge remote-tracking branch 'origin/master' 2019-11-15 21:12:12 -05:00
Anuken e6afe584e5 Fixed 'underwater' ores 2019-11-15 21:12:08 -05:00
Anuken b795d97d0e Merge remote-tracking branch 'origin/master' 2019-11-15 19:49:48 -05:00
Anuken ec7379cc86 Updated to gradle 6.0 2019-11-15 19:48:26 -05:00
Anuken 016823d446 Bridge cleanup 2019-11-14 18:53:24 -05:00
Anuken 0cf9ef66fa Merge remote-tracking branch 'origin/master' 2019-11-14 18:48:21 -05:00
Anuken 1f583dc7a2 Bugfixes 2019-11-14 18:48:12 -05:00
Anuken 618a050414 Fix getProgressIncrease 2019-11-14 15:02:09 -05:00
Anuken ec7f49c94b Merge remote-tracking branch 'origin/master' 2019-11-14 14:59:10 -05:00
Anuken 30ea285ca0 Change power "satisfaction" -> "status", use efficiency() in blocks 2019-11-14 14:59:04 -05:00
Anuken c5a4d7331f Switched to using core attack events 2019-11-14 14:40:42 -05:00
AnukenandGitHub 230428f2e0 Update CoreBlock.java 2019-11-14 12:35:59 -05:00
AnukenandGitHub 1a26a1bf63 Update CoreBlock.java 2019-11-14 12:28:35 -05:00
AnukenandGitHub 77001324e9 Update EventType.java 2019-11-14 09:59:33 -05:00
Anuken 0fd6207689 Cleanup 2019-11-14 08:51:12 -05:00
Anuken dd175747ab Permissive extensions 2019-11-13 19:40:03 -05:00
Anuken 3106389f6a Switched to HJson content parsing 2019-11-13 19:12:12 -05:00
Anuken d8c997b355 Methods renamed / Better build request handling 2019-11-12 23:40:45 -05:00
Anuken 103f655fa4 Removed boolean usage 2019-11-12 15:59:44 -05:00
Anuken 1dfaf3897c Proper node intersect 2019-11-12 08:23:23 -05:00
Anuken 56917483d6 Cleaned up diode 2019-11-11 23:32:49 -05:00
Anuken a73491bb9b aaaa 2019-11-10 23:28:53 -05:00
Anuken eee06da6b4 again 2019-11-10 23:10:44 -05:00
Anuken 231ce28f74 apple why 2019-11-10 23:01:19 -05:00
Anuken 0e8abca5d9 More attempts 2019-11-10 22:41:06 -05:00
Anuken 2cf628305a Return -1 when applicable 2019-11-10 22:12:25 -05:00
Anuken 001294a94c Use different streams 2019-11-10 21:44:11 -05:00
Anuken fa0e9727ae Remove stream read 2019-11-10 21:28:11 -05:00
Anuken b8aa3c8b21 Attempt 2 2019-11-10 21:16:51 -05:00
Anuken f2f5fde3a5 Merge remote-tracking branch 'origin/master' 2019-11-10 20:59:28 -05:00
Anuken d6822c9c7d Possible IOS read fix 2019-11-10 20:59:23 -05:00
Anuken 52f592a357 Lighting improvements 2019-11-10 16:18:47 -05:00
Anuken 39a0dde1f4 Merge branch 'master' of https://github.com/Anuken/Mindustry into lights 
# Conflicts:
#	core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
 2019-11-10 14:12:43 -05:00
Anuken 4c0607aba8 Bugfixes 2019-11-09 17:19:29 -05:00
Anuken 2af13a31dc Bugfixes 2019-11-09 16:36:28 -05:00
Anuken 2dec6af231 Merge remote-tracking branch 'origin/master' 2019-11-09 15:30:12 -05:00
Anuken c70fb5940f Display document import errors on iOS 2019-11-09 15:30:02 -05:00
Anuken fb15c44383 Fix links in a hacky way 2019-11-08 21:11:49 -05:00
Anuken 4f4113d3d1 Merge remote-tracking branch 'origin/master' 2019-11-08 19:09:45 -05:00
Anuken 52355de1c0 use // for comments 2019-11-08 19:08:07 -05:00
Anuken 505f802e20 Use ## for comments, just in case 2019-11-08 14:55:32 -05:00
Anuken e9f9194f73 Added json comments 2019-11-08 14:40:15 -05:00
Anuken effd4e959a Power cleanup 2019-11-08 13:04:24 -05:00
AnukenandGitHub 8b2934c60e Update ForceProjector.java 2019-11-07 19:05:15 -05:00
Anuken d05f56c5b1 Cleanup 2019-11-07 17:16:09 -05:00
Anuken d1196f8e85 Fixed #745 2019-11-07 16:55:26 -05:00
Anuken c71b5d6f87 Copy Steam DLLs into folder 2019-11-07 14:58:51 -05:00
Anuken 1e7c21c1ae Bugfixes 2019-11-06 13:59:35 -05:00
Anuken 82ae378edc Fixed mech pads not working 2019-11-05 21:51:58 -05:00
Anuken ccac67ced6 Fixed unit tests, power problems 2019-11-05 19:20:23 -05:00
Anuken ce6f3ddb5a Updated bundles 2019-11-05 19:03:14 -05:00
Anuken 0738a7dbf0 Merge remote-tracking branch 'origin/master' 2019-11-05 18:09:49 -05:00
Anuken a539bb8e57 Better oil bar color 2019-11-05 17:58:30 -05:00
Anuken e4697bae27 Merge remote-tracking branch 'origin/master' 2019-11-05 17:29:33 -05:00
Anuken 3691ab7f8f Remove canProduce as a method 2019-11-05 17:29:19 -05:00
Anuken 21b7016fb5 Bugfixes 2019-11-05 15:32:13 -05:00
Anuken 3e43f5577e Bugfixes 2019-11-04 23:47:51 -05:00
Anuken f1f8130718 arc, again 2019-11-04 22:55:04 -05:00
Anuken f38bf9262d Arc update 2 2019-11-04 22:35:32 -05:00
Anuken be6af55616 Arc update 2019-11-04 22:28:11 -05:00
Anuken 53d004d91e Merge remote-tracking branch 'origin/master' 2019-11-04 22:18:39 -05:00
Anuken 6153764c0d Bugfixes for Steam 2019-11-04 22:18:34 -05:00
Anuken 08b730a349 Replaced 'loadout' class with schematics / Small sound tweaks 2019-11-03 22:15:05 -05:00
Anuken 08d0a7ada7 Bugfixes / Better power link priority 2019-11-03 21:27:58 -05:00
Anuken b542b6651e Merge remote-tracking branch 'origin/master' 2019-11-03 13:04:32 -05:00
Anuken c249485a4f Mobile schematic fixes 2019-11-03 13:04:27 -05:00
Anuken 48c062f7af HUD fixes 2019-11-03 12:16:28 -05:00
Anuken cf6d2c7593 Added schematics dialog to desktop menu 2019-11-03 08:59:51 -05:00
Anuken 7ca8ac64a3 Merge remote-tracking branch 'origin/master' 2019-11-02 15:51:37 -04:00
Anuken 230f98fbb4 Fix abstractness 2019-11-02 15:51:31 -04:00
Anuken 6f9811498a Bugfixes 2019-11-02 14:35:50 -04:00