434 Commits

Author	SHA1	Message	Date
Eric	9a292ee751	pr tidying	2024-03-13 14:37:06 -07:00
Eric	222f28e626	Latest public/internal sync.	2024-03-13 14:17:11 -07:00
Eric Froemling	3a372c1a31	Merge pull request #670 from 3alTemp/profile-merge-fix ... Profile merge fix	2024-03-13 14:13:00 -07:00
Eric	c955a11956	Latest public/internal sync.	2024-03-13 14:04:42 -07:00
Eric	53e7655a94	formatting and utils work	2024-03-12 14:34:26 -07:00
TrialTemp	3db102a1f0	Merge branch 'efroemling:master' into profile-merge-fix	2024-03-03 13:38:50 -06:00
3alTemp	cf24e42fd0	preflight restruct	2024-03-03 13:38:02 -06:00
3alTemp	4ceced47e6	Profile Merge fix	2024-03-03 13:32:17 -06:00
Eric	c2d88cab28	translations and tidying	2024-03-02 12:21:33 -08:00
Eric	92c189c9b0	pr lang entries and changelog	2024-03-01 20:29:45 -08:00
Eric	4a9dd247b6	Latest public/internal sync.	2024-03-01 20:11:05 -08:00
Eric Froemling	0e5db37db6	Merge branch 'master' into master	2024-03-01 20:07:55 -08:00
Eric Froemling	abac38a542	Merge pull request #648 from 3alTemp/ctf_fix ... CTF Ghost capturing fix 🚩	2024-03-01 20:04:29 -08:00
Vishal	f5ec632f83	Update modutils.py	2024-03-02 09:15:48 +05:30
Eric	a01e5608e0	Latest public/internal sync.	2024-03-01 18:28:46 -08:00
Eric Froemling	9d173c90c9	Merge pull request #652 from vishal332008/master ... Bug Fix and Passing CI	2024-03-01 18:25:42 -08:00
Vishal	1933f67d3d	Fixing conflict	2024-03-02 07:54:51 +05:30
TrialTemp	8f35aa8450	I think	2024-03-01 19:53:46 -06:00
TrialTemp	7b34b5d93a	Merge branch 'master' into ctf_fix	2024-03-01 19:49:44 -06:00
TrialTemp	1c5b28f6dd	Merge branch 'master' into curse_time_fix	2024-03-01 19:45:24 -06:00
Eric Froemling	51a9f39d0d	Merge pull request #654 from 3alTemp/meteor-fix ... Meteor Shower minigame end fix	2024-03-01 17:41:10 -08:00
Eric	c2e68fe7b5	Latest public/internal sync.	2024-03-01 17:40:13 -08:00
Eric Froemling	f065cfb72f	Merge branch 'master' into meteor-fix	2024-03-01 17:38:37 -08:00
Eric	ffa75ac4d1	Latest public/internal sync.	2024-03-01 17:30:29 -08:00
Eric Froemling	7df55ecd14	Merge pull request #667 from brostosjoined/master ... Support IPv6 address on manualtab	2024-03-01 17:27:37 -08:00
Eric	e811679ec5	tidying	2024-03-01 17:08:20 -08:00
Eric Froemling	5a9a5a190d	Merge pull request #659 from VinniTR/patch-7 ... Power-ups affecting melee combat	2024-03-01 16:52:28 -08:00
Eric	15bf8f4c12	getting this ball rolling again after lots of server work	2024-03-01 16:28:18 -08:00
brostos	a7166b2d71	Update manualtab.py	2024-03-02 03:27:29 +03:00
Vishal	4fefd20688	Fixing CI	2024-03-01 10:16:31 +05:30
Vishal	4e9755cb9d	Merge branch 'efroemling:master' into master	2024-03-01 09:20:42 +05:30
Era	32894981cb	Merge branch 'master' into master	2024-02-11 12:37:31 +03:30
Eric	37588433bc	langs and misc library work	2024-02-06 11:12:53 -08:00
Eric	dc6d29de22	dataclassio multitype fixes/tidying	2024-02-01 13:04:11 -08:00
Eric	3186ff6b50	tidying	2024-01-31 14:28:59 -08:00
Eric	e9d31b012c	Latest public/internal sync.	2024-01-31 14:06:13 -08:00
VinniTR	b7a7278139	dale bobo	2024-01-26 00:29:54 -05:00
VinniTR	24270c1a2c	Power-ups no longer affect melee combat.	2024-01-25 23:53:54 -05:00
TrialTemp	b057a371ba	hrm	2024-01-25 16:31:14 -06:00
TrialTemp	8cfb6e0d6e	Merge branch 'master' into curse_time_fix	2024-01-25 16:17:48 -06:00
TrialTemp	6910e30387	pylinted	2024-01-25 16:02:00 -06:00
TrialTemp	79277d028d	Merge branch 'master' into ctf_fix	2024-01-25 15:56:10 -06:00
Eric	4d3f47c0fa	adopted override decorator for python layer	2024-01-24 16:50:13 -08:00
TrialTemp	0d39e7f770	preflighto	2024-01-20 19:27:50 -06:00
TrialTemp	f9b9623423	world changing commit	2024-01-20 19:24:50 -06:00
Eric	e2128b7ee4	updated sendinfo for v2 master-server	2024-01-17 09:10:14 -08:00
Eric	ba60c69a95	moving CloudSubsystem to plus since it requires plus anyway	2024-01-16 13:09:55 -08:00
Eric	7182a29c03	langs and async task support improvements	2024-01-16 12:34:44 -08:00
Vishal	d79b5773f2	Update browser.py	2024-01-12 13:14:00 +05:30
TrialTemp	cae2ee7642	meteor showered :)	2024-01-11 23:56:50 -06:00