Commit Graph

1668 Commits

Author SHA1 Message Date
Anuken
6bbbd5ab01 Fixed disappearing blocks / Unit tech tree entries 2022-02-07 10:58:22 -05:00
Anuken
bf22b601f7 Slightly better core upgrade effect 2022-02-06 23:06:34 -05:00
Anuken
ce82b3943e No Erekir default AI / Core unit tweaks 2022-02-06 20:54:57 -05:00
Anuken
fce3cf818e Untested support for JSON planets 2022-02-06 12:47:23 -05:00
Anuken
5fd139261f Supression system improvements 2022-02-05 21:59:38 -05:00
Anuken
28b2d5d6f7 New WIP attack sectgor 2022-02-05 21:51:29 -05:00
Anuken
f02c1f6964 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2022-02-05 19:22:02 -05:00
Anuken
6c44f506fc More vent variants 2022-02-05 18:59:56 -05:00
Matthew (or Maya) Peng
6a053f2f45 Allow for same-size core upgrades (#6558) 2022-02-05 17:58:36 -05:00
Anuken
70aac1151c Fixed turbine condenser stats 2022-02-04 19:10:49 -05:00
Anuken
fa6ddd5f50 Conquer tank progress 2022-02-03 15:13:08 -05:00
Anuken
de96c8201d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2022-02-03 12:48:31 -05:00
Anuken
ae924e6e2b Merge remote-tracking branch 'origin/master' 2022-02-02 11:54:44 -05:00
Anuken
ca6723e696 Light RGB clamp + Arc update 2022-02-02 11:54:39 -05:00
Anuken
ac68edda40 Core launch capacity tweaks 2022-01-28 14:00:03 -05:00
Anuken
27bb848832 Generation tweaks 2022-01-28 11:00:00 -05:00
Anuken
e4595b6831 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/core/ContentLoader.java
	core/src/mindustry/world/Block.java
2022-01-27 14:58:44 -05:00
Anuken
7cdd9edb5f Fixed beam drills not contributing to production 2022-01-27 14:39:21 -05:00
Anuken
c1858b09d0 Fixed armored conduits not connecting to bridges 2022-01-26 14:51:06 -05:00
Anuken
f97d7edffb Loadout env fixes 2022-01-26 14:01:38 -05:00
Anuken
cd68b4b410 Generation tweaks 2022-01-25 16:16:25 -05:00
buthed010203
fa06d2c20b Fix broken powernode Point2[] config (#6531)
This was broken. I fixed it.
2022-01-25 10:38:38 -05:00
Anuken
a70b28ea12 Fixed BeamDrill draw rotation 2022-01-24 12:32:14 -05:00
Anuken
12766dda56 Bugfixes 2022-01-23 22:33:36 -05:00
Anuken
bfe893adfb Bugfixes & Onset items 2022-01-23 17:15:23 -05:00
Anuken
4497f7ab3a Proper interplanetary launch 2022-01-23 14:37:08 -05:00
Anuken
97da66cd44 New environment blocks 2022-01-22 13:33:16 -05:00
Anuken
f4701f6b8a Regen projector phase boost / Menu tweaks 2022-01-21 21:26:04 -05:00
Anuken
cfb01063c0 Misc map creation utilities 2022-01-21 16:32:35 -05:00
Anuken
025dac226c Fixed unit assembler overlap 2022-01-21 11:53:59 -05:00
Iloveidea
287dc35640 Update LiquidConverter.java (#6507) 2022-01-21 09:46:03 -05:00
Anuken
a121c4d042 Fixed square numbers in stats 2022-01-21 00:08:56 -05:00
Anuken
b3d4dc06d4 Misc 2022-01-20 23:06:04 -05:00
Anuken
9593765742 Removed WallOre class 2022-01-19 23:23:05 -05:00
Anuken
698e89e796 Editor fixes 2022-01-19 22:23:50 -05:00
Anuken
45178046d0 Crystal blocks 2022-01-19 21:24:02 -05:00
Anuken
cef3d383b7 Display liquid tooltips 2022-01-19 10:50:28 -05:00
Anuken
19ddc1dd65 WIP crystal biome 2022-01-18 20:35:43 -05:00
Anuken
f3811d6710 Ore renaming 2022-01-18 10:48:27 -05:00
Anuken
d1206d2e2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/world/blocks/defense/turrets/Turret.java
2022-01-17 15:44:09 -05:00
Anuken
b23ea8b965 WIP 'bulwark' unit 2022-01-16 16:26:21 -05:00
Anuken
93cfa243bc Fixed certain turrets working without ammo 2022-01-15 23:08:54 -05:00
Matthew (or Maya) Peng
795edb2494 Tractor Beam Suction multiplies by timescale twice (#6489) 2022-01-13 15:28:29 -05:00
Anuken
4385cb8a88 Drill message fix 2022-01-12 23:08:35 -05:00
Anuken
0f6f85887e Block regionRotated 2022-01-12 09:58:54 -05:00
Matthew (or Maya) Peng
43e857e810 Fix ammo of one item transforming into another. (#6483)
* Fix ammo transmutation

* Small fixes

* small fix 2

* a

* commit spam aeugh
2022-01-11 09:29:25 -05:00
Anuken
d09039f6e6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2022-01-10 23:43:18 -05:00
Matthew (or Maya) Peng
1d14fa78bf Make ItemEntry's item public (#6474) 2022-01-10 23:38:28 -05:00
Anuken
125994482e Minor polish 2022-01-10 22:52:22 -05:00
Anuken
10d8e63368 Multi-liquid sublimate 2022-01-10 14:01:30 -05:00