  AnukenandGitHub
|
6f4f0eef57
|
Merge pull request #2786 from Quezler/patch-46
Clarify stack conveyor recharge property
|
2020-10-01 08:42:11 -04:00 |
|
 Patrick 'Quezler' MounierandGitHub
|
ce463d225f
|
Clarify stack conveyor recharge property
(also, should be minimum & multiple of 1)
|
2020-10-01 11:54:58 +02:00 |
|
|
Anuken
|
b15cdfef46
|
sprites repacked
|
2020-09-30 22:37:32 -04:00 |
|
|
AnukenandGitHub
|
d3441f4ac9
|
Merge pull request #2781 from genNAowl/cryofluidmixer-cryofluid-mixer
change "cryofluidmixer" to "cryofluid-mixer"
|
2020-09-30 22:35:10 -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
|
781d9b3c38
|
Merge branch 'master' of https://github.com/Anuken/Mindustry
|
2020-09-30 16:42:10 -04:00 |
|
|
Anuken
|
1697fec311
|
Tsunami balancing
|
2020-09-30 16:40:45 -04:00 |
|
|
AnukenandGitHub
|
0b2c2c49b0
|
Anuken/Mindustry-Suggestions/issues/653
|
2020-09-30 15:12:38 -04:00 |
|
|
Anuken
|
27089f1057
|
Merge remote-tracking branch 'origin/master'
|
2020-09-30 15:01:50 -04:00 |
|
|
Anuken
|
d07c74b60f
|
Re-added tap event for servers
|
2020-09-30 15:01:46 -04:00 |
|
|
AnukenandGitHub
|
8dc610a091
|
Update CONTRIBUTING.md
|
2020-09-30 14:53:56 -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 |
|
|
AnukenandGitHub
|
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 |
|
|
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
|
f5e5f82d47
|
Merge remote-tracking branch 'origin/master'
|
2020-09-30 11:19:46 -04: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 |
|
|
AnukenandGitHub
|
b35fa21c79
|
Update gradle.yml
|
2020-09-30 11:13:17 -04:00 |
|
|
AnukenandGitHub
|
b38e7f66ad
|
Merge pull request #2770 from LeoDog896/autotiler
Autotiler docs and cleanup
|
2020-09-30 10:49:42 -04:00 |
|
|
AnukenandGitHub
|
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 |
|
|
AnukenandGitHub
|
957e06470d
|
Merge pull request #2768 from LeoDog896/master
Remove unused package
|
2020-09-30 09:43:12 -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 |
|
|
LeoDog896
|
a8c6c30382
|
Remove unused package
|
2020-09-30 08:41:33 -04: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 |
|
|
AnukenandGitHub
|
0e2f62f8b4
|
Merge pull request #2765 from summetdev/file-chooser-default
Save last FileChooser's directory to settings.
|
2020-09-29 17:29:34 -04:00 |
|