9274 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
YellOw139	dabdf514d6	Space	2020-10-22 07:50:35 +03: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
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
Thomas Widyantoko	b82ede8140	Merge pull request #4 from Quick-korkc/patch-4 ... Zone description and typo fixed	2020-10-21 18:21:44 +07: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
Anuken	0878becb33	Merge pull request #3013 from genNAowl/wall-stats ... Add Wall Stats	2020-10-20 19:04:54 -04: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	9a9b1d1a90	Fixed log level code	2020-10-20 11:41:54 -04:00
Anuken	03707ea6cf	arc	2020-10-20 11:41:34 -04:00
Anuken	7731cee219	arc	2020-10-20 11:24:41 -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
Quick-Korc	a1a2007b3e	Zone description and typo fixed	2020-10-20 19:00:13 +07: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