9158 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anuken	3517da8214	Fixed #3049	2020-10-21 10:37:03 -04:00
Anuken	18e6a43a87	Added weather to some built-in maps	2020-10-20 17:24:51 -04:00
Anuken	8f58228317	More base parts	2020-10-20 15:43:06 -04:00
Anuken	30abfc0619	Fixed #3045	2020-10-20 14:02:10 -04:00
Anuken	82fe66b931	Titanium fuse ammo	2020-10-20 12:14:53 -04:00
Anuken	9a9b1d1a90	Fixed log level code	2020-10-20 11:41:54 -04:00
Anuken	03707ea6cf	arc	2020-10-20 11:41:34 -04:00
Anuken	7731cee219	arc	2020-10-20 11:24:41 -04:00
Anuken	03c60a93f0	Merge remote-tracking branch 'origin/master'	2020-10-20 11:21:54 -04:00
Anuken	9ab272a01f	Better server colors	2020-10-20 11:21:47 -04:00
Anuken	e68d28ef51	Merge pull request #3041 from summetdev/admin-chat ... Admin chat.	2020-10-20 09:10:18 -04:00
Anuken	9060a9518a	Fixed #3037	2020-10-20 09:05:41 -04:00
Summet	ffb94576ac	Better colors ... Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>	2020-10-20 15:04:03 +03:00
summetdev	0c1c0f9557	Admin -> A	2020-10-20 13:56:53 +03:00
summetdev	9f95aa035d	Indents	2020-10-20 13:56:09 +03:00
summetdev	89fca49b91	Put admin color to Pal	2020-10-20 13:51:21 +03:00
summetdev	d3e26c7c16	Admin chat command	2020-10-20 13:33:28 +03:00
Anuken	c27251cfb0	Fog	2020-10-19 18:28:37 -04:00
Anuken	d5fb0e924a	Merge remote-tracking branch 'origin/master'	2020-10-19 16:26:03 -04:00
Anuken	6e8732387b	Better weather classes	2020-10-19 16:25:59 -04:00
Anuken	ef0376371d	Merge pull request #3030 from sk7725/patch-21 ... remove final from item.color (and liquid too)	2020-10-19 12:20:14 -04:00
Sunny Kim	3c2e12621e	rainbow liquid	2020-10-20 01:01:45 +09:00
Sunny Kim	efb42296cf	remove final	2020-10-20 00:57:08 +09:00
Anuken	cab08de1f7	Merge remote-tracking branch 'origin/master'	2020-10-19 11:34:59 -04:00
Anuken	2ff749bd17	Unified stat system	2020-10-19 11:34:52 -04:00
Anuken	073b82b70f	Merge pull request #3029 from abomb4/patch-mod-environment ... Json in Mod should be able to define OreBlock type	2020-10-19 10:43:53 -04:00
abomb4	9e79ed8a26	Json in Mod should be able to define OreBlock type ... That in mindustry.world.blocks.environment package	2020-10-19 22:34:52 +08:00
Anuken	59e1fd1eb6	typo	2020-10-19 10:04:30 -04:00
Anuken	d1d674cfc9	Merge remote-tracking branch 'origin/master'	2020-10-19 10:04:13 -04:00
Anuken	80f801db36	Fixed #3023 / Fixed #3020	2020-10-19 10:04:10 -04:00
Anuken	400d36609a	Merge pull request #3022 from Ilya246/patch-1 ... armor defined twice in mega	2020-10-19 09:41:06 -04:00
Ilya246	ad5d3581f6	armor defined twice in mega	2020-10-19 10:09:39 +04:00
Anuken	7f21d61078	Crash fix	2020-10-18 19:54:52 -04:00
Anuken	c7622198fd	Cleanup	2020-10-18 19:21:59 -04:00
Anuken	3a52fb2afe	Merge branch 'router'	2020-10-18 19:03:13 -04:00
Anuken	e63bbe6ac9	Merge remote-tracking branch 'origin/master'	2020-10-18 18:34:24 -04:00
Anuken	dac236b0e9	Better launch selection	2020-10-18 18:34:19 -04:00
Anuken	fcbad69b46	Merge pull request #3014 from summetdev/patch-6 ... :)	2020-10-18 17:20:25 -04:00
Summet	8ceb155e38	:)	2020-10-19 00:14:40 +03:00
Anuken	97fd9abd8c	Merge remote-tracking branch 'origin/master'	2020-10-18 15:46:24 -04:00
Anuken	00d6997b5a	Hex/bin logic number support	2020-10-18 15:46:20 -04:00
Anuken	58ff6c60aa	Merge pull request #3012 from summetdev/typo ... Grammatical fix	2020-10-18 14:57:26 -04:00
Anuken	7fc2d6be18	Merge pull request #3010 from summetdev/units-payload ... Units payload.	2020-10-18 14:43:23 -04:00
summetdev	bd6aebb961	fixed a typo in comment	2020-10-18 21:38:01 +03:00
summetdev	801eca5ca3	prevent sending extra packets	2020-10-18 21:26:32 +03:00
summetdev	96996f8079	merge	2020-10-18 20:28:29 +03:00
summetdev	12e35b643c	sync fix	2020-10-18 20:24:09 +03:00
Summet	2e0c1cd613	code style ... Co-authored-by: Anuken <arnukren@gmail.com>	2020-10-18 20:07:46 +03:00
Anuken	563e99aded	Fixed #3009	2020-10-18 13:02:55 -04:00
summetdev	8625ef09cc	Units payload	2020-10-18 19:54:10 +03:00