2300 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Eric	53e7655a94	formatting and utils work	2024-03-12 14:34:26 -07: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	1f811a2f52	Merge pull request #640 from EraOSBeta/master ... QoL for Teams Sessions, FFA Sessions, and Servers	2024-03-01 20:08:55 -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
Eric Froemling	b71ea9b296	Merge pull request #668 from vishal332008/master ... Update modutils.py	2024-03-01 19:51:58 -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
Eric Froemling	4da36f100c	Merge pull request #656 from 3alTemp/curse_time_fix ... Spaz curse_time fixo	2024-03-01 17:50:04 -08:00
TrialTemp	7b34b5d93a	Merge branch 'master' into ctf_fix	2024-03-01 19:49:44 -06:00
Eric	fb015da7f3	Latest public/internal sync.	2024-03-01 17:47:16 -08: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
brostos	1907c344ae	Update CONTRIBUTORS.md	2024-03-02 03:35:22 +03: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	5c0d768dcc	Update CHANGELOG.md	2024-02-11 12:38:49 +03: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
Roman Trapeznikov	c3f49de1a2	Update bug_report.md	2024-01-26 18:54:09 +03:00
Roman Trapeznikov	c01cb78e06	Update bug_report.md ... fix yaml :(	2024-01-26 15:14:25 +03:00
Roman Trapeznikov	3b1e9e56a7	Update bug_report.md	2024-01-26 15:12:53 +03: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 Froemling	978f32f9f0	ci fix 2	2024-01-24 17:08:08 -08:00
Eric Froemling	e0f8bfd2ae	ci fix	2024-01-24 17:03:12 -08: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