Commit Graph

8825 Commits

Author SHA1 Message Date
d4513fab19 IO schema files for previous commit 2020-10-06 17:08:28 -04:00
b23dc62c86 Save unit flags 2020-10-06 17:07:10 -04:00
79bd9f1f81 More logic commands 2020-10-06 16:27:02 -04:00
2d539565c3 More logic commands 2020-10-06 14:03:21 -04:00
9182b48b85 Various unit logic additions 2020-10-06 11:26:25 -04:00
06925e70c8 Merge pull request #2841 from genNAowl/healbullets-bullets
Merge `HealBulletType` with `BulletType`
2020-10-06 09:09:18 -04:00
d8a06da79a Should Compile Now 2020-10-05 19:08:23 -07:00
c87f0c27b3 Logic tweaks 2020-10-05 19:59:15 -04:00
cba2fd4351 Merge branch 'master' into healbullets-bullets 2020-10-05 16:04:29 -07:00
5cc6ac0216 Small tweaks 2020-10-05 17:44:06 -04:00
e8e9c14ec9 Merge remote-tracking branch 'origin/master' 2020-10-05 17:09:30 -04:00
efbc871967 Pathfind command 2020-10-05 17:09:27 -04:00
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
7722d697c6 Update core/src/mindustry/entities/bullet/BulletType.java
Co-authored-by: Anuken <arnukren@gmail.com>
2020-10-05 13:10:52 -07:00
68e67ae0f2 Update core/src/mindustry/entities/bullet/BulletType.java
Co-authored-by: Anuken <arnukren@gmail.com>
2020-10-05 13:10:46 -07:00
c24112e405 arc 2020-10-05 15:42:55 -04:00
fb4498d2fb Merge remote-tracking branch 'origin/master' 2020-10-05 15:42:48 -04:00
7088ae89b3 Logic unit control 2020-10-05 15:42:37 -04:00
f9d6ef8e91 Sublime Text is messing with whitespace 2020-10-05 11:58:35 -07:00
28ea336966 whitespace 2020-10-05 11:57:19 -07:00
e17f28b636 merge healbullets with bullettype 2020-10-05 11:49:12 -07:00
dda77dad4c Merge pull request #2572 from Recessive/patch-5
Update servers.json
2020-10-05 11:12:33 -04:00
8e49d73765 Nullable region arrays 2020-10-04 15:22:41 -04:00
d0d0f5a26f Fixed #2834 2020-10-04 15:06:13 -04:00
9d454f208c Merge remote-tracking branch 'origin/master' 2020-10-04 12:48:37 -04:00
702ba0ae84 Bugfixes 2020-10-04 12:48:33 -04:00
b02a3de117 hhh 2020-10-04 12:32:38 -04:00
22debcc95a hhh 2020-10-04 12:32:37 -04:00
4156ae4692 hhh 2020-10-04 12:32:27 -04:00
46ab9e77e1 Update bug_report.md 2020-10-04 11:03:57 -04:00
dd9ca10c7f Update bug_report.md 2020-10-04 11:03:16 -04:00
605a370679 Fixed turrets firing without power as players 2020-10-04 09:58:53 -04:00
c4fb84c359 Weapon charge sound 2020-10-04 09:42:49 -04:00
55feb38cb7 Merge remote-tracking branch 'origin/master' 2020-10-04 09:11:42 -04:00
3ad5167dc9 Fixed #2827 2020-10-04 09:11:38 -04:00
0653d38075 Merge pull request #2825 from Gdeft/patch-3
Fix spelling in CrashSender.java
2020-10-04 09:09:52 -04:00
08dfded0c2 Fix spelling 2020-10-04 07:15:27 +07:00
b561b38b56 Fixed #2824 2020-10-03 19:07:16 -04:00
187c98b830 Merge remote-tracking branch 'origin/master' 2020-10-03 15:35:29 -04:00
06f9aa5f84 things 2020-10-03 15:35:26 -04:00
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
58a62ad19c implicit nullable types 2020-10-03 10:19:00 -04:00
60d5048140 Update BulletType.java 2020-10-02 21:25:05 -07:00
8d4dff2481 Change the comment. 2020-10-02 21:22:11 -07:00
f6d805638c Then apply flexibility to the Payload Conveyor
Modding :D
2020-10-02 21:19:53 -07:00
8f1869672d Variable fits limit. 2020-10-02 21:16:45 -07:00
7a307bbe9c cleanup 2020-10-02 23:15:52 -04:00
99bc330ce4 arc 2020-10-02 23:11:35 -04:00
35af71c613 Moved Nullable to utils package 2020-10-02 23:11:26 -04:00
e53a1d0472 Update BulletType.java 2020-10-02 19:47:47 -07:00