speed-dreams/speed-dreams-code
6
0
Fork 1
Code Issues 8 Pull requests 1 Projects Releases Packages Wiki Activity Actions
5129 commits 2 branches 1 tag 38 MiB
Commit graph

247 commits

Author SHA1 Message Date
xavi92
f7dd89b2ad cmake: Add Findrhash.cmake 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9540 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 95341c293c88b1d8d45e351336983b3b152b238d
Former-commit-id: c834c4137793fb5d7e4e22ede64bf02c4e8686d0
 2024-08-12 23:59:58 +00:00
xavi92
6f1afb68b6 thirdpartydeps.cmake: Fix wrong reference to minizip 
Findminizip.cmake does not define MINIZIP_LIBRARY, but
minizip_LIBRARIES. Ideally, minizip::minizip should be used instead, but
that seems not to work for some unknown reason.


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9531 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: c06a8fe688535315e10a1ece4175eda032d1b850
Former-commit-id: 053d6039517c16770d0b9a8994c72ba58f0c2da1
 2024-08-09 10:06:24 +00:00
iobyte
8b191adc24 fix for FindCJSON.cmake from Joe 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9525 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: db9300ec7995fb4c3e510d9b15ff466fc541971b
Former-commit-id: c64f88857c9c9f09752e89cc8aca1702898b8980
 2024-08-04 17:38:07 +00:00
iobyte
de681128e2 more windows build work 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9524 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 692a5d4cc221908ddaed30eb3dfa80abfb7079e6
Former-commit-id: eae44d17673ae4d2cbaf4580c3ac0619255ce757
 2024-08-04 16:18:22 +00:00
iobyte
61bd378a68 add FindcJSON.cmake 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9516 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 35b9ac5c374c32c9424b2b67a9837adbbe1316e8
Former-commit-id: 622ebf17bcd80adf777f4317bf5e6e572fd4d8da
 2024-07-31 14:26:04 +00:00
iobyte
81fce0966e add cJSON and minizip to thirdpartydeps.cmake 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9515 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 5f4a5f51923ea856e8bc54989ac4d8ac1e9a478f
Former-commit-id: 035caa02e3af984140911cf92620990212af27a6
 2024-07-31 14:04:58 +00:00
iobyte
02274c89c7 fix checks.cmake 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9511 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 55c34f8296c7ae2840187dce3de63487269f865c
Former-commit-id: b6791f3e00792155e8cc32844f88e377f57da33a
 2024-07-31 01:14:47 +00:00
iobyte
d7262c6526 fix Windows eventloop crash 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9510 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 50f2810b869040a5343e3b322cbd8f3dbcc09cc1
Former-commit-id: 6e4960da072b9cc99bf3540561bb15fe853f9e70
 2024-07-31 01:03:57 +00:00
xavi92
e06a519365 Remove trailing newlines 
The following shell script was used:

while read f
do
	sed -i -e :a -e '/^\n*$/{$d;N;};/\n$/ba' -- "$f"
done <<EOF
$(svn ls -R | grep \
	-e '.\cpp$' \
	-e '\.cmake$' \
	-e '\.txt$' \
	-e '\.cppcheck$' \
	-e '\.frag$' \
	-e '\.h$' \
	-e '\.hpp$' \
	-e '\.vert$' \
	-e '\.xml$' \
	-e '\.java$' \
	-e '\.c$')
EOF


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9509 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: aac7ab5702079417cb16ca2fa291be07033ea549
Former-commit-id: f0286e4119f166d7b78f9d13ff2ea04ffaa95c67
 2024-07-30 22:17:48 +00:00
xavi92
6d7ca06e02 String trailing whitespaces 
The following shell script was used:

while read f
do
        sed -Ei 's/[[:space:]]+$//g' "$f"
done <<EOF
$(svn ls -R | grep \
        -e '.\cpp$' \
        -e '\.cmake$' \
        -e '\.txt$' \
        -e '\.cppcheck$' \
        -e '\.frag$' \
        -e '\.h$' \
        -e '\.hpp$' \
        -e '\.vert$' \
        -e '\.xml$' \
        -e '\.java$' \
        -e '\.c$')
EOF

As a side effect, this has also converted some files from CRLF line
endings to LF.

File extensions such as .ac or .osg were intentionally left out because
those usually are very large files generated by tools.



git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9507 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 6c1e5ab34415982ec77fc92a77e1b1c149518eca
Former-commit-id: c6cf9480ae7c1d2f9a999eb6c6b976eef8bae3ba
 2024-07-30 21:45:07 +00:00
xavi92
4dd8b822e6 Implement in-game download manager 
This in-game download manager allows users to fetch assets, such as
cars, tracks or drivers, from a configurable list of servers following a
specific JSON schema.

Several smaller classes have been designed to assist the download
manager:

- entry: defines an entry in the assets lists and its state.
- thumbnail: defines a visible entry on the list, will always match
one entry.
- writebuf: allows dumping a file downloaded over HTTP{S} to memory.
- writefile: allows dumping a file downloaded over HTTP{S} to a file.
- unzip: a higher-level, C++ wrapper to minizip.

It was also required to implement a function that removed directories
recursively, namely rmdir_r. Since this is not portable accross POSIX
and Windows systems, their respective implementations have been provided
on src/libs/portability.

The following dependencies have been added:
- libcurl: HTTP{S} operations, already required by webserver.
- OpenSSL: hash calculation.
- minizip: zip extraction, it required its on Findminizip.cmake as it is
not provided by upstream CMake.
- zlib: required by minizip.


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9490 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 915908c54f5ea8d7f6926943b2fea670e9973bea
Former-commit-id: 9cb2a8874779f6b4d9d6201f3d8af8b29c067a13
 2024-07-15 03:27:16 +00:00
beaglejoe
42316114fa Add option to create portable app for Windows 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9208 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: cc1671f4a8010971f5a01ae4d699d4b2b7baca35
Former-commit-id: 711be01c72c5ad62a50fde24d5cf3d339bb06226
 2023-11-05 22:25:58 +00:00
beaglejoe
fe8715ee26 Change OPTION_CLIENT_SERVER default to true 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9045 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: abdfb68fcc6bd39524b4c64c2fdd82804409d516
Former-commit-id: 004ab597c3df8390cc63aa084a2ce69028a2c772
 2023-06-25 23:32:36 +00:00
beaglejoe
a56db0dd29 Add OPTION_PARAM_OPTIMIZER (off by default) 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9019 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 4c53cc43f49a04c2cda9a514987968b695908eec
Former-commit-id: 8f3862aff88d77078789f05e7b1fc268b46b57d8
 2023-06-19 17:30:34 +00:00
torcs-ng
6b431d7eb9 - update option.cmake for tinygltf 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8869 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: be4358ce2355457bf524d2f64864c9194eeacb11
Former-commit-id: a2a8fb826f0da3c58f4b941f7f0af70d3338b6ae
 2023-04-06 08:14:22 +00:00
beaglejoe
d83fadbede Quiet a CMake warning 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8866 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 3044242c4446d039b0e6bd9826174625c2c875f8
Former-commit-id: 22b1796d5784f7b549c07336f5ccde2f2755fbff
 2023-04-04 17:27:56 +00:00
beaglejoe
6b142146cd Find TinyGLTF on Windows 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8865 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 941508cbe6acf08848d3fe00708402fc5e2cde30
Former-commit-id: 5821ec5ab6bf8dea665568198753639fc1287f94
 2023-04-04 15:15:42 +00:00
torcs-ng
a1aa6b25f2 - added option_tinygltf 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8864 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 2a83de7fe9b2e57c1eb68ddd3041a2b4109583b0
Former-commit-id: f616fdfa72c458b387be6c0b78bcdd7b5c0f7236
 2023-04-04 09:19:30 +00:00
beaglejoe
01fd1a0390 Fix typo 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8830 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: a75c7c7d40c7ace67bc8a9e028407e5ce7a175a7
Former-commit-id: 813908b8a2a0bdd7a5a4ef84ce745e677ba48af9
 2023-03-20 13:31:57 +00:00
beaglejoe
0132f49ece Fix for #1240 Start Menu item created for track editor 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8754 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 8e69513bbb13b3fe5995a2f438389630ac12c7c5
Former-commit-id: 9c8d5447424cd7dda07f3be1a9d5dc53ad7b002a
 2023-02-27 03:57:31 +00:00
beaglejoe
f98bd24a29 Fixed some installer links 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8603 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 1e25f16799e03ee500458c25a222bb4bf3bb0e0f
Former-commit-id: e040a457ef766202c426f3fd41114982c38ca73b
 2022-10-19 14:50:20 +00:00
beaglejoe
a86f6b106e Fix ADD_OPENAL_LIBRARY() 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8572 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: f57dd4205a8e8fe6c5b99115784e5df85ef5327b
Former-commit-id: f499e9f4c4a5f4b2a795a57a1827df8546632bbc
 2022-10-01 22:39:51 +00:00
beaglejoe
f5153bab39 Add macros for vulkan, opencl and glm 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8547 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 501781556aab06065620f43f6e7769631b6d6d1f
Former-commit-id: ef597eff033246b5e9efd9f6afe1bfcf1a433df0
 2022-09-25 14:16:46 +00:00
beaglejoe
d7b00adb77 Add FindGLM.cmake 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8546 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 2766a52c29d66a713400502dd97cdba16fcdc3fc
Former-commit-id: f91aa66c7702a55bd3d9e40795efe22358c29f04
 2022-09-25 14:05:12 +00:00
beaglejoe
2d61b4e0ce Update FindPLIB.cmake 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8535 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: d3e3f1d7d44a1bc54756cd7975068a6adea7489f
Former-commit-id: c87d5ed814d0d403113181e6df1ed1f98b53fb5b
 2022-09-20 21:50:49 +00:00
beaglejoe
06c6182318 Allow finding plib via CMAKE_PREFIX_PATH on Windows 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8442 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: d8fb345a9dff5ce6cb87bf7b8bb08ba5d7821502
Former-commit-id: 048934a1ddd753d8ea5d205985e02e0b8c5cb76d
 2022-08-31 16:03:35 +00:00
beaglejoe
67c425e855 Update for Haiku 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8441 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: dac0556a7380c6b95ca282a10113b00fabeed70f
Former-commit-id: 4cba8514c0c60b15f25c4e9cdb0e96a4a4d29092
 2022-08-31 16:02:30 +00:00
beaglejoe
56af97923c Always allow partial builds 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8440 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 126d6b1df407ae0a3dd0535baa9fc2d03fefd6d3
Former-commit-id: b44a5d193a242972a7555bf550a301b94c3ed6ba
 2022-08-31 15:54:32 +00:00
beaglejoe
a4fc24d18b Set eol to native 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8349 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: e49492dd70c0522557550114c99ae13c9072ae8c
Former-commit-id: c0277f48b0633bd173310e94a32eff80b67897f5
 2022-07-31 23:33:33 +00:00
beaglejoe
622dfe74ec Updates for debian packaging 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8332 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: b348e2842eef4d655c77fe64a2b70fdbebe334d3
Former-commit-id: 36c60dd9c29cc11979850aa796b9de394118f458
 2022-07-22 18:31:30 +00:00
beaglejoe
7c56104ad1 Add OPTION_PARTIAL_BUILD for building subset(s) of tarred sources 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8331 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 5082d84e88cd9acdeeb62cc9ec8c2e1a363e39a3
Former-commit-id: 0535fa985a1ec294c8ebfdd5cfc041056709bae2
 2022-07-22 15:57:01 +00:00
beaglejoe
d136c1afab WIP for DEB file creation 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8328 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 3e27cc8bdae8f7b80b6e16b0855b2119f69a7d59
Former-commit-id: cabfa159a94b23324b330f4bade9042bed8d6bfb
 2022-07-20 20:37:03 +00:00
beaglejoe
61c2bb4efa Updated Desktop Shortcut name for Windows all-in-one installer 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8327 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 2573ca269cc941512c42206342a875d72cf779b6
Former-commit-id: 43f0259f20672c967db82730e20a8ac7f8760ea3
 2022-07-20 19:59:14 +00:00
beaglejoe
5130f44494 Added Start menu links to Windows all-in-one installer 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8326 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 9526a9aab29378f98564e0b00396b5b1cddf1c9b
Former-commit-id: f39d53d64dc62a0c05738150bf04010ded0c67fc
 2022-07-20 16:52:59 +00:00
beaglejoe
84935cd39e Added checks for CMake version for newer features 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8325 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 6a1de35b6d38fe05880bbcefcb730a8e7c7b6015
Former-commit-id: 5e6ed948d6cae672ed3f25d5ebe4b42e6f3a0193
 2022-07-20 03:23:27 +00:00
beaglejoe
1ee30dcb72 Fix All-In-One Win installer to launch game if requested 
Fixed contact link

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8324 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 7713f526664437223694c636eeaf31e0a42d0a61
Former-commit-id: 7220c4a937587623cac49e9f289d595d192f2296
 2022-07-20 02:12:16 +00:00
beaglejoe
25228b6836 Fix graphics for the Windows all-in-one installer 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8323 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: ea88836069bef050fb19deaedb824355868f825b
Former-commit-id: 2119f32f9e043248399905173c96749d78f8720d
 2022-07-19 01:59:04 +00:00
beaglejoe
a1ec191819 Add OPTION_ALL_IN_ONE_PACKAGING to make one big installer for Windows(off by default) 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8322 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 582464d0e8cc5d0012201ef40649cc4d2d997787
Former-commit-id: 35e68c900e120d7990fa1cc0e84378e7e96d759e
 2022-07-18 23:55:34 +00:00
beaglejoe
681b24b9d8 Fix for finding new sdl2_mixer 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8321 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: d286fa95ad436f64b5db26bf8328e9db7800dca5
Former-commit-id: 3fe82af8f22d3d1a321eb1e73325fc8bc9a55848
 2022-07-17 02:23:40 +00:00
beaglejoe
b6a3f93d6a Fix spelling 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8319 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: ef20f085233742255da1b06a4a3bf0d237838a16
Former-commit-id: 015338c5cf2f759bbd1703063090d6e6060b7eec
 2022-07-16 21:25:58 +00:00
beaglejoe
d23f559887 Comment out some debug spam 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8273 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: f012cbb9677d4af9d1efdc713dded91aa5118896
Former-commit-id: c2172ed3990e75f7a285daa3ee11c5d0c4753f85
 2022-06-27 21:19:43 +00:00
beaglejoe
e609b85975 Add OPTION_TRACKEDITOR and cmake changes for trackeditor 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8212 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 97fe1ceaffdc195e69a8db384a3be5feb16c2349
Former-commit-id: e72318bbd02fbd752edd6a8e5781498ca9d43555
 2022-06-19 03:01:03 +00:00
beaglejoe
7309853b9b Separate the real weather from OPTION_WEBSERVER. Real weather is now always available 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8126 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 452790a2a0cb9d22be53af0e4545118e00ae66e1
Former-commit-id: 46bd061d6d49cc22646abe0e8d238accc659bfca
 2022-04-26 02:55:50 +00:00
beaglejoe
860f3da9ec Fix OPTION_UNLOAD_SSGGRAPH to work on non-unix platforms 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8087 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 13dfa2824394f4bf8be52f7588290340083e5e73
Former-commit-id: 4aee80883fd949d2649e9c47d06adc32515d4f57
 2022-03-23 15:41:03 +00:00
beaglejoe
ddfb0638b5 Fix OSX base package name 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8080 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 8b11beb95cebd4b2ba2fe220949f5d44fc6e0d97
Former-commit-id: 09afb5e4c4edcfdf493f0d80633937f4abfc69e5
 2022-03-07 20:59:37 +00:00
iobyte
2ca56eaa88 remove cmake OPTIONS_HUDDEBUG and always build OSG debug HUD 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7996 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: e9f9b85d6a514be9a5d79841c106a7d4aa66bc69
Former-commit-id: 4d7cb473c9da9c809185a2077fe92ecf5d9f59fe
 2022-02-04 22:13:02 +00:00
beaglejoe
dc8f8fa292 Fix Ticket #939 prefer newer dependenciescd ins 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7923 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: a701df77902038f6da6d954fb6f3610f56d17260
Former-commit-id: 316bf69eb8dbb504d55b063b8ef2a45398fcccfe
 2022-01-19 02:47:11 +00:00
beaglejoe
cf9a0448d7 Fix osgText added to dll list twice 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7922 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: fd0e8404bbb6e103c8c5025e26d5cbf4254b57a3
Former-commit-id: 7860447b46e651039e6eba2e1be615500bf99e5d
 2022-01-18 23:38:52 +00:00
beaglejoe
990f050708 Don't install the OSG serializers on Windows 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7921 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 5d1222c5920ed6e2fe6b5ffe8b8fa249f6892ad6
Former-commit-id: f0e587e72527b830f68caf26641736b808a9ee7d
 2022-01-18 23:36:02 +00:00
iobyte
898d2e9af1 remove cmake SDL_JOYSTICK and SDL_FORCEFEEDBACK options 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7864 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 37cfd2e624e8e34a4d665f12d3ae378d749986ea
Former-commit-id: 944f9dd83f6befa3ce4afa278c4fc4fd9ed749b1
 2022-01-02 19:19:48 +00:00