150 Commits

Author	SHA1	Message	Date
Anuken	b19691078f	a	2021-10-24 15:14:43 -04:00
Anuken	d3343c0ae9	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/src/mindustry/content/Planets.java tools/src/mindustry/tools/Generators.java	2021-10-20 10:45:51 -04:00
Anuken	a72adef051	Fixed off-tinted cells	2021-10-17 16:03:05 -04:00
Anuken	5f3cef251b	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/assets/logicids.dat core/src/mindustry/content/Blocks.java gradle.properties	2021-09-28 18:45:09 -04:00
Anuken	2d2052e39f	"ok"	2021-09-27 11:00:33 -04:00
Anuken	dddb282ce3	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/src/mindustry/content/Blocks.java	2021-09-04 12:26:07 -04:00
Anuken	cc689fd114	Fixed #5895	2021-08-29 10:26:39 -04:00
Anuken	26dd7e00eb	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/src/mindustry/content/UnitTypes.java	2021-08-25 09:22:23 -04:00
Anuken	8143cb7be0	Unit balancing	2021-08-24 12:10:44 -04:00
Anuken	dd8279bab3	Crawl progress	2021-08-22 20:25:46 -04:00
Anuken	b2aaca45d5	progress	2021-08-21 18:35:27 -04:00
Anuken	7afc6d3631	CrawlComp progress	2021-08-21 15:32:25 -04:00
Anuken	a39f2bd3a9	wip	2021-08-19 17:46:10 -04:00
Anuken	28b235ef07	Partial 7.0 merge - API preview	2021-06-02 11:08:08 -04:00
MEEP of Faith	e8e23961f4	why toxopid cannon not in weapons folder (#5166)	2021-04-29 14:15:55 -04:00
MEEP of Faith	56b8986a0b	Unit Sprite Heresyn't (#5084)	2021-04-08 15:56:22 -04:00
Anuken	fa8d43bbc9	Misc cleanup	2021-01-19 19:55:21 -05:00
MEEP of Faith	659be11b7d	Remove extra omura cannon image. ... It has the `-heat` prefix, so the game is using this instead of its actual heat sprite to draw heat.	2020-11-13 19:00:21 -08:00
Anuken	a9756aefad	Cleanup of weapon stats	2020-11-13 14:42:46 -05:00
Anuken	d4d3b71d7d	Fixed #2735	2020-09-26 09:46:16 -04:00
Anuken	a6c10a97f2	Fixed #2654 / Fixed #2651 / fine I'll add a base	2020-09-22 10:03:05 -04:00
Anuken	87032c82b1	T4/5 support mechs	2020-09-21 23:32:30 -04:00
Anuken	ff58ccf659	Sprite tweaks	2020-09-21 13:22:07 -04:00
Anuken	1aa8bb9dd2	T5 air support unit	2020-09-21 11:41:11 -04:00
Anuken	63e35bd462	T4 air carrier unit (*unfinished*)	2020-09-20 19:34:12 -04:00
Anuken	8a99a89f57	how many times do I neet to press refresh before IntelliJ sees the files that were there all along	2020-09-18 21:19:26 -04:00
Anuken	8dd1c5f1f8	hhhhh	2020-09-18 18:56:01 -04:00
Anuken	f53af781ba	T4/5 naval / Controversial weapon outlines	2020-09-18 18:54:09 -04:00
Anuken	f242a2b2cd	Fixed #2585	2020-09-17 22:25:56 -04:00
Anuken	ea224bd1f1	many things	2020-09-17 21:05:16 -04:00
Anuken	8901838c19	Fixed #2551	2020-09-14 09:41:54 -04:00
Anuken	8234f31e83	Various tweaks	2020-09-12 21:41:43 -04:00
Anuken	d9a067b4d2	Small sprite tweaks & bugfixes	2020-09-08 21:40:50 -04:00
Anuken	68f00a8983	Bugfixes	2020-09-04 22:36:38 -04:00
Anuken	d77830ebf0	Added boss mechs to reconstructors	2020-09-04 22:17:28 -04:00
Anuken	739c4f2de2	Final mech boss unit (unfinished)	2020-09-04 22:05:15 -04:00
Anuken	ee2b099799	Initial Vestige mech implementation	2020-09-04 14:27:55 -04:00
Anuken	439c9c5599	Bugfixes	2020-09-02 16:24:05 -04:00
Anuken	6f6e9f4cc2	Initial Toxopid implementation	2020-09-02 13:32:08 -04:00
Anuken	6de1920042	Fixed #2476	2020-09-02 09:35:03 -04:00
Anuken	c1cc11c7cb	Initial toxopid sprites, WIP	2020-09-02 00:13:25 -04:00
Anuken	71b55317c1	Balance	2020-08-25 22:24:46 -04:00
Anuken	bce85ded79	Added arkyid boss	2020-08-25 22:01:46 -04:00
Anuken	b1da2faa04	Flying boss tweaks	2020-08-03 10:51:10 -04:00
Anuken	3966ff6817	Boss weapon tweaks	2020-08-02 21:54:33 -04:00
Anuken	a7c0f9e73c	Antumbra weapons	2020-08-01 21:52:12 -04:00
Anuken	58c39e14d6	risse -> risso	2020-07-24 13:27:15 -04:00
Felix Corvus	916a00b6ff	textures micro fixes and improvements	2020-07-22 03:40:58 +03:00
Anuken	60ce8ca935	Naval unit sprites complete	2020-07-17 16:41:46 -04:00
Anuken	1bb621bbd5	Naval unit tweaks	2020-07-17 11:15:07 -04:00