8478 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anuken	b732da09df	Merge pull request #2643 from Remint32/patch-4 ... Make Pal.java colors changable for texturepack-mods tweaks	2020-09-21 11:10:37 -04:00
Felix Corvus	6840fb53b7	Update Pal.java	2020-09-21 16:24:06 +03:00
Anuken	6b56fef512	Merge pull request #2636 from genNAowl/wall-sound-effects ... Add sound variables for when a wall is releasing lightning/deflecting bullets	2020-09-21 09:11:57 -04:00
Leonwang4234	5eb722efee	Update Wall.java	2020-09-20 20:25:18 -07:00
Anuken	63e35bd462	T4 air carrier unit (*unfinished*)	2020-09-20 19:34:12 -04:00
Anuken	401384ae5b	Anuken/Mindustry-Suggestions/issues/548	2020-09-20 16:35:25 -04:00
Anuken	b2d054c1f2	Merge remote-tracking branch 'origin/master'	2020-09-20 15:23:41 -04:00
Anuken	0a314e142e	Fixed #2632 (among other things)	2020-09-20 15:23:34 -04:00
Anuken	8a3ed9c80b	Merge pull request #2628 from Remint32/patch-5 ... [Bundle] Little improvements for convenience	2020-09-20 09:51:29 -04:00
Félix Córvus	0396cc6ec4	Update Control.java	2020-09-20 16:45:34 +03:00
Félix Córvus	e907d1a23f	Updating bundles	2020-09-20 16:43:15 +03:00
Felix Corvus	86446f4f00	Update Control.java	2020-09-20 16:32:38 +03:00
Anuken	415380f25e	Merge remote-tracking branch 'origin/master'	2020-09-19 21:54:18 -04:00
Anuken	b9fd38a76e	Various tweaks and speculative changes	2020-09-19 21:54:08 -04:00
Anuken	b4d83f33e9	Merge pull request #2395 from genNAowl/ready-to-merge-force-projectors ... F O R C E P R O J E C T O R S	2020-09-19 21:15:45 -04:00
Anuken	3b8b762a1c	Removed phase radius display *(see description)* ... Phased radius has been proposed in numerous PRs, but I don't know how to handle it properly yet. New players may be confused about the extra circle/hexagon indicator around blocks - it's not clear what it means. An extra radius easy to implement, so I'll leave it out of this PR and handle it later.	2020-09-19 21:15:18 -04:00
Anuken	cdd1e90d1a	Fixed #2622	2020-09-19 17:35:32 -04:00
Anuken	eb8658e140	Mud tweaks / Unit count tweaks	2020-09-19 16:04:50 -04:00
Anuken	84b1c0348d	Merge remote-tracking branch 'origin/master'	2020-09-19 14:11:51 -04:00
Anuken	0bcb48ca31	Costs for unit research	2020-09-19 14:11:48 -04:00
Anuken	c470c0abe1	Merge pull request #2612 from sk7725/patch-17 ... [KO] Update bundle_ko.properties	2020-09-19 13:26:31 -04:00
Anuken	dcbfc2b7aa	Storage team colors	2020-09-19 12:38:24 -04:00
Anuken	ce8e060f29	Merge remote-tracking branch 'origin/master'	2020-09-19 12:31:06 -04:00
Anuken	9b0947a6e5	Fixed #2607 / Fixed #2604	2020-09-19 12:30:58 -04:00
Anuken	c865dbb465	Merge pull request #2610 from DeltaNedas/pubtree ... make techtree funcs public	2020-09-19 12:14:26 -04:00
Anuken	eb60b60b4a	Merge pull request #2615 from Remint32/patch-4 ... [Bundle] Missing keybind lines	2020-09-19 12:12:52 -04:00
Anuken	e19e74cdc5	Bugfixes	2020-09-19 11:40:11 -04:00
Felix Corvus	68cf2af6e0	missing keybind lines	2020-09-19 17:34:49 +03:00
Sunny Kim	8a4dd09137	Update bundle_ko.properties ... + Lots of environmental blocks(reflects 74cefb3ec9)!	2020-09-19 20:49:08 +09:00
DeltaNedas	cdc1337fcb	make techtree funcs public	2020-09-19 10:00:33 +01:00
Anuken	b29c0ab401	Unit production limit tweaks	2020-09-18 22:42:05 -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	c038ef200a	arc	2020-09-18 21:16:40 -04:00
Anuken	aae045b5dd	Outline changes	2020-09-18 21:14:04 -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	6b6783f201	Fixed #2591 / Fixed #2591 / Fixed #2589 / Fixed #2587	2020-09-18 11:21:50 -04:00
Anuken	c71be9ae32	Mud	2020-09-18 00:13:08 -04:00
Anuken	4c241f9867	Bugfixes	2020-09-17 23:53:35 -04:00
Anuken	f242a2b2cd	Fixed #2585	2020-09-17 22:25:56 -04:00
Anuken	0c7a7e00eb	Merge remote-tracking branch 'origin/master'	2020-09-17 21:05:23 -04:00
Anuken	ea224bd1f1	many things	2020-09-17 21:05:16 -04:00
Anuken	c5fffb9ddd	Merge pull request #2579 from DeltaNedas/logicops ... add lua-style integer division with //	2020-09-17 14:47:17 -04:00
DeltaNedas	ee08fa8f77	add lua-style integer division with //	2020-09-17 17:46:45 +01:00
Anuken	dfb96dcdd9	Merge pull request #2557 from Vortetty/patch-1 ... Update servers_be.json	2020-09-17 11:15:07 -04:00
Anuken	b0bb048c35	Merge branch 'master' into patch-1	2020-09-17 11:14:54 -04:00
Anuken	ce2dd89f44	Fixed #2571	2020-09-16 23:34:56 -04:00
Anuken	7b55ce94fe	Merge remote-tracking branch 'origin/master'	2020-09-16 18:38:30 -04:00
Anuken	bdf814c9b9	Removed sector data cache system	2020-09-16 18:38:23 -04:00
Anuken	53f5c69d40	Merge pull request #2569 from Mayonez-bat/patch-1 ... Update servers_v6.json	2020-09-16 18:08:32 -04:00