8499 Commits

Author	SHA1	Message	Date
Anuken	6b3919e8f7	Added Call#setItem	2020-11-26 16:49:01 -05:00
Anuken	1d8ec9abd9	Campaign bugfixes	2020-11-26 15:31:58 -05:00
Anuken	84474040c0	Fungal Pass map fixes	2020-11-26 14:24:35 -05:00
Anuken	3fe4ae38b6	Misc cleanup	2020-11-26 12:53:19 -05:00
Anuken	465219540c	Added prompt for loading legacy research data	2020-11-26 10:22:01 -05:00
Anuken	e1ddf115e0	Merged turret types	2020-11-25 20:41:38 -05:00
Anuken	56f1d0548e	Merge remote-tracking branch 'origin/master'	2020-11-25 20:23:24 -05:00
Anuken	38471d68d7	Fixed Salt Flats being deadlocked	2020-11-25 20:23:17 -05:00
Sunny Kim	dd9c3fc8d6	Update bundle_ko.properties	2020-11-26 10:01:15 +09:00
Sunny Kim	a70e29127b	[KO]quick patch	2020-11-26 09:59:07 +09:00
Anuken	6be2b6021b	Merge pull request #3603 from skykatik/patch-12 ... Some typos	2020-11-25 18:28:30 -05:00
Skat	488147759a	Some typos	2020-11-26 02:04:08 +03:00
Anuken	9a7d359626	Merge pull request #3579 from Quezler/patch-68 ... Remove stray newline	2020-11-25 17:49:40 -05:00
Anuken	0437d50a5c	Merge pull request #3598 from summetdev/patch-8 ... Remove unused imports	2020-11-25 17:49:24 -05:00
Leonwang4234	2b8c11c451	projectors blockgroup	2020-11-25 14:19:56 -08:00
Anuken	58acc0a970	Merge remote-tracking branch 'origin/master'	2020-11-25 15:42:56 -05:00
Anuken	c874089f27	Bugfixes	2020-11-25 15:42:51 -05:00
Antsiferov Andrew	4ac26d86f5	Remove unused imports	2020-11-25 20:04:32 +00:00
Wiki Updater	51790e0bf9	fix ai schematics with power weapons and steam gens	2020-11-25 19:52:36 +01:00
Anuken	40b67349d9	Fixed quotes	2020-11-25 11:56:10 -05:00
Anuken	735cb74483	Merge remote-tracking branch 'origin/master'	2020-11-25 11:15:50 -05:00
Anuken	bc55e43def	Fixed #3591	2020-11-25 11:15:46 -05:00
Anuken	084d7e8355	Merge pull request #3583 from Quezler/patch-69 ... automatic reconnect	2020-11-25 11:14:04 -05:00
Patrick 'Quezler' Mounier	f26b3358ef	Update core/src/mindustry/ui/dialogs/JoinDialog.java ... Co-authored-by: Anuken <arnukren@gmail.com>	2020-11-25 17:08:03 +01:00
Patrick 'Quezler' Mounier	3d6390a76a	Set the ping to null when canceling manually as well	2020-11-25 16:51:57 +01:00
Patrick 'Quezler' Mounier	ff20928bec	Anukify reconnect logic	2020-11-25 16:49:36 +01:00
Anuken	8418770bbf	Merge remote-tracking branch 'origin/master'	2020-11-25 10:15:22 -05:00
Anuken	eaa7b04c3d	Fixed CI / Fixed exponentially increasing broken blocks	2020-11-25 10:15:14 -05:00
Patrick 'Quezler' Mounier	b002d8b446	Update bundle.properties	2020-11-25 10:42:13 +01:00
Patrick 'Quezler' Mounier	f5e06cca54	Update NetClient.java	2020-11-25 10:41:41 +01:00
Patrick 'Quezler' Mounier	642b877ab0	Update JoinDialog.java	2020-11-25 10:40:42 +01:00
Patrick 'Quezler' Mounier	8ee3f2b2e6	Remove stray newline	2020-11-25 09:38:04 +01:00
Patrick 'Quezler' Mounier	40bf0741f0	Remove unused import	2020-11-25 09:36:12 +01:00
Anuken	6633b07fb2	Merge pull request #3561 from Volas171/patch-2 ... Update contributors	2020-11-24 18:55:00 -05:00
Volas171	e65971db47	h	2020-11-24 18:30:59 -05:00
Anuken	5fd66d38bb	Fixed #3573	2020-11-24 18:15:40 -05:00
Anuken	15f33b45c7	Salt Flats should probably require additive reconstructors	2020-11-24 18:12:45 -05:00
Anuken	17e66f1008	Final campaign tweaks	2020-11-24 17:17:55 -05:00
Anuken	bcaf5e4c3d	Campaign balance / Smarter power node placement	2020-11-24 16:33:36 -05:00
Anuken	6fd36d97f0	Balancing	2020-11-24 12:53:55 -05:00
Anuken	61bec243dc	Campaign balance	2020-11-24 12:35:04 -05:00
Anuken	7d43856735	Bugfixes	2020-11-24 10:23:28 -05:00
Anuken	058b2ddfce	Fixed #3565	2020-11-24 09:00:34 -05:00
Volas171	97254a6672	Update contributors	2020-11-23 22:27:08 -05:00
Anuken	2282cb89b1	Fixed sector damage calculations / Campaign balance	2020-11-23 18:09:20 -05:00
Anuken	06929ee8f3	Fixed boss hint not disappearing	2020-11-23 15:47:15 -05:00
Anuken	ec19381c4e	Fixed campaign bases having ridiculous wall tiers	2020-11-23 15:41:10 -05:00
Anuken	4a52392ce9	Added hint about guards & armor	2020-11-23 13:09:42 -05:00
Anuken	dcbe06229c	Campaign fixes & balance	2020-11-23 10:36:41 -05:00
Anuken	075be1a862	Fixed #3540 / Fixed #3544 / Fixed #3542	2020-11-23 09:12:36 -05:00