642 Commits

Author SHA1 Message Date
Eric Froemling
89008f4c27
Merge branch 'master' into respawn_dec 2024-03-13 16:24:00 -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 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
4ed42f11f3
Do the changelog.,, 2024-03-03 13:47:22 -06:00
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
Eric
92c189c9b0
pr lang entries and changelog 2024-03-01 20:29:45 -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
TrialTemp
13408cb1f0
Merge branch 'master' into respawn_dec 2024-03-01 21:35:41 -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
c2e68fe7b5
Latest public/internal sync. 2024-03-01 17:40:13 -08:00
Eric
e811679ec5
tidying 2024-03-01 17:08:20 -08:00
Eric
15bf8f4c12
getting this ball rolling again after lots of server work 2024-03-01 16:28:18 -08:00
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
Roman Trapeznikov
96af95ef03
Merge branch 'master' into replay-rewind 2024-02-10 00:49:14 +03: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
TrialTemp
8cfb6e0d6e
Merge branch 'master' into curse_time_fix 2024-01-25 16:17:48 -06:00
TrialTemp
7a463bcbfb
Merge branch 'master' into respawn_dec 2024-01-25 16:08:12 -06:00
TrialTemp
79277d028d
Merge branch 'master' into ctf_fix 2024-01-25 15:56:10 -06:00
Roman Trapeznikov
dad50e2141
wired up ui 2024-01-25 23:25:27 +03:00
Eric
4d3f47c0fa
adopted override decorator for python layer 2024-01-24 16:50:13 -08:00
TrialTemp
f9b9623423
world changing commit 2024-01-20 19:24:50 -06:00
Eric
7182a29c03
langs and async task support improvements 2024-01-16 12:34:44 -08:00
TrialTemp
4fba339851 changed some logs 2024-01-11 19:42:13 -06:00
Era
1ef7bf5af2
Merge branch 'master' into master 2024-01-10 23:42:18 +03:30
TrialTemp
4bb9d3bfb0
Merge branch 'efroemling:master' into ctf_fix 2024-01-08 03:58:17 -06:00
Eric
f11d4ac261
langs and tidying 2024-01-06 12:29:57 -08:00
Era
0224e2a0da
Merge branch 'master' into master 2024-01-06 14:49:54 +03:30
TrialTemp
5d5b05a7d9 Update CHANGELOG.md 2024-01-05 22:15:25 -06:00
Eric
8f8a32d24d
some copyright date updates for 2024 2024-01-05 16:27:12 -08:00
Eric
be47de516a
tidying 2024-01-05 16:07:43 -08:00
Eric
9b6144a0f1
changlog update 2024-01-05 15:47:53 -08:00
Eric
6261ea2dde
assets and tidying for replay-play-pause PR 2024-01-05 15:31:10 -08:00
Eric
23bee35787
tidying 2024-01-05 14:16:13 -08:00
Eric
6f2382fe69
added show-demos-when-idle option 2024-01-05 13:54:15 -08:00
Eric
87bf4e3435
language updates, bug fixes, and tidying 2024-01-03 10:24:27 -08:00
Era
b925aa31f9
changelog 2023-12-23 21:59:56 +03:30
Era
2c66a5f245
Updated CHANGELOG and CONTRIBUTORS 2023-12-22 23:32:02 +03:30
Eric
0dcad474d5
version bump 2023-12-21 10:26:50 -08:00