760 Commits

Author SHA1 Message Date
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
3alTemp
6d466ddf84
n°1 ci hater 2024-03-01 23:45:37 -06:00
3alTemp
cf78c23af9
ci 2024-03-01 23:26:57 -06:00
3alTemp
4d6dc231c7
... button 2024-03-01 23:15:58 -06: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
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
TrialTemp
a9b587b5e7
Merge branch 'master' into keybind_reset 2024-03-01 21:45:22 -06:00
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
bdee3c7c04
Merge branch 'master' into tournament_entry 2024-03-01 19:47:08 -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
Roman Trapeznikov
96af95ef03
Merge branch 'master' into replay-rewind 2024-02-10 00:49:14 +03:00
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
SoK05
819edc18eb pylint fix 2024-01-25 23:18:11 +01:00
TrialTemp
8cfb6e0d6e
Merge branch 'master' into curse_time_fix 2024-01-25 16:17:48 -06:00
TrialTemp
de70c1bf74
Merge branch 'master' into tournament_entry 2024-01-25 16:16:57 -06:00