Commit Graph

281 Commits

Author SHA1 Message Date
Anuken
d06449f311 space 2020-10-08 14:06:07 -04:00
Anuken
3ec243a49b Fixed #2866 2020-10-08 09:15:33 -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
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
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
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
326640d32a Cleanup 2020-09-30 17:21:05 -04:00
Anuken
1697fec311 Tsunami balancing 2020-09-30 16:40:45 -04: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
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
ccdd94a090 Build check cleanup 2020-09-25 20:15:00 -04:00
Anuken
292793daf1 Fixed #2722 2020-09-25 09:50:38 -04: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
slava0135
3e81d194cb New liquid turret - Tsunami 2020-09-25 11:49:04 +03:00
Anuken
1682e3b996 Fixed #2714 2020-09-24 14:26:24 -04:00
Anuken
0a07458186 Power-based ammo / Refactoring / IP kicks / Fixes 2020-09-24 13:05:39 -04:00
Anuken
0288cb34fb Cleanup 2020-09-23 22:15:14 -04:00
Anuken
ada664a2ca Fixed #2690 2020-09-23 21:46:40 -04:00
Anuken
1cc8d7e3f4 Balance 2020-09-23 15:21:06 -04:00
Anuken
6b43697891 (2) 2020-09-22 23:32:34 -04:00
Leonwang4234
e00b50c1f1 rotatespeed > rotateSpeed 2020-09-22 18:25:05 -07:00
Anuken
87032c82b1 T4/5 support mechs 2020-09-21 23:32:30 -04:00
Anuken
1aa8bb9dd2 T5 air support unit 2020-09-21 11:41:11 -04:00
Anuken
cdd1e90d1a Fixed #2622 2020-09-19 17:35:32 -04:00
Anuken
0bcb48ca31 Costs for unit research 2020-09-19 14:11:48 -04:00
Anuken
f53af781ba T4/5 naval / Controversial weapon outlines 2020-09-18 18:54:09 -04:00
Anuken
c71be9ae32 Mud 2020-09-18 00:13:08 -04:00
Anuken
030542890e Bugfixes 2020-09-16 16:04:11 -04:00
Anuken
5c98512e4f Bugfixes 2020-09-16 14:53:44 -04:00
Anuken
b3d7515dcd Line optimization & cleanup 2020-09-15 13:19:02 -04:00
Anuken
50816deb9e Smarter payload routers / 2x display / Campaign tweaks 2020-09-14 14:09:15 -04:00
Anuken
7ce93c7f85 Prototype health/ammo indication 2020-09-13 21:08:24 -04:00
Anuken
f3921e3dcc Minor optimization 2020-09-13 14:30:31 -04:00
Anuken
27e9b5aeb9 Removed cliffs / Nerfed explosion bombing 2020-09-13 12:13:42 -04:00
Anuken
4d6c8ade98 Bugfixes 2020-09-12 23:41:25 -04:00