465 Commits

Author	SHA1	Message	Date
Eric Froemling	30d18fbfa6	Merge pull request #669 from vishal332008/master ... Modding Tools Window	2024-03-13 16:30:37 -07:00
Eric	c6e8869678	Latest public/internal sync.	2024-03-13 16:28:03 -07:00
Eric Froemling	89008f4c27	Merge branch 'master' into respawn_dec	2024-03-13 16:24:00 -07:00
Eric Froemling	f1a557c5ed	Merge pull request #655 from VinniTR/patch-6 ... Update spazbot.py	2024-03-13 16:18:50 -07:00
Eric	cfd09bd363	tidying	2024-03-13 16:14:03 -07:00
Eric Froemling	c0de5d079c	Merge pull request #658 from Dliwk/replay-rewind ... Replay rewind/fast-forward	2024-03-13 15:20:02 -07:00
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
3alTemp	e0505d651c	_	2024-03-05 04:05:24 -06:00
3alTemp	80a2116ad8	ough?? 3	2024-03-05 03:59:15 -06:00
TrialTemp	6ac5959093	ough 2	2024-03-05 03:49:17 -06:00
3alTemp	460137bc39	ough	2024-03-05 03:44:36 -06: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
Vishal	e35efe7f97	Merge branch 'efroemling:master' into master	2024-03-03 08:28:03 +05:30
Roman Trapeznikov	3b4be30925	Merge branch 'master' into replay-rewind	2024-03-02 23:26:43 +03:00
Eric	c2d88cab28	translations and tidying	2024-03-02 12:21:33 -08:00
Vishal	59b636dd8f	Update modutils.py	2024-03-02 19:38:19 +05:30
Vishal	ce089fed71	Fixing up a few stuff	2024-03-02 14:14:58 +05:30
Vishal	002c317f49	Add files via upload	2024-03-02 13:28:29 +05:30
Vishal	f61f55f905	Update _subsystem.py	2024-03-02 13:00:56 +05:30
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
VinniTR	51445134fe	remove first change	2024-03-01 22:58:44 -05:00
Vishal	f5ec632f83	Update modutils.py	2024-03-02 09:15:48 +05:30
3alTemp	08f5979742	Merge branch 'respawn_dec' of https://github.com/3alTemp/ballistica into respawn_dec	2024-03-01 21:44:02 -06:00
3alTemp	3c4aaa7fc4	https://media1.tenor.com/m/FcVrboOogkQAAAAC/my-bad	2024-03-01 21:42:47 -06:00
TrialTemp	13408cb1f0	Merge branch 'master' into respawn_dec	2024-03-01 21:35:41 -06:00
3alTemp	020aa8829a	CI fix I think...	2024-03-01 21:34:38 -06:00
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