Commit graph

1789 commits

Author SHA1 Message Date
Shpoike
997af19495 Add support for eukara's freehl updates. 2023-08-12 13:59:55 +01:00
Shpoike
ff80b3bd59 Rework maplist command so mod maps are displayed last instead of first (so nearer the input line instead of the order the engine searches them).
Also .bsp vs .bsp.gz etc maps are now ordered consistently too.
Modifiers like maps/foo#bar.ent are now shown separately in the listing too.
Hide maps that are shadowed by a higher-priority gamedir (so no dupes).
Closes https://github.com/fte-team/fteqw/issues/171
2023-08-12 13:59:55 +01:00
Shpoike
6b69fe0378 Be more agressive about ignoring vid_restart inside configs saved by dodgy engines. 2023-08-12 13:59:54 +01:00
Shpoike
0509f7c83c Tweaks for the flatpak builds. 2023-08-12 13:59:54 +01:00
f317282571
Quake II: read the skin, effects, renderfx, and solidsize fields as unsigned shorts (#200)
* Quake II: read the skin, effects, renderfx, and solidsize fields as unsigned shorts.

* Add missing header definition for int MSG_ReadUShort();

* Rename MSG_ReadUShort() to MSG_ReadUInt16() as per @Shpoike's wishes

* solidsize needs to be read in via MSG_ReadSize16 because it does protocol conversions (@Shpoike)

* Q2UFRAME16 and Q2USOUND should be read unsigned as well, as it matches the internal data within FTE (@Shpoike)
2023-07-26 12:12:21 -07:00
Fix
a024a82b89 Remove NPFTE preprocessor stuff 2023-07-09 20:41:24 +02:00
Fix
8adffcecfa remove NPQTV-specific defines 2023-07-09 20:27:30 +02:00
fhomolka
6d83a3218a
Remove NaCl code (#190)
* Remove the nacl dir

* Remove nacl from ifdef checks shared with other platforms

* Remove nacl from build bash scripts

* More removal of nacl from bash scripts

* Remove nacl-specific code from the engine

* More removal of nacl-specific code from the engine

* remove nacl-specific code from the Quake 3 plugin

* Remove nacl from readme (also seems to have force LF line endings)

* Remove nacl mention from browser.txt

* Remove nacl from Makefile

* Remove nacl from dotnet2005 solution file (lol)

* Correcting an endif, this did not end nacl

* Clarification for NaCL no longer needed

* Left small todo for myself

* Partially undo f44daef091bcc5917b0ddb2cbe41ebdd9738f770
the if preproc checking for `_DEBUG` was incorrectly removed
2023-07-01 15:20:13 -07:00
f4044af503
Fix compilation of the 'nocompat' build config. 2023-06-23 15:06:54 -07:00
2fbf78579d
Fix WinNT server builds by not using snprintf and updating FS_FixupFileCase. 2023-06-23 14:32:20 -07:00
Shpoike
75c6527893 csaddon can now create/edit patches. 2023-04-17 03:58:21 +01:00
Shpoike
d37b8d07ff Try fixing te_gunshot with nq protocols. 2023-04-17 03:58:21 +01:00
Shpoike
5082928f36 Try to reduce warning spam. 2023-04-17 03:58:21 +01:00
Shpoike
eaf59671a4 Messing around with flatpak. 2023-04-17 03:58:21 +01:00
Shpoike
1ce399e969 Fix up some obscure builds. 2023-04-17 03:58:21 +01:00
Shpoike
cae062b142 Make updates menu searchable, make qi plugin a little more friendly. 2023-04-17 03:58:21 +01:00
Shpoike
226c1cf6b4 Fix recent console click quirks. 2023-04-17 03:58:21 +01:00
Shpoike
505061a8d2 Add deflate64 support, cos why not. 2023-04-17 03:58:21 +01:00
Shpoike
6f61af8ee9 Cvar description tweaks. 2023-04-17 03:58:21 +01:00
Shpoike
527233154c Clients can now request the master to initiate an WebRTC/ICE connection with 'sv_public 1' servers. This is primarily for the browser port. Servers now report their srflx address via the status command (with fp, ready for secure copy+paste). 2023-04-17 03:58:21 +01:00
Shpoike
727aaec80c Fix console expansion when execing macros, to expand on line execution rather than the entire macro contents. 2023-04-17 03:58:21 +01:00
Shpoike
95d25558ef Move broker address to a cvar, so users can actually change it. 2023-04-17 03:58:21 +01:00
Shpoike
02a8a4fb76 Prevent our sctp implementation from corrupting its inbound messages. 2023-04-17 03:58:20 +01:00
Shpoike
2c8c9b615f Fix some bugs. 2023-04-17 03:58:20 +01:00
Shpoike
f2d54f30d8 Update DTLS stuff, fixing certificate pinning bugs.
We should now support dtls1.2 under win10 (otherwise win7+8 is still stuck with 1.0).
SSQC can now query client certificate info via infokey - *cert_sha1 or *cert_dn
Server addresses can be postfixed with eg ip:port?fp=BASE64 to provide a fingerprint to verify the server without depending on cert authorities.
2023-04-17 03:58:20 +01:00
Shpoike
a5232cfecd Allow manifests to provide signatures for packages. Restart the menus when a package with a menu.dat is enabled. 2023-04-17 03:58:20 +01:00
Shpoike
c5f837d468 Rework some hashfunc_t stuff. 2023-04-17 03:58:20 +01:00
Shpoike
7caee8b453 Improve command arg completion. 2023-04-17 03:58:20 +01:00
Shpoike
22533dfab8 Fix up some minor portability issues. 2023-04-17 03:58:20 +01:00
Shpoike
a70c84a2bc When models include two sets of texture coords, let the glsl actually access them. 2023-04-17 03:58:20 +01:00
Shpoike
d97fd1bfc9 Fix '+set tls_provider foo' not working properly. Fixes https://github.com/fte-team/fteqw/issues/162 2023-04-17 03:58:20 +01:00
Shpoike
990066dea1 Add pm_bunnyfriction cvar to better mimic nq player physics with predictable QW physics. 2023-04-17 03:58:20 +01:00
Shpoike
f54b9b8459 Fix up the web build's text+touch input a little. Make its webrtc cvars more consistent with desktop builds. 2023-04-17 03:58:20 +01:00
Shpoike
5786b43a7d Fix q3 when going into controls menu. 2023-04-17 03:58:20 +01:00
Shpoike
854fb60db8 Revert "Quake II: Set allow_skybox to 1 by default, as many maps (notable those in Mission Pack 2) use sky volumes to light the scenery within playable space."
This reverts commit ebbc6c0930.
2023-04-17 03:58:19 +01:00
177f09c21e
Enable -halflife launch option, tweak paths a little. 2023-04-16 18:34:39 -07:00
ebbc6c0930
Quake II: Set allow_skybox to 1 by default, as many maps (notable those in Mission Pack 2) use sky volumes to light the scenery within playable space. 2023-01-15 15:04:18 -08:00
Spoike
e257a9e231 Try to be a bit more verbose about why webrtc might be failing.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6340 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:15:12 +00:00
Spoike
fcbfc90892 Make our mini http server report timestamps better, so wget's timestamping is happy.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6338 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:14:57 +00:00
Spoike
b2df9b2b30 Try to avoid sigpipe errors from tcp connections.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6337 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:14:49 +00:00
Spoike
fb4531ea6c Attempt to improve touchscreen behaviours with onscreen buttons that appear upon touch events (and fade out). Long presses should close menus etc. Likely needs some more work.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6335 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:14:38 +00:00
Spoike
d4d84aec9d Show at least one address for each socket we're listening on, even if its loopback, instead of nothing at all.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6334 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:14:26 +00:00
Spoike
1fb00b3721 Avoid the use of RETURN_CSTRING for cvar string values that might get cached by qc beyond the engine freeing the implied memory (crashes were reported by pjt/newby).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6319 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:12:46 +00:00
Spoike
503162aefe Add file uri support, requires a '-allowfileurl' commandline argument.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6318 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:12:39 +00:00
Spoike
9c47966653 Add -unsafefopen commandline argument to allow disabling the qc fopen sandboxing (like the original frik_file spec).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6316 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:12:26 +00:00
Spoike
2383c618ee Fix up some SDL issues.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6315 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:12:12 +00:00
Spoike
6307ae1303 add base64encode and base64decode builtins. Allow the second arg of registercommand builtin to specify a description for that command.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6314 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:12:04 +00:00
Spoike
3be61ca1bc Make sure the rerelease's models can do colourmapping properly.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6310 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:11:40 +00:00
Spoike
df6b651eeb Better compat with QE. EX_PROMPT now supported serverside (emulated for non-qe clients). Per-client localisation now works. Scoreboards are now a little nicer when running mods with well-defined teams (eg NQ ssqc).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6309 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:11:34 +00:00
Spoike
2e84a3b96a Fix up some docs.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6307 fc73d0e0-1445-4013-8a0c-d673dee63da5
2023-01-09 05:11:17 +00:00
Spoike
16c8e521ef Protocol compat with the Rerelease Update 4, at the expense of earlier versions.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6306 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-08-19 13:30:16 +00:00
Spoike
a0f2ffda90 Try to fix up some ICE quirks.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6302 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-08-07 23:49:33 +00:00
Spoike
cbb18429f1 Work around a gcc optimisation bug.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6301 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-07-28 02:18:11 +00:00
Spoike
89fde9c5e4 Some more ICE polish.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6300 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-07-28 02:18:05 +00:00
Spoike
e7a8e6b7f3 Our ICE implementation now uses mdns to avoid hairpin issues on lans, for more robustness.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6296 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-07-28 02:17:38 +00:00
Spoike
62e8bb5774 Prevent FTE servers from getting mistreated as NQ servers, this should restore the 'observe' option.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6294 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-07-28 02:17:27 +00:00
Spoike
ce8155f8a1 Only default to sv_listen_nq when running q1.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6293 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-07-28 02:17:16 +00:00
Spoike
de644a5384 Add fence stuff to q2bsp, for Kingpin support.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6291 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-07-28 02:17:05 +00:00
Spoike
4fce9e090d Fix up vrinputs frame times.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6289 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-07-28 02:16:54 +00:00
Spoike
3f85c9793c Add TURN support to our ICE implementation, along with a few fixups. Must be configured with 'net_ice_servers turn:foo?user=foo?auth=bar'. space-separated list, can also accept additional 'stun:' servers.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6285 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-07-28 02:16:31 +00:00
Eukara
03440263e2 Merge PR from GitHub: FRAMEGROUPS: add ability to specify explicit poses instead of the range. Thank you qqshka!
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6283 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-07-20 01:08:51 +00:00
Spoike
c4b043d39f Fix some missing ambient sounds on large bloated maps/mods (this really should have been fixed years ago).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6281 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-06-29 07:20:24 +00:00
Eukara
4afdb54861 Roll back some wastes config changes, as we now have addentity_light...
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6280 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-06-27 19:22:49 +00:00
Spoike
81ab9277ac Make the various build config defines a little more robust.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6277 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-06-26 08:08:43 +00:00
Eukara
d3276ec658 Update wastes config.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6275 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-06-23 18:08:31 +00:00
Spoike
d8364a4cc2 Clean up the q3 plugin a little.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6274 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-06-20 07:16:16 +00:00
Spoike
d41ca13562 Fix fixes.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6273 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-06-20 04:54:54 +00:00
Spoike
9371b7ca14 Be slightly more verbose on tcp failures.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6272 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-06-19 15:18:30 +00:00
Spoike
758f47ffc3 Fix ezhud images not loading.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6271 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-06-19 15:18:23 +00:00
Spoike
d7454f4f78 Add DP_SV_SHUTDOWN, for qqshka.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6267 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-06-19 15:17:54 +00:00
Spoike
1068a62d75 Add vid_baseheight and vid_minsize cvars for TCs unhappy with vid_conheight to put in their default.cfg, instead of them feeling a need to force user settings.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6266 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-06-19 15:17:48 +00:00
Spoike
33665b8d92 Use the correct function for plugins.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6257 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-05-28 18:00:45 +00:00
Spoike
4fc371c7b4 compiler warning fix.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6255 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-05-28 18:00:30 +00:00
Spoike
130d758077 Prevent IQM loader from crashing on bad models.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6250 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-05-28 17:59:45 +00:00
Spoike
368e094dcd Make sure areaportals get reset properly on map changes.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6248 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-05-28 17:59:33 +00:00
Spoike
0f8d07b8e8 Add lerptime protocol extension. Still WIP, don't record to demos.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6247 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-05-28 17:59:26 +00:00
Spoike
255ce795a0 Fix up some KTX issues (mostly bot related).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6246 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-05-28 17:59:17 +00:00
Spoike
f996ff5fc8 Fix up some .wal palette issues when running q2 bsps in q1 gamedirs.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6245 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-05-28 17:59:08 +00:00
Spoike
c45b0e5cf8 Fix up statically linking the ODE plugin into the engine (eukara wanted me to fix this up).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6243 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-05-28 17:58:53 +00:00
Spoike
ef74bc83a0 Make it a smidge easier for server admins to run community maps.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6240 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-05-28 17:58:33 +00:00
Eukara
b8b77e2a1d Update config_wastes.h for an upcoming playtest.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6237 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-05-27 18:33:48 +00:00
Eukara
bc8895c5fa Fix compiles without RTLIGHT. Update config_wastes.h
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6235 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-04-23 20:10:18 +00:00
Spoike
5aa018cf5b Fix windows issues with dtls.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6233 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-04-17 19:46:57 +00:00
Spoike
1636db0c6d Fix sequence error with our webrtc sctp support.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6232 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-04-17 19:46:52 +00:00
Spoike
27c32fc1a0 Add a new net_ice_usewebrtc cvar for people that want to skip the extra overheads/bugs of webrtc.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6230 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-04-16 20:28:18 +00:00
Spoike
2ac548e17f Make use of fitz's interpolation hints when they're provided.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6229 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-04-16 20:28:11 +00:00
Eukara
80df4533fe Undefine XAUDIO2 for TWTest
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6228 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-04-16 19:05:10 +00:00
Eukara
7998f9d42c More TW config adjustments in preparation for TWTest
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6227 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-04-16 18:59:50 +00:00
Eukara
6c5bd42d93 Fix compiling with HUFFMAN and HAVE_MEDIA_DECODER disabled, bump ODE version to latest stable.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6226 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-04-10 17:43:33 +00:00
Spoike
6dbfc0ebbe Fix msg_readcount issues.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6218 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-03-08 05:34:26 +00:00
Spoike
0d9a269ab4 Remove last plugin stubs.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6217 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-03-08 05:34:13 +00:00
Spoike
ba9a852d9d Move the q3 files into the plugins subdir.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6216 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-03-08 05:33:52 +00:00
Spoike
1a5c8da880 Make it easier to compile q3 statically.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6215 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-03-08 05:32:38 +00:00
Spoike
73c05fe3b2 Fix up some stubs in the q3 plugin.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6212 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-03-08 05:32:15 +00:00
Spoike
6ceb76233c Move Quake3 support to a plugin. There's still a number of stubs+bugs.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6209 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-03-08 05:31:34 +00:00
Spoike
dd9bdab8dc Add ZG_Free function for zonegroup memory.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6208 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-03-08 05:30:30 +00:00
Spoike
c2633078ff Try to fix up package downloads, and dp-compat downloads too.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6199 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-03-01 02:51:55 +00:00
Spoike
1f707225e3 cmdlist now accepts wildcards. qqshaka was the first to notice it previously sucked.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6195 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-02-19 20:49:49 +00:00
Spoike
01c498d136 Remove Q2 hacks from the usercmd_t type. Just translate them without trying to be clever.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6194 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-02-19 20:49:42 +00:00
Spoike
c5daf67332 Tweak IQM tool to cope with longer bone names.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6189 fc73d0e0-1445-4013-8a0c-d673dee63da5
2022-02-19 20:48:51 +00:00