2281 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Eric Froemling	4da36f100c	Merge pull request #656 from 3alTemp/curse_time_fix ... Spaz curse_time fixo	2024-03-01 17:50:04 -08: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
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	8cfb6e0d6e	Merge branch 'master' into curse_time_fix	2024-01-25 16:17:48 -06:00
TrialTemp	d6cce8e3fb	pylinted	2024-01-25 16:08:43 -06:00
TrialTemp	7a463bcbfb	Merge branch 'master' into respawn_dec	2024-01-25 16:08:12 -06:00
TrialTemp	6910e30387	pylinted	2024-01-25 16:02:00 -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
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	bd47a61f2f	look	2024-01-11 23:57:23 -06:00
TrialTemp	cae2ee7642	meteor showered :)	2024-01-11 23:56:50 -06:00
TrialTemp	4fba339851	changed some logs	2024-01-11 19:42:13 -06:00
TrialTemp	1043a38d9d	setting shenanigans	2024-01-11 19:36:46 -06:00
Vishal	bd6e8f9822	Update browser.py	2024-01-11 22:36:47 +05:30
Vishal	7b2879275e	Update browser.py	2024-01-11 22:33:03 +05:30