7962 Commits

Author	SHA1	Message	Date
Anuken	7370e398cc	#3125	2020-10-26 10:07:33 -04:00
Anuken	78afbb3e95	Merge remote-tracking branch 'origin/master'	2020-10-26 09:57:04 -04:00
Anuken	23b9556105	#3121	2020-10-26 09:56:56 -04:00
Leonwang4234	2a8a00afab	source/void replacement	2020-10-25 17:28:11 -07:00
Anuken	526b1add26	Unused bullet cleanup	2020-10-25 20:04:14 -04:00
Anuken	514aa26054	Minor rendering & AI tweaks	2020-10-25 18:34:12 -04:00
Anuken	baf6bdf6a5	Increased sector damage calculation radius	2020-10-25 17:21:34 -04:00
Anuken	59b5d809db	Balance	2020-10-25 15:55:23 -04:00
Anuken	6c3372e71c	Slightly more reasonable waves	2020-10-25 15:07:51 -04:00
Anuken	1cdea49383	Merge remote-tracking branch 'origin/master'	2020-10-25 12:35:52 -04:00
Anuken	a6307039b0	Fixed some nullability issues	2020-10-25 12:35:48 -04:00
Anuken	aaacf244d2	Merge pull request #3096 from azureblue/placement-direction ... make ending direction follow the path	2020-10-25 12:28:41 -04:00
Anuken	2a0af620be	Sector land announcement	2020-10-25 12:00:57 -04:00
Anuken	b801093597	Merge remote-tracking branch 'origin/master'	2020-10-25 11:22:19 -04:00
Anuken	81dae580a4	Bugfixes / Removed tile unit multi-mining	2020-10-25 11:22:10 -04:00
Anuken	03f58a1b02	Merge pull request #2972 from sk7725/patch-20 ... Add colors to StatusEffects	2020-10-25 10:35:42 -04:00
Anuken	b2b0082c7d	Fixed #3108 / Fixed #3112	2020-10-25 09:23:13 -04:00
Anuken	1d85495f7a	Merge remote-tracking branch 'origin/master'	2020-10-24 19:06:09 -04:00
Anuken	41d388aa7f	Item sprite cleanup	2020-10-24 19:06:05 -04:00
MEEP of Faith	705728f16a	"diable" ... oh no	2020-10-24 13:49:30 -07:00
azureblue	a7c24d4bfd	fixing formatting	2020-10-24 22:10:02 +02:00
Anuken	79ace277ed	Merge remote-tracking branch 'origin/master'	2020-10-24 15:55:25 -04:00
Anuken	bc035f9490	Fixed #3095	2020-10-24 15:55:20 -04:00
azureblue	73a5af2e5e	make ending direction follow the path	2020-10-24 21:34:47 +02:00
Anuken	ee7bdbf44e	Merge pull request #3081 from genNAowl/standardize-liquid-stats ... Remove timePeriod in LiquidBaseValue	2020-10-24 15:18:47 -04:00
Anuken	b611726c3e	Merge remote-tracking branch 'origin/master'	2020-10-24 15:11:31 -04:00
Anuken	819686e812	Unit factory production list	2020-10-24 15:11:27 -04:00
DeltaNedas	3b2669fa21	pattern variables?	2020-10-24 17:23:54 +00:00
DeltaNedas	801ff1701e	silly	2020-10-24 17:19:50 +00:00
DeltaNedas	364a2b43c2	add Content fallback	2020-10-24 17:04:58 +00:00
DeltaNedas	279d898d68	add more info to print object	2020-10-24 16:37:55 +00:00
Anuken	a930b34c3e	Merge pull request #3090 from QmelZ/master ... Turkish Translation	2020-10-24 11:58:21 -04:00
QmelZ	232a3dfe87	one last little fix	2020-10-24 17:28:10 +03:00
Anuken	ddbca62f92	Merge remote-tracking branch 'origin/master'	2020-10-24 10:22:04 -04:00
Anuken	646b022d38	Bugfixes	2020-10-24 10:21:57 -04:00
QmelZ	19ef414e5c	even more fixes	2020-10-24 17:18:56 +03:00
QmelZ	f46eb24615	some other fixes	2020-10-24 17:07:52 +03:00
Anuken	4e6faf3bac	Merge pull request #3083 from genNAowl/titanium-ammo-fuse ... Switch places of titanium and thorium ammo in `Blocks.java`	2020-10-24 09:47:21 -04:00
Anuken	56acbcecfd	Merge branch 'master' into patch-5	2020-10-24 09:46:02 -04:00
QmelZ	7d0952d858	small fix	2020-10-24 15:59:28 +03:00
QmelZ	ef40a2e78e	Update bundle_tr.properties	2020-10-24 15:56:51 +03:00
Leonwang4234	f2a984f3e7	Lets hope this compiles because I don't have time to test it	2020-10-23 19:53:21 -07:00
Anuken	1ffa3f21f0	(2)	2020-10-23 20:41:32 -04:00
Anuken	7e323f1ebf	Logic locate fix	2020-10-23 20:38:33 -04:00
SilentOwl476	bff79d7c27	Update bundle_tr.properties	2020-10-24 01:46:02 +03:00
Anuken	117f002545	Fixed #3082	2020-10-23 18:24:18 -04:00
Anuken	953c1889b5	Fixed #3080	2020-10-23 17:18:49 -04:00
Leonwang4234	cc024a0bac	remove timePeriod in LiquidBaseValue	2020-10-23 13:34:07 -07:00
Anuken	42bfab6e40	Fixed #3079	2020-10-23 16:12:36 -04:00
Anuken	c8ef7ebafb	Fixed #3078 + action listeners for player control events	2020-10-23 15:59:52 -04:00