Commit Graph

9192 Commits

Author SHA1 Message Date
Anuken
29ccc5010a Removed debug log 2020-10-07 17:24:48 -04:00
Anuken
a97f7eeef8 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-10-07 17:24:25 -04:00
Anuken
903b62be98 IO fixes 2020-10-07 17:21:48 -04:00
Anuken
773e4c7053 Unified command 2020-10-07 16:37:48 -04:00
Anuken
4acb2ecfa6 Update bug_report.md 2020-10-07 16:05:16 -04:00
Anuken
261c1b1611 (2) 2020-10-07 14:20:23 -04:00
Anuken
8ba4458a1a Select effect 2020-10-07 14:20:09 -04:00
Anuken
30f5340a22 Mobile manual aiming / Mobile control changes [UNSTABLE] 2020-10-07 14:19:08 -04:00
Anuken
583a12a47b Fixed #2856 2020-10-07 11:13:11 -04:00
Anuken
be66a15287 Extra mod field parsing (untested) 2020-10-07 11:00:02 -04:00
Petr Gašparík
0ae23b637f Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-10-07 09:50:58 +02:00
Anuken
d4513fab19 IO schema files for previous commit 2020-10-06 17:08:28 -04:00
Anuken
b23dc62c86 Save unit flags 2020-10-06 17:07:10 -04:00
Anuken
79bd9f1f81 More logic commands 2020-10-06 16:27:02 -04:00
Anuken
2d539565c3 More logic commands 2020-10-06 14:03:21 -04:00
Anuken
9182b48b85 Various unit logic additions 2020-10-06 11:26:25 -04:00
Thomas Widyantoko
4fb5e01324 Minor update from TheMrAlbert 2020-10-06 20:12:14 +07:00
Anuken
06925e70c8 Merge pull request #2841 from genNAowl/healbullets-bullets
Merge `HealBulletType` with `BulletType`
2020-10-06 09:09:18 -04:00
Vanguard
f81a88feca 2 new lines; 1 changed line
New:
rules.enemyLights
units.processorcontrol

Changed:
item.titanium.description
2020-10-06 13:54:01 +03:00
Petr Gašparík
4b6289d957 Czech translation for Steam, up to date 2020-10-06 10:26:56 +02:00
Petr Gašparík
38ef46aa41 Czech translation - update for commit 7088ae8 2020-10-06 10:09:24 +02:00
Petr Gašparík
91875ec45f Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-10-06 10:06:06 +02:00
Leonwang4234
d8a06da79a Should Compile Now 2020-10-05 19:08:23 -07:00
Anuken
c87f0c27b3 Logic tweaks 2020-10-05 19:59:15 -04:00
genNAowl
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
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