 Anuken
|
d06449f311
|
space
|
2020-10-08 14:06:07 -04:00 |
|
|
Anuken
|
3ec243a49b
|
Fixed #2866
|
2020-10-08 09:15:33 -04:00 |
|
|
Anuken
|
773e4c7053
|
Unified command
|
2020-10-07 16:37:48 -04:00 |
|
|
Anuken
|
be66a15287
|
Extra mod field parsing (untested)
|
2020-10-07 11:00:02 -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 |
|
  genNAowlandGitHub
|
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
|
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
|
605a370679
|
Fixed turrets firing without power as players
|
2020-10-04 09:58:53 -04:00 |
|
|
Anuken
|
b561b38b56
|
Fixed #2824
|
2020-10-03 19:07:16 -04:00 |
|
|
Anuken
|
06f9aa5f84
|
things
|
2020-10-03 15:35:26 -04:00 |
|
|
Anuken
|
35af71c613
|
Moved Nullable to utils package
|
2020-10-02 23:11:26 -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
|
215cfaa42f
|
Fixed #2793
|
2020-10-01 16:03:13 -04:00 |
|
|
Anuken
|
4074a241d2
|
Cleanup
|
2020-10-01 14:07:33 -04:00 |
|
|
Anuken
|
085bc2ee9c
|
campaign progress
|
2020-10-01 11:19:42 -04: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
|
326640d32a
|
Cleanup
|
2020-09-30 17:21:05 -04:00 |
|
|
Anuken
|
1697fec311
|
Tsunami balancing
|
2020-09-30 16:40:45 -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
|
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 |
|
|
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
|
2b2a12267a
|
Long-range 4x4 turret (wip) / Java 14 language upgrade
|
2020-09-29 23:55:55 -04: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
|
5523ea4752
|
Slag light
|
2020-09-28 19:37:18 -04:00 |
|
|
Anuken
|
078a68a07d
|
Fixed cores being placeable on nothing
|
2020-09-27 23:00:38 -04:00 |
|
|
Anuken
|
3bf01334c9
|
Many things
|
2020-09-27 17:15:31 -04:00 |
|
|
Anuken
|
0f420b625a
|
Fixed #2737
|
2020-09-26 11:59:14 -04:00 |
|
|
Anuken
|
ccdd94a090
|
Build check cleanup
|
2020-09-25 20:15:00 -04:00 |
|
|
Anuken
|
dc30993898
|
Fixed #2729
|
2020-09-25 18:49:31 -04:00 |
|
|
Anuken
|
292793daf1
|
Fixed #2722
|
2020-09-25 09:50:38 -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 |
|
 
|
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 |
|
|
slava0135
|
3e81d194cb
|
New liquid turret - Tsunami
|
2020-09-25 11:49:04 +03:00 |
|
|
Anuken
|
3a06cacf1d
|
Minor fixes
|
2020-09-24 22:41:13 -04:00 |
|