genNAowl and GitHub
cba2fd4351
Merge branch 'master' into healbullets-bullets
2020-10-05 16:04:29 -07: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
Anuken and GitHub
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
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
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
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
702ba0ae84
Bugfixes
2020-10-04 12:48:33 -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
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 and GitHub
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 and GitHub
5d2c36f186
Small changes ( #1 )
...
* Small changes
* Capitalizations
2020-10-04 10:48:48 +07:00
Thomas Widyantoko and GitHub
3e49c68ec2
Updated for missing lines
2020-10-04 10:08:42 +07:00
Gdeft and GitHub
08dfded0c2
Fix spelling
2020-10-04 07:15:27 +07:00
Anuken
b561b38b56
Fixed #2824
2020-10-03 19:07:16 -04: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
Anuken and GitHub
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 and GitHub
8d4dff2481
Change the comment.
2020-10-02 21:22:11 -07:00
MEEP of Faith and GitHub
f6d805638c
Then apply flexibility to the Payload Conveyor
...
Modding :D
2020-10-02 21:19:53 -07:00
MEEP of Faith and GitHub
8f1869672d
Variable fits limit.
2020-10-02 21:16:45 -07:00
Anuken
7a307bbe9c
cleanup
2020-10-02 23:15:52 -04:00
Anuken
35af71c613
Moved Nullable to utils package
2020-10-02 23:11:26 -04:00
Leonwang4234
e53a1d0472
Update BulletType.java
2020-10-02 19:47:47 -07:00
Leonwang4234
74c0d0d0fd
Update BulletType.java
2020-10-02 19:33:11 -07:00
Leonwang4234
ca70b9c705
fix
...
(again)
2020-10-02 18:28:36 -07:00
Leonwang4234
5aa0ce97b8
fix
2020-10-02 18:27:33 -07:00
Leonwang4234
39e956c934
Update BulletType.java
2020-10-02 18:26:17 -07:00
Leonwang4234
88639fffc5
fix
2020-10-02 18:17:51 -07:00
Leonwang4234
e17ad7a429
Merge remote-tracking branch 'upstream/master' into burning-affects-tiles
2020-10-02 17:47:11 -07:00
Anuken
43936b536e
Cleanup
2020-10-02 20:23:37 -04:00
Anuken
5861fe61b2
Cleanup
2020-10-02 19:51:30 -04:00
genNAowlandGitHub
Anuken
Leonwang4234
Petr Gašparík
summetdev
TheMrAlbertandGitHub
grimsoul10andGitHub
Thomas WidyantokoandGitHub
GdeftandGitHub
MEEP of FaithandGitHub