Commit Graph

9322 Commits

Author SHA1 Message Date
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
Anuken
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
genNAowl
7722d697c6 Update core/src/mindustry/entities/bullet/BulletType.java
Co-authored-by: Anuken <arnukren@gmail.com>
2020-10-05 13:10:52 -07:00
genNAowl
68e67ae0f2 Update core/src/mindustry/entities/bullet/BulletType.java
Co-authored-by: Anuken <arnukren@gmail.com>
2020-10-05 13:10:46 -07: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
Leonwang4234
f9d6ef8e91 Sublime Text is messing with whitespace 2020-10-05 11:58:35 -07:00
Leonwang4234
28ea336966 whitespace 2020-10-05 11:57:19 -07:00
Leonwang4234
e17f28b636 merge healbullets with bullettype 2020-10-05 11:49:12 -07:00
Anuken
dda77dad4c Merge pull request #2572 from Recessive/patch-5
Update servers.json
2020-10-05 11:12:33 -04:00
Petr Gašparík
bf4b01e46c name change 2020-10-05 12:05:53 +02:00
Petr Gašparík
cbb1058dc7 Merge branch 'v106-alpha' of https://github.com/PetrGasparik/Mindustry into v106-alpha 2020-10-05 12:04:38 +02:00
Petr Gašparík
26f6bcccb7 Czech - up to date for commit 14156c1 2020-10-05 12:04:35 +02:00
Petr Gašparík
81e4fb3759 Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-10-05 11:56:55 +02:00
Petr Gašparík
55be1fd969 Apply suggestions from code review
Co-authored-by: Roman Plášil <me@rplasil.name>
2020-10-05 11:55:01 +02: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
Anuken
b02a3de117 hhh 2020-10-04 12:32:38 -04:00
Anuken
22debcc95a hhh 2020-10-04 12:32:37 -04:00
Anuken
4156ae4692 hhh 2020-10-04 12:32:27 -04:00
Anuken
46ab9e77e1 Update bug_report.md 2020-10-04 11:03:57 -04:00
Anuken
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
Anuken
0653d38075 Merge pull request #2825 from Gdeft/patch-3
Fix spelling in CrashSender.java
2020-10-04 09:09:52 -04:00
summetdev
bdc69249bb fix newline 2020-10-04 16:03:48 +03:00
summetdev
eedb90ed16 bigger description area 2020-10-04 15:27:05 +03:00
TheMrAlbert
c1be33cf2f Minor update
These are the minor translations, please review this translation before merging.
Also, block.consecutive (line 611) are left untranslated to allow other translator who are capable to translate it well.
2020-10-04 12:45:08 +07:00
grimsoul10
5d2c36f186 Small changes (#1)
* Small changes
* Capitalizations
2020-10-04 10:48:48 +07:00
Thomas Widyantoko
3e49c68ec2 Updated for missing lines 2020-10-04 10:08:42 +07:00
Wina
903424654d Updates to bundle_es.properties 2020-10-03 22:39:33 -03:00
Gdeft
08dfded0c2 Fix spelling 2020-10-04 07:15:27 +07:00
Anuken
b561b38b56 Fixed #2824 2020-10-03 19:07:16 -04:00
cinnx
6b36b65ac0 Update bundle_pl.properties
fixed some translations; compared, fixed and added few lines from original bundle file
2020-10-03 23:14:11 +02:00
summetdev
5ffff9c151 description for schematics 2020-10-03 22:43:52 +03: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
Leonid Skorospelov
f30a3392d5 Update servers.json 2020-10-03 19:54:25 +03:00
ThePythonGuy
50491755d1 typo and stuff 2020-10-03 16:59:39 +02:00
Anuken
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
Leonwang4234
60d5048140 Update BulletType.java 2020-10-02 21:25:05 -07:00
MEEP of Faith
8d4dff2481 Change the comment. 2020-10-02 21:22:11 -07:00
MEEP of Faith
f6d805638c Then apply flexibility to the Payload Conveyor
Modding :D
2020-10-02 21:19:53 -07:00