8288 Commits

Author	SHA1	Message	Date
Anuken	9af8b64046	#3191	2020-10-31 12:03:35 -04:00
DeltaNedas	865beac7fb	fix modded bullets	2020-10-31 15:35:45 +00:00
Anuken	d68ef73407	Fixed bloom resizing improperly	2020-10-31 11:01:39 -04:00
Anuken	8d6ea6b197	Correct team display on maps	2020-10-31 10:35:21 -04:00
Anuken	2c29a06eb5	Fixed #3206	2020-10-31 10:07:01 -04:00
Anuken	b75a03aed8	Fixed #3204	2020-10-31 09:56:35 -04:00
Anuken	42b8ece85a	Fixed #3200 / Fixed #3196 / Fixed #3198	2020-10-31 09:01:06 -04:00
Prosta4okua	ab947c4fe7	Update bundle_uk_UA.properties	2020-10-31 02:25:38 +02:00
Anuken	4ec8e24bd8	Cleanup of merged PR	2020-10-30 19:03:05 -04:00
Anuken	e02458122b	Merge pull request #2970 from genNAowl/ground-support-heal ... Allow Ground Support Units to Heal Blocks	2020-10-30 18:52:04 -04:00
QmelZ	d837879bd8	translation	2020-10-31 00:51:34 +03:00
Anuken	181ad1016c	Reduced tech costs / Added missing blocks to fungal pass	2020-10-30 16:05:40 -04:00
Anuken	466183ffd0	Possibly more accurate wave linear regressions	2020-10-30 15:39:49 -04:00
genNAowl	60f2c67bde	Merge branch 'master' into ground-support-heal	2020-10-30 12:37:33 -07:00
Anuken	28240f730f	Don't show guardian warning when above win wave	2020-10-30 14:57:34 -04:00
Anuken	ed93fa45d3	Preset tweaks	2020-10-30 13:16:59 -04:00
Anuken	a12583eb4d	Campaign survival wave display tweaks	2020-10-30 12:54:24 -04:00
Leonwang4234	de483990ef	formatting ... Why do I always make these mistakes? And I saw that I did the same thing in my incendiary-fire PR too...	2020-10-30 09:04:44 -07:00
Anuken	76ff55d7f1	Campaign tweaks	2020-10-30 11:50:38 -04:00
Anuken	784a280bef	Merge remote-tracking branch 'origin/master'	2020-10-30 10:36:11 -04:00
Anuken	14869041b8	Cleanup	2020-10-30 10:36:07 -04:00
Anuken	17fd3d0bc1	Merge pull request #3099 from skykatik/patch-2 ... Removing spaces at start and end of a message (trim)	2020-10-30 10:29:42 -04:00
Anuken	968d94904a	Merge pull request #3058 from MEEPofFaith/speed-lightning ... v5 Javelin Movement Lightning Ability	2020-10-30 09:40:21 -04:00
Anuken	c8e5994b2f	Merge pull request #3174 from genNAowl/alternate-recalculation ... Change "Alternate" calculation in Turret.java	2020-10-30 09:30:59 -04:00
Anuken	73035b9211	Merge branch 'master' into formatting	2020-10-30 09:26:51 -04:00
Anuken	513ccfe581	Merge remote-tracking branch 'origin/master'	2020-10-30 09:24:09 -04:00
Anuken	782307374f	Fixed #3189 / Fixed #3187	2020-10-30 09:24:05 -04:00
Anuken	c0d1ff0f08	Merge pull request #3192 from Voz-Duh/full-unit-in-menu ... Full Unit In Menu	2020-10-30 09:21:58 -04:00
Voz-Duh	36fdf4afbc	Full Unit In Menu	2020-10-30 14:21:13 +03:00
YellOw139	790a802236	Indev pop-up slip-by fix	2020-10-30 12:33:40 +02:00
TheJaaju	b45e7cd8f3	Update bundle_fi.properties ... More translations	2020-10-30 11:17:58 +02:00
Sunny Kim	ecaa0a4eaa	Some liquid turrets are not caring enough	2020-10-30 16:44:54 +09:00
Anuken	a9f5aa9220	suffering	2020-10-29 19:58:10 -04:00
Anuken	ae35b2ff7e	arc	2020-10-29 19:04:37 -04:00
Anuken	1663497e6c	Better save validation	2020-10-29 19:03:58 -04:00
YellOw139	fca8d6741c	Yet another typo	2020-10-29 23:27:15 +02:00
YellOw139	97e9cdc1fd	Fixed real confusing entry	2020-10-29 23:25:44 +02:00
YellOw139	e9089aae68	Update bundle_ro.properties	2020-10-29 21:53:18 +02:00
Anuken	afed4c4239	Merge pull request #3184 from MEEPofFaith/any-layer-effects ... Any Layer Effects	2020-10-29 13:58:55 -04:00
Anuken	3eb655402f	Merge pull request #2978 from Volas171/patch-1 ... Update bundle_es.properties	2020-10-29 13:39:11 -04:00
Anuken	0c418d1a09	Libs	2020-10-29 11:51:17 -04:00
Anuken	2ad14cc884	Merge remote-tracking branch 'origin/master'	2020-10-29 10:26:35 -04:00
Anuken	77e6030c59	Fixed #3173	2020-10-29 10:26:32 -04:00
Sunny Kim	f2b5553f54	bug squish	2020-10-29 19:04:38 +09:00
Petr Gašparík	bced413810	Czech translation for latest version ... up to commit 44286ce	2020-10-29 09:08:14 +01:00
MEEP of Faith	a14ae1bdf8	Lightning chance fix.	2020-10-28 21:00:24 -07:00
MEEP of Faith	1e3b498671	Any Layer Effects	2020-10-28 20:46:50 -07:00
Leonwang4234	19bc6f6e48	Update Turret.java	2020-10-28 20:09:45 -07:00
Anuken	3dae157a5e	Extra validation	2020-10-28 19:35:15 -04:00
Anuken	55a7089a3d	Merge remote-tracking branch 'origin/master'	2020-10-28 18:51:49 -04:00
Anuken	44286cee59	Wave versions	2020-10-28 18:51:42 -04:00
Anuken	89c35db811	Merge pull request #3168 from Yakuzet/patch-3 ... Update bundle_tr.properties	2020-10-28 16:40:10 -04:00
Anuken	68ab48a1d3	Fixed #3170	2020-10-28 14:05:09 -04:00
老滑稽	e4a8d2cb33	Update bundle_zh_CN.properties	2020-10-28 23:43:57 +08:00
Anuken	d77f1b4fc0	Merge remote-tracking branch 'origin/master'	2020-10-28 10:29:40 -04:00
Anuken	e1fefd1664	Updated RoboVM version	2020-10-28 10:29:32 -04:00
Anuken	9e15434904	Merge pull request #3165 from summetdev/payload-group ... Add transportation group to payload conveyors.	2020-10-28 09:53:02 -04:00
Anuken	4940c277f6	Fixed #3166	2020-10-28 09:42:41 -04:00
Yakuzet	fc317939e2	Update bundle_tr.properties ... I fixed all googled things	2020-10-28 16:36:22 +03:00
Volas171	53e655698b	Update bundle_es.properties	2020-10-28 08:32:23 -05:00
Anuken	63e4bca098	Partial fix of editor multiblock undo/redo	2020-10-28 09:22:27 -04:00
summetdev	c830db65d7	bounded -> controlled	2020-10-28 13:52:28 +03:00
summetdev	a7d1f98f7e	PayloadConveyor with transportation group	2020-10-28 13:50:32 +03:00
summetdev	042bbffe77	Bounded logic property	2020-10-28 10:19:51 +03:00
Volas171	d91dd2548d	Merge branch 'master' into patch-1	2020-10-27 15:05:36 -05:00
Prosta4okua	a644b64c1c	Update bundle_uk_UA.properties	2020-10-27 21:55:22 +02:00
summetdev	2918a0ea86	Newlines	2020-10-27 22:08:53 +03:00
summetdev	a3abadd8c2	Revert "Newlines" ... This reverts commit a78faa57	2020-10-27 21:55:40 +03:00
summetdev	9a7e0fb45e	Removed spaces in brackets	2020-10-27 21:54:48 +03:00
summetdev	a78faa57f3	Newlines	2020-10-27 21:36:02 +03:00
Anuken	024f64678c	Merge remote-tracking branch 'origin/master'	2020-10-27 14:29:19 -04:00
Anuken	a31e182905	Fixed nodes not connecting to batteries when placed	2020-10-27 14:29:15 -04:00
summetdev	a4f54a890a	Add spaces to operations	2020-10-27 21:13:36 +03:00
Wiki Updater	7fa9902ee7	änderungen von Ansraer	2020-10-27 19:05:37 +01:00
Prosta4okua	d84f2e1993	27.10.2020	2020-10-27 19:54:50 +02:00
Anuken	c122aa85bf	Merge pull request #3155 from summetdev/processor-units ... Hovering over a processor will show the unit it's controlling.	2020-10-27 13:42:37 -04:00
summetdev	76124c1b19	Show controlled units on processor hover	2020-10-27 20:30:41 +03:00
Anuken	5582a8bf1b	Fixed #3153 / Fixed #3152	2020-10-27 13:13:54 -04:00
summetdev	8cffab46e0	Drawf.square with rotation	2020-10-27 18:52:23 +03:00
老滑稽	624f004800	Update bundle_zh_CN.properties	2020-10-27 23:35:38 +08:00
Anuken	6eab4ebd1c	Fixed #3145 / Fixed #3144	2020-10-27 10:27:57 -04:00
老滑稽	c32c500ad2	Update bundle_zh_CN.properties	2020-10-27 12:48:11 +08:00
Anuken	c0d0edfc89	Bugfixes & cleanup	2020-10-26 23:09:51 -04:00
Anuken	8d7f96bf00	Fixed #3140	2020-10-26 16:54:47 -04:00
Anuken	909da9de3c	Bugfixes	2020-10-26 16:06:50 -04:00
Anuken	73ca6eeb74	Fixed #3136	2020-10-26 13:38:27 -04:00
Anuken	8770bb2422	Fixed #3133 (probably) / Logic icon draw command	2020-10-26 13:31:32 -04:00
Vanguard	928a831bc4	1 line changed ... editor.exportimage	2020-10-26 19:09:13 +03:00
Anuken	a2181fec48	Merge remote-tracking branch 'origin/master'	2020-10-26 11:52:37 -04:00
Anuken	db5298e40c	Headless cleanup	2020-10-26 11:52:33 -04:00
Anuken	0b7c8bdcd8	Merge pull request #3129 from DeltaNedas/patch-12 ... minor serverside optimisation in roomba	2020-10-26 11:19:22 -04:00
Anuken	f814fa861c	Merge remote-tracking branch 'origin/master'	2020-10-26 10:07:38 -04:00
Anuken	7370e398cc	#3125	2020-10-26 10:07:33 -04:00
Anuken	ca572163d4	Merge pull request #3115 from YellOw139/patch-5 ... Add Vietnamese characters to font.woff	2020-10-26 10:00:41 -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
DeltaNedas	1e12faaf65	h ... h is for headless, which i am	2020-10-26 13:37:53 +00:00
DeltaNedas	6c7428a1fb	minor serverside optimisation	2020-10-26 13:32:50 +00:00
Felix Corvus	0ab06392c1	Update bundle_ru.properties	2020-10-26 14:54:35 +03: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
YellOw139	1d54e939cb	Add new font.woff	2020-10-25 17:02:04 +02:00
YellOw139	a40c49a915	Delete font.woff	2020-10-25 17:01:29 +02:00
Anuken	03f58a1b02	Merge pull request #2972 from sk7725/patch-20 ... Add colors to StatusEffects	2020-10-25 10:35:42 -04:00
YellOw139	103e408cb7	[Bundle][RO] Translation Update ... This PR was tested in-game and is ready to merge at any time (unless marked as draft). Changelog: - New strings/changes up to commit 41d388aa7f - Typo fixes & various other improvements	2020-10-25 15:45:57 +02:00
Anuken	b2b0082c7d	Fixed #3108 / Fixed #3112	2020-10-25 09:23:13 -04:00
Wiki Updater	1d4da170ef	änderungen von shawak	2020-10-25 14:22:36 +01:00
老滑稽	3b75527e4c	Update bundle_zh_CN.properties	2020-10-25 19:24:57 +08:00
老滑稽	83d4825bf2	Update bundle_zh_CN.properties	2020-10-25 18:57:57 +08:00
Prosta4okua	3d47389a39	Update bundle_uk_UA.properties	2020-10-25 11:19:09 +02:00
MEEP of Faith	2c03516998	I thought this failed. I guess not..	2020-10-24 17:27:01 -07:00
MEEP of Faith	062b319ab3	ok, then try this?	2020-10-24 17:16:56 -07:00
MEEP of Faith	8ad4349d18	test this	2020-10-24 17:12:44 -07: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	2ec3eee138	Custom Base Support	2020-10-24 15:02:36 -07:00
MEEP of Faith	705728f16a	"diable" ... oh no	2020-10-24 13:49:30 -07:00
Skat	6b94cbd089	Oh	2020-10-24 23:44:16 +03:00
Skat	7b8a9ff15e	Update ChatFragment.java ... This will avoid exceeding the message length limit if player send a message with spaces in end/start message	2020-10-24 23:34:18 +03: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
Vanguard	b4deb6caca	1 line changed ... unit.nobuild	2020-10-24 20:06:02 +03: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
Felix Corvus	ba7645e531	Update bundle_ru.properties	2020-10-24 19:14:18 +03: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
Wiki Updater	280f0d6e21	Improve german translation for v6	2020-10-24 09:20:57 +02: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
Anuken	5512c1817d	Extra scrap for debris field map	2020-10-23 14:09:05 -04:00
Anuken	f5888a7c56	Android crash fixes	2020-10-23 13:42:28 -04:00
Anuken	754aba9013	Merge remote-tracking branch 'origin/master'	2020-10-23 13:31:58 -04:00
Anuken	cf3f540df4	New map	2020-10-23 13:31:55 -04:00
Anuken	f2f805e140	Merge pull request #2969 from rodrigolitzius/patch-1 ... S	2020-10-23 12:01:43 -04:00
Anuken	84171a8619	Slightly better terrain filter	2020-10-23 12:00:06 -04:00
Anuken	92d573bdcb	Merge remote-tracking branch 'origin/master' ... # Conflicts: # core/assets/bundles/bundle_ro.properties	2020-10-23 11:52:27 -04:00
Anuken	f81f4ded03	Updated bundles	2020-10-23 11:52:01 -04:00
YellOw139	92327bfd1d	[Bundle][RO] Translation Update ... This PR was tested in-game and is ready to merge at any time (unless marked as draft). Changelog: - New strings/changes up to commit <need to check number> - Typo fixes & various other improvements	2020-10-23 18:49:48 +03:00
Anuken	7d194094ff	Merge remote-tracking branch 'origin/master'	2020-10-23 11:48:56 -04:00
Anuken	d8798b5a0d	function	2020-10-23 11:48:53 -04:00
Anuken	6d846cc3a5	Merge pull request #2934 from Prosta4okua/master ... [Bundle][RU] actual L10n	2020-10-23 11:48:35 -04:00
Anuken	4dfb743273	Merged translations	2020-10-23 11:42:12 -04:00
Anuken	2b5ee5c463	Merge remote-tracking branch 'origin/master'	2020-10-23 10:39:05 -04:00
Anuken	bf1268bb6e	Shooting -> Function category / Dialog cleanup	2020-10-23 10:39:01 -04:00
Felix Corvus	9cb601c569	Update bundle_ru.properties	2020-10-23 17:11:51 +03:00
Felix Corvus	bf8ab8e34e	Update bundle_ru.properties	2020-10-23 16:49:43 +03:00
Anuken	9db4d287dd	Merge branch 'master' into patch-2	2020-10-23 09:47:22 -04:00
Anuken	4ca3909220	Merge pull request #3024 from DaGamerFiles/patch-2 ... Update bundle_in_ID.properties	2020-10-23 09:38:24 -04:00
Anuken	6983577b20	Merge pull request #3006 from Kieaer/patch-5 ... Update bundle_ko.properties	2020-10-23 09:38:10 -04:00
Anuken	3d46ed580e	Merge branch 'master' into patch-7	2020-10-23 09:35:13 -04:00
Anuken	d7e5828347	Merge pull request #2942 from YellOw139/patch-5 ... [Bundle][RO] Translation Update	2020-10-23 09:34:40 -04:00
Anuken	2dfb9830a3	Merge branch 'master' into v107	2020-10-23 09:34:04 -04:00
Anuken	a1de6e5288	Merge branch 'master' into patch-7	2020-10-23 09:30:23 -04:00
Anuken	a16b9240d6	Merge branch 'master' into patch-15	2020-10-23 09:28:47 -04:00
Anuken	e163a80ba7	Merge pull request #2748 from ballgamer56/patch-2 ... Update Thai translation	2020-10-23 09:25:05 -04:00
Anuken	a0f55861fe	Merge pull request #3028 from GlennFolker/master ... allow mods to easily load icon region	2020-10-23 09:21:43 -04:00
Anuken	d66cf13ac6	Added buttons to clear campaign saves & research	2020-10-23 09:08:17 -04:00
Anuken	436a020c3e	Fixed attack mode gamover check	2020-10-22 20:44:18 -04:00
Anuken	23673f0b11	typo	2020-10-22 20:34:02 -04:00
Anuken	bd659d2c97	Don't clear legacy unlocks after read	2020-10-22 20:33:26 -04:00
Anuken	514e2503fa	Editor generation cleanup	2020-10-22 19:26:55 -04:00
MEEP of Faith	5203d17910	Comment stuff	2020-10-22 15:18:12 -07:00
Anuken	4f21ea7799	Fixed archipelago map / filters messing with block data	2020-10-22 18:11:12 -04:00
Anuken	a773edd838	(slightly) fewer polys in campaign	2020-10-22 17:12:38 -04:00
Anuken	ace9aebf2b	Fixed #3068	2020-10-22 16:28:08 -04:00
Anuken	a2e75df096	Map editor tweaks & fixes / New map	2020-10-22 15:27:30 -04:00
Anuken	c2ff5a69ef	Buffered map-load filter support / Spawn path filter	2020-10-22 12:27:22 -04:00
YellOw139	f4fcb8daa6	Update bundle_ro.properties	2020-10-22 19:14:48 +03:00
Anuken	46b2f4cccb	Minor bugfixes & wave tweaks	2020-10-22 11:54:27 -04:00
Felix Corvus	c63b98150f	Merge branch 'master' into master	2020-10-22 18:21:52 +03:00
Vanguard	91164f659b	smol breyn	2020-10-22 18:02:39 +03:00
Vanguard	70750920fa	anuke shenanigans ... a lot of them	2020-10-22 17:14:41 +03:00
Anuken	a732237005	Allowed enemy spawns on water	2020-10-22 09:43:21 -04:00
YellOw139	76d2fc0f54	Typo	2020-10-22 16:23:21 +03:00
Anuken	f2dd5ba113	Fixed #3062 / Fixed #3064	2020-10-22 09:11:48 -04:00
YellOw139	4d28b5083c	Quezler Status Fielded my mind	2020-10-22 14:27:56 +03:00
MEEP of Faith	da3c11a201	Comments	2020-10-21 23:14:54 -07:00
YellOw139	dabdf514d6	Space	2020-10-22 07:50:35 +03:00
MEEP of Faith	e7b6013d8d	doot	2020-10-21 21:39:55 -07:00
MEEP of Faith	ed2825b0d9	doot	2020-10-21 21:37:52 -07:00
MEEP of Faith	50410be90a	Define color instead of based on team	2020-10-21 21:33:57 -07:00
MEEP of Faith	0bd07866d8	m hm	2020-10-21 19:51:32 -07:00
MEEP of Faith	2dd234d960	oopeth	2020-10-21 19:32:29 -07:00
MEEP of Faith	43d1f363e5	Lightning Ability	2020-10-21 19:12:24 -07:00
Anuken	6c13250705	Merge remote-tracking branch 'origin/master'	2020-10-21 20:32:40 -04:00
Anuken	f0d74e2705	New map / Unit stat tweaks / FileChooser keyboard input	2020-10-21 20:32:35 -04:00
Anuken	1d65d54d9a	Merge pull request #3055 from summetdev/patch-6 ... [typo] Keybinds and keybinds.	2020-10-21 19:05:50 -04:00
Anuken	b71ae99301	Merge pull request #3054 from Catchears/cleanup ... change surgealloy to surgeAlloy and phasefabric to phaseFabric	2020-10-21 16:34:40 -04:00
Summet	80bd1daea4	typo	2020-10-21 23:34:38 +03:00
YellOw139	21022436e8	Stats are finally consistent and up to date	2020-10-21 22:02:24 +03:00
Anuken	a80d0cc457	Fixed #3053	2020-10-21 14:10:28 -04:00
Wiki Updater	4d575364f4	change surgeAlloy and phaseFabric	2020-10-21 20:04:41 +02:00
Volas171	dec9e8d4aa	Merge branch 'master' into patch-1	2020-10-21 10:53:20 -05:00
Anuken	87dda1ba4b	Merge remote-tracking branch 'origin/master'	2020-10-21 11:37:48 -04:00
Anuken	1cbcb742e9	Fixed #3052	2020-10-21 11:37:44 -04:00
Anuken	48f5be6623	Merge pull request #3051 from skykatik/patch-1 ... var -> let	2020-10-21 10:48:22 -04:00
Anuken	ee8f18796e	Merge remote-tracking branch 'origin/master'	2020-10-21 10:37:07 -04:00
Anuken	3517da8214	Fixed #3049	2020-10-21 10:37:03 -04:00
Skat	aba001f499	var deprecated, use let or const	2020-10-21 16:05:36 +03:00
키에르	f3f5872159	Merge branch 'master' into patch-5	2020-10-21 20:14:40 +09: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
ballgamer56	f0c5c98633	Merge branch 'master' into patch-2	2020-10-20 20:23:15 +07: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
ballgamer56	8e164269cc	Formated to the newest update ... Updated to commit 2ff749bd17	2020-10-20 20:02:41 +07:00
Summet	ffb94576ac	Better colors ... Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>	2020-10-20 15:04:03 +03:00