8956 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
BasedUser	56ca782cae	Merge branch 'master' into patch-4	2020-10-13 00:58:31 +03:00
Anuken	cf27b0f10a	Merge pull request #2899 from FruityPear/patch-1 ... Add Pearkin Attack Server to servers.json	2020-10-12 16:23:52 -04:00
Anuken	565892b39a	Merge branch 'master' into patch-1	2020-10-12 16:23:46 -04:00
Anuken	59223fb7aa	Merge pull request #2464 from way-zer/patch-1 ... Update servers_be.json	2020-10-12 16:22:13 -04:00
Anuken	0b11185f39	Merge branch 'master' into patch-1	2020-10-12 16:22:09 -04:00
Anuken	259d611c2c	Merge pull request #2523 from Recessive/patch-3 ... Update servers.json	2020-10-12 16:20:18 -04:00
Anuken	65f1d027a1	Merge branch 'master' into patch-3	2020-10-12 16:20:13 -04:00
Anuken	f1123e51a3	Merge pull request #2820 from LeoSko/patch-1 ... Update servers.json	2020-10-12 16:17:45 -04:00
Anuken	06877b457e	Rule selection fixes	2020-10-12 15:59:22 -04:00
Anuken	fde1881fd5	Merge remote-tracking branch 'origin/master'	2020-10-12 14:33:29 -04:00
Anuken	876534bd26	Wave balancing & AI tweaks	2020-10-12 14:33:22 -04:00
Anuken	fbda1fb7cf	Merge pull request #2863 from MEEPofFaith/patch-2 ... If units can have `chargeSound`, why not `chargeTurret`s too?	2020-10-12 10:40:50 -04:00
Anuken	a1f222b76d	Merge pull request #2908 from Somka000/patch-8 ... Update servers_be.json	2020-10-12 10:40:10 -04:00
Anuken	f10c5c1ca8	Merge remote-tracking branch 'origin/master'	2020-10-12 10:06:41 -04:00
Anuken	378e81cd90	Fixed #2917	2020-10-12 10:06:34 -04:00
Anuken	0ddc34a51d	Merge pull request #2920 from Catchears/dacite-boulder ... Add bundle entry for dacite boulder	2020-10-12 10:03:30 -04:00
Wiki Updater	08629bb7f7	add bundle entry for dacit boulder	2020-10-12 10:49:41 +02:00
Anuken	9edec3c7ab	Update .travis.yml	2020-10-11 19:14:16 -04:00
Anuken	66ecf96be2	Merge pull request #2904 from Quezler/patch-52 ... Make deconstructing scrap walls return scrap	2020-10-11 19:11:52 -04:00
Anuken	6807b589a3	Logic unit control tweaks	2020-10-11 19:10:33 -04:00
MEEP of Faith	7662174dc4	oki doki	2020-10-11 12:58:50 -07:00
Anuken	ee50995dde	Removed "sector attacked" message	2020-10-11 14:54:05 -04:00
Anuken	2f6f205dc7	Better builder detection for ConstructBlock	2020-10-11 14:20:53 -04:00
Anuken	f1ec26f82b	Correct logic control position rendering	2020-10-11 14:10:55 -04:00
Anuken	7df575e76a	Merge remote-tracking branch 'origin/master'	2020-10-11 14:05:19 -04:00
Anuken	af54de894c	Balancing / LogicAI sync	2020-10-11 14:05:16 -04:00
Anuken	4473d1d674	Merge pull request #2911 from summetdev/patch-5 ... Fix Vars.loops declaration	2020-10-11 13:56:59 -04:00
Summet	4f258b54c5	Fix Vars.loops declaration	2020-10-11 20:47:04 +03:00
Anuken	ad2bda8ec1	Better sector gen	2020-10-11 13:33:02 -04:00
Anuken	f12379ee07	Fixed #2910	2020-10-11 11:55:45 -04:00
Anuken	3fe79531a6	Added message for last accessed player of block	2020-10-11 11:47:22 -04:00
Anuken	e11a8565d0	Merge remote-tracking branch 'origin/master' ... # Conflicts: # core/src/mindustry/ui/dialogs/PausedDialog.java	2020-10-11 10:51:46 -04:00
Anuken	3d99e38f10	Sector simplification	2020-10-11 10:51:33 -04:00
Somka000	5bcc37d061	Update servers_be.json ... I created PvP server on BE, because players don't have PvP BE server and on BE version are new turrets, better logic etc.	2020-10-11 16:49:27 +02:00
Anuken	cc051dd787	Merge pull request #2905 from DeltaNedas/uinames ... add names to lots of ui elements	2020-10-11 10:36:18 -04:00
DeltaNedas	0f2c38b0c0	oh no	2020-10-11 15:28:50 +01:00
Anuken	d9aa1f765d	Merge pull request #2906 from Quezler/patch-53 ... Visualize maximum amount of power node wires	2020-10-11 10:19:58 -04:00
Anuken	62baf5cab2	Update core/src/mindustry/world/blocks/power/PowerNode.java ... Co-authored-by: Patrick 'Quezler' Mounier <patrick@queztech.net>	2020-10-11 09:24:27 -04:00
Anuken	65d9978fa1	Fixed #2901 / Fixed #2903	2020-10-11 09:02:20 -04:00
Patrick 'Quezler' Mounier	6d632fc532	Update bundle.properties	2020-10-11 14:59:44 +02:00
Patrick 'Quezler' Mounier	a975da543b	Add a connections bar to powernodes ... Bundle entry in next commit.	2020-10-11 14:58:53 +02:00
DeltaNedas	5eb8a87528	h	2020-10-11 12:59:00 +01:00
DeltaNedas	1539d86846	add names to some major dialog elements	2020-10-11 12:57:18 +01:00
DeltaNedas	a60ae3a060	add names to major fragment elements	2020-10-11 12:56:55 +01:00
Patrick 'Quezler' Mounier	eaf7a86bce	Make deconstructing scrap walls return scrap	2020-10-11 13:54:28 +02:00
MEEP of Faith	5600f96a37	Make the sound pitch not random.	2020-10-10 18:03:53 -07:00
Anuken	bcb248907c	Campaign core item incineration + better idle gen	2020-10-10 19:02:47 -04:00
Anuken	ab772d4901	fewer destruction turns	2020-10-10 17:31:16 -04:00
Anuken	7bcecea539	Merge remote-tracking branch 'origin/master'	2020-10-10 17:09:22 -04:00
Anuken	4d889cd8d1	Weather fixes	2020-10-10 17:09:19 -04:00