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
|
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 |
|
slava0135
|
48da4933fc
|
comma
|
2020-09-30 18:52:59 +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
|
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 |
|
summetdev
|
111e50c3c6
|
Safe last fileChooser's directory to settings
|
2020-09-29 22:04:27 +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 |
|
Anuken
|
521ca1aea4
|
Fixed mechs not having animations on multiplayer
|
2020-09-29 10:57:06 -04: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
|
a5b1239c2b
|
Method renaming for consistency
|
2020-09-28 18:32:39 -04: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 |
|
Anuken
|
f1d09053f3
|
Fixed #2755 / Fixed #2753
|
2020-09-28 10:26:08 -04:00 |
|
Anuken
|
078a68a07d
|
Fixed cores being placeable on nothing
|
2020-09-27 23:00:38 -04:00 |
|
Anuken
|
482ec4b43c
|
Fixed #2752
|
2020-09-27 18:01:17 -04: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
|
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 |
|