807 Commits

Author SHA1 Message Date
TrialTemp
3822446e94
Merge branch 'master' into kill-on-leave 2024-03-13 19:41:49 -06:00
TrialTemp
7afbadabcd
Merge branch 'master' into tournament_entry 2024-03-13 19:41:05 -06:00
3alTemp
3786e2bfb3
Tweakeroo'd 2024-03-13 19:39:26 -06:00
3alTemp
dab05db331
Reduced maxwidth arg. 2024-03-13 19:18:44 -06:00
TrialTemp
35eef88689
Merge branch 'master' into hex-color-pick 2024-03-13 19:04:17 -06:00
Eric
896aa9c663
Latest public/internal sync. 2024-03-13 17:58:38 -07:00
Eric Froemling
b52fbf198b
Merge branch 'master' into keybind_reset 2024-03-13 17:45:48 -07:00
Eric
8e929e89f0
pubsync and ci fix 2024-03-13 17:32:08 -07:00
Eric Froemling
d6dca9e83f
Merge pull request #649 from SoK05/master
Runaround - Heartbeat behavior
2024-03-13 17:16:01 -07:00
Eric
68acd9eb85
public/internal sync 2024-03-13 17:11:17 -07:00
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
TrialTemp
498e6acb7b
brain hurting 2024-03-13 12:12:34 -06:00
TrialTemp
2fdf006030
ci compliant? 2024-03-13 12:04:43 -06:00
TrialTemp
277c5f14ca
Merge branch 'master' of https://github.com/SoK05/ballistica-sok 2024-03-13 11:50:00 -06:00
TrialTemp
57510085e5
ci compliant 2024-03-13 11:49:40 -06:00
TrialTemp
1db6ebe957
Merge branch 'master' into master 2024-03-13 11:43:52 -06: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
3alTemp
7a954af5d0
fixo 2024-03-05 03:09:49 -06:00
3alTemp
6980c6669c
cleanup 2024-03-05 03:04:08 -06:00
3alTemp
c312a0206a
_ 2024-03-05 02:51:32 -06:00
3alTemp
8bdd4b9cdd
underscore jumpscare 2024-03-05 02:42:45 -06:00
TrialTemp
a1bb24e3e2
Merge branch 'master' into tournament_entry 2024-03-05 02:30:16 -06:00
3alTemp
5ad94067eb
changed logs, flown pres 2024-03-03 22:26:16 -06:00
3alTemp
f30e8be399
yeah 2024-03-03 22:11:20 -06:00
3alTemp
f8921c95f5
Merge branch 'kill-on-leave' of https://github.com/3alTemp/ballistica into kill-on-leave 2024-03-03 22:10:55 -06:00
3alTemp
c125cbe123
El code 2024-03-03 22:09:44 -06:00
3alTemp
1a42c50052
El code 2024-03-03 21:46:46 -06:00
3alTemp
4309ee56e4
That should do it! 2024-03-03 20:54:53 -06:00
3alTemp
0d27a54835
MyPy is YourPy 2024-03-03 20:52:18 -06:00
3alTemp
d8a9a881f4
HEX support 2024-03-03 20:41:55 -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