mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-03-15 11:20:39 -07:00
Code Issues Projects Releases Wiki Activity
11738 commits 4 branches 180 tags 2.3 GiB
Commit graph

407 commits

Author SHA1 Message Date
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
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
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
Anuken
e248f44099 More bugfixes 2021-06-02 18:28:07 -04:00
Anuken
4cd411d5ee Duct consistency 2021-06-02 17:07:08 -04:00
Anuken
e9129e6f43 Unspoiled 2021-06-02 11:15:30 -04:00
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
buthed010203
be71664436
Lower surge tower schem priority (#5277) 
The priority of surge towers is now -15 (default for power nodes is -10). Schems with surge towers will often see them automatically connected to random buildings only a couple tiles away which are already in range of other nodes, the hope here is that this fixes that.
 2021-05-20 12:33:40 -04:00
MEEP of Faith
8d1a34b652
Include distance in foreshadow targetting (#5221) 
* Include distance in foreshadow targetting

* Divide by larger number
 2021-05-07 18:35:58 -04:00
buthed010203
019898dfc3
Turrets can properly replace eachother, cores can replace conveyors and minor cleanup. (#4841) 2021-03-03 09:15:50 -05:00
MEEP of Faith
7e216d198e
Remove duplicates and mild formatting. (#4837) 
* Remove duplicate definitions in UnitTypes

* If Tsunami is indented, so should the others

It looks nicer as well.
 2021-03-02 09:28:04 -05:00
Anuken
08e36aca98 Crafter progress modulo / Segment buff 2021-02-23 10:47:54 -05:00
Anuken
0d287e6d59 Water Extractor: Use metaglass to be consistent with pumps 2021-02-21 08:53:47 -05:00
Anuken
27c8efc672 Better targeting range calculation 2021-02-11 10:12:07 -05:00
Anuken
54c406f83d Cleanup 2021-02-09 18:28:11 -05:00
Leonid Skorospelov
f90f611a6d
plastanium-wall-large schematicPriority should also be 10 (#4613) 
plastanium-wall has it, makes sense to put for large one as well
 2021-02-07 09:14:19 -05:00
buthed010203
3c136ad0ba
add transportation group to container and vault (#4499) 
this allows for them to be placed over belts so that people no longer have to clear an area around the core when placing vaults around it.
 2021-02-02 15:32:52 -05:00
Patrick 'Quezler' Mounier
6969fbb1e7
Give tsunami the extinguisher flag as well (#4442) 2021-01-26 11:31:36 -05:00
Joshua Fan
8ca08a0f14
Make schematics build insulated blocks first, power nodes last (#4414) 
* Make schematics build insulated blocks first, power nodes last

* Add schematicPriority property to sort by

* Assign schematicPriority of 10 to power diode
 2021-01-23 10:28:26 -05:00
Anuken
770d8506c5 MoveLightning ability bullet support 2021-01-20 12:31:35 -05:00
Anuken
f64cb3ad9a Fixed #4385 2021-01-20 09:11:32 -05:00
Anuken
fa8d43bbc9 Misc cleanup 2021-01-19 19:55:21 -05:00
BlueWolf
8b9b11f77f
1mil source output (#4299) 2021-01-10 15:33:31 -05:00
Anuken
2f83ba7f5c Logic battery control + Slight swarmer range buff 2021-01-08 12:22:32 -05:00
Patrick 'Quezler' Mounier
e714d44a0e
Return large launchpad item costs (#4134) 
* Return large launchpad item costs

hidden -> debugonly

* Remove the 4 orange squares from the large launch pad

Leaving the lights and launchpod alignments alone since that is campaign only.
 2020-12-28 09:38:58 -05:00
Anuken
16778ea16c Fixed #4141 / Fixed #4136 2020-12-27 10:16:34 -05:00
Anuken
da96b23441 Higher power source output 2020-12-25 01:26:20 -05:00
Patrick 'Quezler' Mounier
9d740e1e37
Rebrand power infinite as power source (#4088) 2020-12-23 09:39:04 -05:00
Anuken
852013cd63 #4068 2020-12-21 20:48:00 -05:00