Commit Graph

433 Commits

Author SHA1 Message Date
Anuken
f98622fdc9 Class renaming 2021-07-23 13:18:08 -04:00
Anuken
ed1d02d2c2 Payload loader/unloader progress 2021-07-22 21:07:36 -04:00
Anuken
bda461e480 Large constructor variant 2021-07-22 17:48:50 -04:00
Anuken
d30c32eddc reorganization 2021-07-22 16:52:05 -04:00
Anuken
103f24d41d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/world/blocks/environment/Floor.java
	core/src/mindustry/world/blocks/payloads/Payload.java
	gradle.properties
2021-07-15 09:13:35 -04:00
Anuken
dd5389c738 New sound for rock/plant breaking 2021-07-14 17:22:21 -04:00
Anuken
ac25e17286 Unused property cleanup 2021-07-14 16:06:03 -04:00
Anuken
1baa82a7c6 Mostly-complete cliff crusher implementation 2021-07-08 16:16:44 -04:00
Anuken
a0c5ed3761 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	gradle.properties
2021-07-08 09:29:36 -04:00
Anuken
64ab8328b8 WallCrafter progress 2021-07-07 16:28:33 -04:00
Anuken
017552f573 Fixed crash caused by invalid NinePatch sprites 2021-07-06 15:23:37 -04:00
Anuken
a7d465439b Decorations no longer depend on color 2021-07-05 09:47:19 -04:00
Anuken
ebf0c71db6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/mod/ClassMap.java
2021-07-04 09:52:57 -04:00
Anuken
6afb976a44 Payload deconstructor sprite 2021-07-01 17:53:26 -04:00
Anuken
ec59cb602c Crash fix / tilesSecond speed unit 2021-07-01 11:17:42 -04:00
Anuken
3ea3df5c73 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	gradle.properties
2021-06-28 18:57:27 -04:00
Anuken
2eb57ab680 Minor repair turret nerf 2021-06-28 18:57:13 -04:00
Anuken
a5c44e7998 #5055 2021-06-28 10:50:04 -04:00
Anuken
082c17da85 Fixed #5498 2021-06-28 09:25:38 -04:00
Anuken
bdff6f9560 Repair turret nerf 2021-06-27 09:34:54 -04:00
Anuken
eaeb67b91f Fixed #5474 2021-06-25 19:35:34 -04:00
Anuken
5af6e8c5de Preparations for 127 pre-alpha release 2021-06-24 17:25:08 -04:00
Anuken
d54b7dc396 WIP payload deconstructor 2021-06-24 12:35:44 -04:00
Anuken
d4b6073c01 Name cleanup 2021-06-22 16:52:48 -04:00
Anuken
afec6181c4 More stone blocks 2021-06-21 20:52:49 -04:00
Anuken
ff3940865e A. 2021-06-21 19:35:00 -04:00
Anuken
4a88f64fa9 Asteroid ores (1) 2021-06-20 21:02:31 -04:00
Anuken
448d1e2c77 Cleanup 2021-06-20 09:50:25 -04:00
Anuken
3c65a26d72 New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
Anuken
5d8f6d7c97 More environmental support 2021-06-18 09:31:28 -04:00
Anuken
016e5ab97e Env rules for many various blocks 2021-06-17 11:08:01 -04:00
Anuken
eed91eaaa0 # Conflicts:
#	core/src/mindustry/mod/ClassMap.java
2021-06-15 19:29:12 -04:00
Anuken
347b38ba26 Added unit tests for Java, JavaScript and JSON mods 2021-06-12 20:59:28 -04:00
Anuken
3d76609f42 . 2021-06-12 14:09:24 -04:00
Anuken
9a8c9dff17 Red ice 2021-06-12 10:54:58 -04:00
Anuken
9e8e0709b5 Merge 2021-06-10 18:51:49 -04:00
VozDuh
a0acf1a040 Melter & Pulverizer Fixed (#5098)
Co-authored-by: Anuken <arnukren@gmail.com>
2021-06-10 16:01:04 -04:00
Anuken
e4bd3fab7c Removed MetalFloor class 2021-06-10 15:39:43 -04:00
Anuken
1ce6772601 Merge 2021-06-09 17:15:22 -04:00
Anuken
8c32c00e2b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/content/Blocks.java
2021-06-09 17:10:49 -04:00
Anuken
6f609aa4ee ConsumeCoolant 2021-06-09 14:38:49 -04:00
Anuken
b04c04f69f New metal floor / Selective floor attribute stats 2021-06-09 13:26:01 -04:00
Anuken
95da46bfa2 Duct bridge input display 2021-06-08 11:49:55 -04:00
Anuken
685adeee9d Minor salvo buff 2021-06-05 22:54:37 -04:00
Anuken
974ebe6937 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/content/Blocks.java
2021-06-05 11:57:14 -04:00
Anuken
89fdda0ef6 Various minor bugfixes 2021-06-04 10:57:15 -04:00
Anuken
8fc61215a5 Show ducts 2021-06-03 21:37:58 -04:00
Anuken
c674b5c256 Merge remote-tracking branch 'origin/master' 2021-06-03 15:59:39 -04:00
Anuken
1c4184db4b Less respawn rubberbanding 2021-06-03 15:59:22 -04:00
QmelZ
0247301272 Custom Mass Driver Bullets (#5300)
* custom mass driver bullets

* ohno

* should be fixed now
2021-06-03 14:41:08 -04:00