mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-21 17:58:21 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,203 Commits 4 Branches 160 Tags 2.3 GiB
0ee8c2362f
Commit Graph

7850 Commits

Author SHA1 Message Date
Patrick 'Quezler' Mounier
eaf7a86bce
Make deconstructing scrap walls return scrap 2020-10-11 13:54:28 +02:00
MEEP of Faith
5600f96a37 Make the sound pitch not random. 2020-10-10 18:03:53 -07:00
Anuken
bcb248907c Campaign core item incineration + better idle gen 2020-10-10 19:02:47 -04:00
Anuken
ab772d4901 fewer destruction turns 2020-10-10 17:31:16 -04:00
Anuken
7bcecea539 Merge remote-tracking branch 'origin/master' 2020-10-10 17:09:22 -04:00
Anuken
4d889cd8d1 Weather fixes 2020-10-10 17:09:19 -04:00
Anuken
a3e42b28bd
Merge pull request #2821 from summetdev/schems-description 
Descriptions for schematics.
 2020-10-10 16:22:00 -04:00
Anuken
c2202a0173 Bugfixes 2020-10-10 15:50:03 -04:00
Anuken
316e6e298c Fixed #2896 2020-10-10 14:55:21 -04:00
Anuken
8482221c83 . 2020-10-10 14:47:59 -04:00
summetdev
d94fdfa50f don't show desc at schem save 2020-10-10 20:28:43 +03:00
Anuken
2079a91ac6 Merge remote-tracking branch 'origin/master' 2020-10-10 13:16:03 -04:00
Anuken
d61ad8d2ef Fixed #2895 2020-10-10 13:15:59 -04:00
Patrick 'Quezler' Mounier
f2bd4bf38c
Who needs two pairs of legs? 2020-10-10 18:35:00 +02:00
Anuken
837a8cecb3 Wave balancing & other tweaks 2020-10-10 12:26:57 -04:00
Anuken
3f74c61c0a Map center button 2020-10-10 12:05:11 -04:00
Anuken
63bf066cff Merge remote-tracking branch 'origin/master' 2020-10-10 11:38:05 -04:00
Anuken
fb831e8fef Better cliff sprites 2020-10-10 11:37:58 -04:00
Pietro303HD
2e4cbdcc05
Update bundle_pt_BR.properties 2020-10-10 09:51:23 -03:00
DeltaNedas
4b9659d4fa thank you quezler 2020-10-10 12:23:08 +01:00
DeltaNedas
fd71e159d3 make storageblock instantiable 2020-10-10 11:16:04 +01:00
Anuken
5a31d419fc Bugfixes 2020-10-09 19:10:16 -04:00
Summet
be1cc21ff5
Протекает меньше -> Не протекает (#21) 2020-10-10 01:04:31 +03:00
Anuken
7639f8102f Bugfixes 2020-10-09 15:34:25 -04:00
Anuken
7da400608c Bugfixes 2020-10-09 15:18:13 -04:00
Anuken
81633dace4 Merge remote-tracking branch 'origin/master' 2020-10-09 13:52:15 -04:00
Anuken
c78088ab5f Harder default waves 2020-10-09 13:52:07 -04:00
Patrick 'Quezler' Mounier
d776744905
Update leak behaviour in plated conduit description 2020-10-09 19:11:56 +02:00
Anuken
96656bac6b Bugfixes 2020-10-09 12:59:59 -04:00
Anuken
99539bbab0 Merge remote-tracking branch 'origin/master' 2020-10-09 10:02:12 -04:00
Anuken
22f1c3b2d1 Bugfixes 2020-10-09 10:02:08 -04:00
Anuken
1d34b8474b
Merge pull request #2877 from genNAowl/pierce-cap 
Adds a Pierce Cap Variable
 2020-10-09 09:59:53 -04:00
Patrick 'Quezler' Mounier
ae9093bfd6
Update ArmoredConduit.java 2020-10-09 10:10:50 +02:00
Patrick 'Quezler' Mounier
f3473e78b4
Update Conduit.java 2020-10-09 10:10:34 +02:00
Patrick 'Quezler' Mounier
1672c70c99
Update BuildingComp.java 2020-10-09 10:07:56 +02:00
Sunny Kim
30a5c6631b
consistency 2020-10-09 15:50:27 +09:00
Leonwang4234
e73a813d69 prevent from breaking other things 2020-10-08 19:27:01 -07:00
Leonwang4234
af5fd4551c true it is 2020-10-08 19:18:53 -07:00
Leonwang4234
0eb0f34908 add pierceCap 2020-10-08 19:14:05 -07:00
Anuken
e2b58528d0 New waves for sectors, quite possibly broken 2020-10-08 19:33:54 -04:00
Anuken
0a0af9c291 Random derelicts in sectors 2020-10-08 19:11:20 -04:00
Felix Corvus
fcb027f3e5
Космос ✨ 2020-10-09 00:56:42 +03:00
Anuken
2d70e00193 getChild -> remove 2020-10-08 15:15:47 -04:00
Anuken
c7f1204119 space 2020-10-08 15:14:28 -04:00
Anuken
2c905cdbf1 Merge branch 'space' 2020-10-08 14:47:41 -04:00
Anuken
f14d631ff9 Internal changes for surface-less floors 2020-10-08 14:44:02 -04:00
Anuken
6aa1144429 Hot rock + basalt generation for sectors 2020-10-08 14:37:51 -04:00
Anuken
d06449f311 space 2020-10-08 14:06:07 -04:00
Anuken
e05ac5ae41 Cleanup 2020-10-08 13:08:49 -04:00
Anuken
eb0ab3b3e5 Fixed #2870 2020-10-08 12:59:57 -04:00
Anuken
ac496a60b7 More tests 2020-10-08 09:22:42 -04:00
Anuken
3ec243a49b Fixed #2866 2020-10-08 09:15:33 -04:00
Sunny Kim
a698258b67
Update bundle_ko.properties 
some stuff, unit shield(방어막) vs force field(보호막) distinction and more
 2020-10-08 19:17:30 +09:00
MEEP of Faith
f93b80dd36 thx 2020-10-07 21:24:32 -07:00
MEEP of Faith
4317cad110 Since my Gradle is broken or something, I'll be relying on Travis until I get it fixed. 2020-10-07 19:07:01 -07:00
MEEP of Faith
3d4ace6ca8
If units can have chargeSound, why not chargeTurrets too? 2020-10-07 18:24:30 -07:00
Anuken
773e4c7053 Unified command 2020-10-07 16:37:48 -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
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
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
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
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
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
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
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
Gdeft
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
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
MEEP of Faith
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
Anuken
a3224b7082 Improved replacement system 2020-10-02 11:14:18 -04:00
Anuken
138434d029 Fixed #2799 / Fixed #2797 2020-10-02 09:54:08 -04:00
老滑稽
04b03b0749
Update bundle_zh_CN.properties 2020-10-02 08:19:31 +08:00
Anuken
215cfaa42f Fixed #2793 2020-10-01 16:03:13 -04:00
Anuken
68c41774e4 More contrast for specific colors 2020-10-01 14:22:48 -04:00
Anuken
4074a241d2 Cleanup 2020-10-01 14:07:33 -04:00
Anuken
c1970b4da5 Merge branch 'campaign' 
# Conflicts:
#	core/src/mindustry/world/consumers/ConsumeItemFilter.java
 2020-10-01 13:37:25 -04:00
Anuken
1170880127 Merge remote-tracking branch 'origin/master' 2020-10-01 13:33:55 -04:00
Anuken
199be4d13d Implicit non-nullability for fields 2020-10-01 13:33:43 -04:00
Anuken
085bc2ee9c campaign progress 2020-10-01 11:19:42 -04:00
老滑稽
b7b2da6bbd
Update bundle_zh_CN.properties 2020-10-01 21:01:30 +08:00
Anuken
2604a2d649
Merge pull request #2783 from Quezler/patch-45 
Move cryofluid mixer emoji back to the old number
 2020-10-01 08:56:28 -04:00
Vanguard
65a0bd9a63
2 lines changed; 1 line added 
Changed:
unit.vela.name
block.foreshadow.name

Added:
block.tsunami.name
 2020-10-01 14:47:56 +03:00
Patrick 'Quezler' Mounier
ce463d225f
Clarify stack conveyor recharge property 
(also, should be minimum & multiple of 1)
 2020-10-01 11:54:58 +02:00
Patrick 'Quezler' Mounier
8e4d00d594
Move cryofluid mixer emoji back to the old number 2020-10-01 11:03:59 +02:00
Anuken
4264b960cd Merge branch 'master' of https://github.com/Anuken/Mindustry into campaign 2020-09-30 22:46:33 -04:00
Anuken
b15cdfef46 sprites repacked 2020-09-30 22:37:32 -04:00
Anuken
54c991e611 Removed outOfTime pause 2020-09-30 22:25:28 -04:00
Leonwang4234
87b21c052f Update SaveFileReader.java 
fix
 2020-09-30 18:29:58 -07:00
Leonwang4234
9601c81045 change sprite name 2020-09-30 18:05:43 -07:00
Leonwang4234
14156c1ce7 "cryofluidmixer" to "cryofluid-mixer"fl 2020-09-30 17:54:50 -07:00
Anuken
f3c642d0d7 Fixed #2779 2020-09-30 19:55:22 -04:00
Anuken
a0394e4382 Balance 2020-09-30 18:56:37 -04:00
Anuken
7eb0da82de Added enemy lights setting 2020-09-30 17:44:13 -04:00
Anuken
326640d32a Cleanup 2020-09-30 17:21:05 -04:00
Anuken
1697fec311 Tsunami balancing 2020-09-30 16:40:45 -04:00
Anuken
d07c74b60f Re-added tap event for servers 2020-09-30 15:01:46 -04:00
Anuken
059c729a2c Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-30 14:50:09 -04:00
Anuken
03d676403f Cleanup 2020-09-30 14:50:05 -04:00
slava0135
feb8202b73 better stats... 2020-09-30 21:17:44 +03:00
slava0135
65607ba6bf better stats 2020-09-30 21:13:14 +03:00
slava0135
a806d7c019 Fun fact: 1.0 is smaller than 10 2020-09-30 20:41:56 +03:00
slava0135
aa5b3aa756 balancing 2020-09-30 20:30:04 +03:00
Anuken
6645e3a473
Merge pull request #2772 from LeoDog896/pathfinder 
Remove nearGround in favor of !nearLiquid
 2020-09-30 12:59:55 -04:00
LeoDog896
f2fd23dced can be nearGround AND nearLiquid 2020-09-30 12:56:59 -04:00
LeoDog896
49db761730 Revert "remove nearGround in favor of !nearLiquid" 
This reverts commit 8751e77876.
 2020-09-30 12:56:43 -04:00
Anuken
d2728c2bf0 Fixed #2774 2020-09-30 12:45:01 -04:00
YellOw139
09934d9e12
Foreshadow 2020-09-30 19:15:52 +03:00
slava0135
48da4933fc comma 2020-09-30 18:52:59 +03:00
slava0135
07cdbfa423 New turret sprite by EyeOfDarkness 2020-09-30 18:47:56 +03:00
Anuken
0963de4022 Cleanup 2020-09-30 11:19:38 -04:00
LeoDog896
8751e77876 remove nearGround in favor of !nearLiquid 2020-09-30 11:15:11 -04:00
Anuken
b38e7f66ad
Merge pull request #2770 from LeoDog896/autotiler 
Autotiler docs and cleanup
 2020-09-30 10:49:42 -04:00
Anuken
ba53d76d8d
Merge pull request #2769 from Voz-Duh/packed-liquid-drawer 
Packed Liquid Drawer
 2020-09-30 10:46:45 -04:00
slava0135
58ff3f2ef7 Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 2020-09-30 17:18:20 +03:00
LeoDog896
6db2376835 Revert to if-statement 2020-09-30 09:47:03 -04:00
LeoDog896
2b04ebb14d Enum follows camelCase rules 2020-09-30 09:46:33 -04:00
LeoDog896
fbb317aa11 Update contributors 2020-09-30 09:30:12 -04:00
LeoDog896
1c04653ffd Autotiler cleanup and documentation 2020-09-30 09:29:57 -04:00
Voz-Duh
91274ae104 Fix 2020-09-30 16:19:32 +03:00
Voz-Duh
adf0f60abb Fix 2020-09-30 16:08:32 +03:00
Voz-Duh
20e56ed3d3 Packed Liquid Drawer 2020-09-30 15:58:11 +03:00
LeoDog896
177aa934b6 Merge remote-tracking branch 'upstream/master' 2020-09-30 08:43:08 -04:00
Felix Corvus
aeaa5ac6e2
some trick 2020-09-30 15:42:07 +03:00
LeoDog896
a8c6c30382 Remove unused package 2020-09-30 08:41:33 -04:00
Felix Corvus
54d4f733ef
Update bundle_ru.properties 2020-09-30 14:35:52 +03:00
Felix Corvus
75d8f93dd9
Update bundle_ru.properties 2020-09-30 14:07:06 +03:00
Felix Corvus
3660f22d96
*Предвестник* 
А потом из ру комьюнити приходят люди и спрашивают, почему **переводчики** испортили игру
 2020-09-30 13:52:09 +03:00
slava0135
d4402ee3bb Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	core/assets/sprites/fallback/sprites3.png
	core/assets/sprites/fallback/sprites4.png
	core/assets/sprites/fallback/sprites5.png
	core/assets/sprites/fallback/sprites7.png
	core/assets/sprites/fallback/sprites8.png
	core/assets/sprites/sprites.atlas
	core/assets/sprites/sprites.png
	core/assets/sprites/sprites2.png
	core/assets/sprites/sprites4.png
	core/assets/sprites/sprites5.png
	core/src/mindustry/content/Blocks.java
 2020-09-30 09:48:18 +03:00
Anuken
3c3c15dcf4 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-29 23:55:59 -04:00
Anuken
2b2a12267a Long-range 4x4 turret (wip) / Java 14 language upgrade 2020-09-29 23:55:55 -04:00
Thomas Widyantoko
d86813bbb3
Merge branch 'master' into patch-1 2020-09-30 07:12:28 +07:00
summetdev
111e50c3c6 Safe last fileChooser's directory to settings 2020-09-29 22:04:27 +03:00
slava0135
fb53abe593 Final? design 2020-09-29 21:27:41 +03:00
slava0135
83a20810f7 recolor 2020-09-29 21:02:29 +03:00
slava0135
e5dc481d00 new texture 2020-09-29 20:40:09 +03:00
Anuken
c3274622b2 Fixed #2763 2020-09-29 11:53:45 -04:00
slava0135
d4441711a7 balance and size 2020-09-29 18:35:34 +03:00
slava0135
cbc2205347 Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 
 Conflicts:
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	core/assets/sprites/fallback/sprites.png
	core/assets/sprites/fallback/sprites2.png
	core/assets/sprites/fallback/sprites3.png
	core/assets/sprites/fallback/sprites4.png
	core/assets/sprites/fallback/sprites5.png
	core/assets/sprites/fallback/sprites7.png
	core/assets/sprites/fallback/sprites8.png
	core/assets/sprites/sprites.atlas
	core/assets/sprites/sprites.png
	core/assets/sprites/sprites2.png
	core/assets/sprites/sprites4.png
	core/assets/sprites/sprites5.png
 2020-09-29 18:31:42 +03:00
Petr Gašparík
1d0d06164b Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-09-29 17:28:26 +02:00
Anuken
521ca1aea4 Fixed mechs not having animations on multiplayer 2020-09-29 10:57:06 -04:00
Petr Gašparík
de459df26b Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-09-29 13:43:13 +02:00
Anuken
5523ea4752 Slag light 2020-09-28 19:37:18 -04:00
Anuken
c89d6f6b74 Re-packed sprites from PR 2020-09-28 18:42:09 -04:00
Anuken
d3863a7550 Merge remote-tracking branch 'origin/master' 2020-09-28 18:32:48 -04:00
Anuken
a5b1239c2b Method renaming for consistency 2020-09-28 18:32:39 -04:00
Anuken
95146e032f
Merge pull request #2757 from Voz-Duh/cleaner-sprites 
Cleaner Sprites
 2020-09-28 17:34:40 -04:00
Voz-Duh
45e1700237 Fix 2020-09-28 21:58:37 +03:00
Voz-Duh
81ceec8d03 Fix 2020-09-28 21:47:42 +03:00
Anuken
6a45a965c0 Allow unloading non-visible blocks 2020-09-28 12:42:20 -04:00
Anuken
231902aec5 Fixed #2756 2020-09-28 11:02:53 -04:00
Voz-Duh
aef09a18b7 Fix 2020-09-28 17:38:11 +03:00
Voz-Duh
332365adc6 Fix 2020-09-28 17:36:35 +03:00
Voz-Duh
2c3813c94b Cleaner Sprites 2020-09-28 17:34:05 +03:00
Anuken
f1d09053f3 Fixed #2755 / Fixed #2753 2020-09-28 10:26:08 -04:00
Petr Gašparík
250150a30c Czech cleanup 2020-09-28 10:24:50 +02:00
Petr Gašparík
27b1954fbf Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-09-28 10:20:58 +02:00
Anuken
078a68a07d Fixed cores being placeable on nothing 2020-09-27 23:00:38 -04:00
Petr Gašparík
8ce6520fca Czech translation . update up to commit 9e0b29b 2020-09-28 00:03:51 +02:00
Anuken
482ec4b43c Fixed #2752 2020-09-27 18:01:17 -04:00
Petr Gašparík
53b556941c Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-09-27 23:50:48 +02:00
Anuken
3bf01334c9 Many things 2020-09-27 17:15:31 -04:00
Anuken
ff84d72e20 Cleaner wall sprites 2020-09-27 00:43:00 -04:00
Anuken
f46180298f Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-26 22:32:17 -04:00
Anuken
ae46535365 Sprite cleanup 2020-09-26 22:31:49 -04:00
Anuken
0c7ce94b13 Sprite cleanup 2020-09-26 22:29:15 -04:00
Anuken
fea8a3c12b
Merge pull request #2718 from MEEPofFaith/patch-2 
Make lightning have frag angle properties
 2020-09-26 22:27:26 -04:00
Anuken
285f733b61
Merge pull request #2725 from LeoDog896/master 
More sort and target options
 2020-09-26 22:27:05 -04:00
Anuken
7b98628084 Unbroke wave sprite 2020-09-26 22:20:02 -04:00
Anuken
f4b6600a6d
Merge pull request #2738 from Voz-Duh/top-for-liquid-turrets 
Top For Liquid Turrets
 2020-09-26 20:16:38 -04:00
Anuken
9edd029764 Fixed #2740 2020-09-26 14:38:16 -04:00
Voz-Duh
55081785d0 Fix 2020-09-26 21:24:47 +03:00
Voz-Duh
79aaec80c3 Fix 2020-09-26 20:45:15 +03:00
Voz-Duh
a72b1463b4 Fix 2020-09-26 20:40:09 +03:00
Voz-Duh
18604a397d Top For Liquid Turrets 2020-09-26 19:11:55 +03:00
Anuken
0f420b625a Fixed #2737 2020-09-26 11:59:14 -04:00
Anuken
d4d3b71d7d Fixed #2735 2020-09-26 09:46:16 -04:00
Anuken
ccdd94a090 Build check cleanup 2020-09-25 20:15:00 -04:00
Anuken
c49b3124d5 Merge remote-tracking branch 'origin/master' 2020-09-25 18:49:36 -04:00
Anuken
dc30993898 Fixed #2729 2020-09-25 18:49:31 -04:00
Anuken
47d734873b
Merge pull request #2727 from LeoDog896/drown 
Drown event
 2020-09-25 16:27:21 -04:00
LeoDog896
1d52211f93
Update core/src/mindustry/entities/comp/FlyingComp.java 
Co-authored-by: Summet <summet.dev@gmail.com>
 2020-09-25 14:21:48 -04:00
Anuken
059b72b3e2 Merge remote-tracking branch 'origin/master' 2020-09-25 14:21:34 -04:00
Anuken
2cc93924f1 Support for Android java mods 2020-09-25 14:21:30 -04:00
LeoDog896
53d4124fc3 Use reportIssueUrl 2020-09-25 12:26:04 -04:00
LeoDog896
c912eb197b Drown event 
we all need to know when they drown
 2020-09-25 12:01:59 -04:00
LeoDog896
35e4f696aa Merge remote-tracking branch 'upstream/master' 2020-09-25 10:55:04 -04:00
Anuken
85d32cd510
Merge pull request #2726 from Voz-Duh/shadow-fix 
Shadow Fix
 2020-09-25 09:53:13 -04:00
Anuken
292793daf1 Fixed #2722 2020-09-25 09:50:38 -04:00
Voz-Duh
41b4cbbce2 Shadow Fix 2020-09-25 15:18:06 +03:00
LeoDog896
6492ffd35d More sort and target options 2020-09-25 07:58:44 -04:00
slava0135
79f4608e81 Merge remote-tracking branch 'origin/tsunami' into tsunami 2020-09-25 14:22:13 +03:00
slava0135
9050cac19c added to tech tree 2020-09-25 14:21:52 +03:00
Prosta4okua
52a610a957
Update bundle_uk_UA.properties 2020-09-25 14:13:06 +03:00
Prosta4okua
13ff69cbca
Update bundle_uk_UA.properties 2020-09-25 14:10:55 +03:00
Slava0135
79ac9894b3
Update core/src/mindustry/content/Blocks.java 
s p a c e

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
 2020-09-25 12:58:28 +03:00