7825 Commits

Author	SHA1	Message	Date
YellOw139	a40c49a915	Delete font.woff	2020-10-25 17:01:29 +02:00
YellOw139	f4fcb8daa6	Update bundle_ro.properties	2020-10-22 19:14:48 +03:00
YellOw139	76d2fc0f54	Typo	2020-10-22 16:23:21 +03:00
YellOw139	4d28b5083c	Quezler Status Fielded my mind	2020-10-22 14:27:56 +03:00
YellOw139	dabdf514d6	Space	2020-10-22 07:50:35 +03:00
YellOw139	21022436e8	Stats are finally consistent and up to date	2020-10-21 22:02:24 +03:00
YellOw139	eba9578a0d	More conflict changes. Should be ok now.	2020-10-21 07:30:18 +03:00
YellOw139	b95bf1595b	Fog	2020-10-21 07:28:27 +03:00
YellOw139	92b8981988	Merge branch 'master' into patch-5	2020-10-21 07:22:51 +03:00
YellOw139	83c53a541a	Wall stats (WIP)	2020-10-21 07:10:48 +03:00
Leonwang4234	54fd2e03b4	resolve conflicts	2020-10-20 15:57:48 -07:00
Leonwang4234	df37ce3cef	Merge remote-tracking branch 'upstream/master' into wall-stats	2020-10-20 15:49:46 -07: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	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
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
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
Leonwang4234	1e0545c1ec	Merge branch 'wall-stats' of https://github.com/genNAowl/Mndstry into wall-stats	2020-10-18 14:29:18 -07:00
Leonwang4234	cff2799c72	remove changes in description	2020-10-18 14:29:15 -07:00
genNAowl	7a7fa74e65	Update core/src/mindustry/world/blocks/defense/Wall.java ... Co-authored-by: Summet <summet.dev@gmail.com>	2020-10-18 14:26:48 -07:00
Summet	8ceb155e38	:)	2020-10-19 00:14:40 +03:00
Leonwang4234	db3db47ca1	Add wall stats + other changes	2020-10-18 13:35:20 -07: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