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 |
|
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 |
|
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
|
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 |
|
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
|
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 |
|