updated bundled python site-packages

This commit is contained in:
Eric Froemling 2021-06-15 09:13:13 -05:00
parent 9eb7ced21e
commit 33940075af
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
6 changed files with 43 additions and 33 deletions

View File

@ -940,11 +940,12 @@
"assets/build/ba_data/models/zoeTorso.bob": "https://files.ballistica.net/cache/ba1/88/66/74a21f09ca6cfbfe7352219e43e6",
"assets/build/ba_data/models/zoeUpperArm.bob": "https://files.ballistica.net/cache/ba1/99/38/b7694cae0804260eeb337aa1676a",
"assets/build/ba_data/models/zoeUpperLeg.bob": "https://files.ballistica.net/cache/ba1/83/4f/28b2202d0109fa93272c0b09fa2d",
"assets/build/ba_data/python-site-packages/typing_extensions.py": "https://files.ballistica.net/cache/ba1/57/e0/d240d3e3163e12faa7274410aff1",
"assets/build/ba_data/python-site-packages/yaml/__init__.py": "https://files.ballistica.net/cache/ba1/ad/6c/07ad575eb2b280b2d22c53c0938f",
"assets/build/ba_data/python-site-packages/_yaml/__init__.py": "https://files.ballistica.net/cache/ba1/0d/45/65ba92f51d411dcffac8835b6130",
"assets/build/ba_data/python-site-packages/typing_extensions.py": "https://files.ballistica.net/cache/ba1/27/4d/9039ffb4ca5b8110c8f60ad9f1be",
"assets/build/ba_data/python-site-packages/yaml/__init__.py": "https://files.ballistica.net/cache/ba1/1f/8b/c96eb78c4b648a6c64c7f41c4fe7",
"assets/build/ba_data/python-site-packages/yaml/composer.py": "https://files.ballistica.net/cache/ba1/3e/aa/d7fcfc4707ad19a6964d72654b82",
"assets/build/ba_data/python-site-packages/yaml/constructor.py": "https://files.ballistica.net/cache/ba1/ad/dc/d8a51b583ad1cc74917bb189f9f9",
"assets/build/ba_data/python-site-packages/yaml/cyaml.py": "https://files.ballistica.net/cache/ba1/88/22/dbcdaba17d191966de511d8ed5ba",
"assets/build/ba_data/python-site-packages/yaml/constructor.py": "https://files.ballistica.net/cache/ba1/f4/29/cd8c7f5a2296d8f1715ad49b5797",
"assets/build/ba_data/python-site-packages/yaml/cyaml.py": "https://files.ballistica.net/cache/ba1/b4/98/dcdd4c31e2ff2c7a938170694020",
"assets/build/ba_data/python-site-packages/yaml/dumper.py": "https://files.ballistica.net/cache/ba1/10/86/350a48501c2ef0e9e0e524412eab",
"assets/build/ba_data/python-site-packages/yaml/emitter.py": "https://files.ballistica.net/cache/ba1/f2/68/4697cd68fb49c8ef517197535ba0",
"assets/build/ba_data/python-site-packages/yaml/error.py": "https://files.ballistica.net/cache/ba1/7b/d6/a06f6f135d32d5e96d727188346f",
@ -954,7 +955,7 @@
"assets/build/ba_data/python-site-packages/yaml/parser.py": "https://files.ballistica.net/cache/ba1/c0/a6/e94c7a3f8f4f08803f68f9387731",
"assets/build/ba_data/python-site-packages/yaml/reader.py": "https://files.ballistica.net/cache/ba1/0d/58/9196a3104da22ed15afe27f67387",
"assets/build/ba_data/python-site-packages/yaml/representer.py": "https://files.ballistica.net/cache/ba1/95/90/c33c15a683b8d5de614d15031818",
"assets/build/ba_data/python-site-packages/yaml/resolver.py": "https://files.ballistica.net/cache/ba1/1c/80/52660883ae49ff025e35701bc334",
"assets/build/ba_data/python-site-packages/yaml/resolver.py": "https://files.ballistica.net/cache/ba1/8c/fc/fe9be1f19e7b648822029c0dc946",
"assets/build/ba_data/python-site-packages/yaml/scanner.py": "https://files.ballistica.net/cache/ba1/58/be/e6e039c64bf30d0f13aa4d02e2cb",
"assets/build/ba_data/python-site-packages/yaml/serializer.py": "https://files.ballistica.net/cache/ba1/19/a9/f996e312d2ca2d4cb974bcc4f5bc",
"assets/build/ba_data/python-site-packages/yaml/tokens.py": "https://files.ballistica.net/cache/ba1/93/58/d4c7731a1b991391782441f2ba8e",
@ -3933,26 +3934,26 @@
"assets/build/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/1c/e1/4a1a2eddda2f4aebd5f8b64ab08e",
"assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f",
"ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a",
"build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/71/e6/f026fa27c45c64d01501e5e8acd5",
"build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/34/e6/2023348d2e30796113cf9e1fff25",
"build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/74/1d/fc9e33e565475daaac80da5252f0",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/44/f7/50240c38584e0792ad96e33200a2",
"build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/4a/32/d82d49a76b3a6f34ff4470e82ac2",
"build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/78/63/5a90ec89913ea48a7bae6e032925",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c7/8e/17f6ab7057a23b6bd8cf7b546d14",
"build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c1/ca/1ebc3cc5da621c8eb476fd59d87a",
"build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/40/a0/f117a6d90f40768e4c59eb3017bd",
"build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/7b/ac1a200be0f37078af0991faca3b",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e1/b7/33fe4d05e9c1bbeb56f387c78328",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/84/6c/1065ca627d972e618ad112a2735a",
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/0d/c9/d973b09645c8625e9b25b037fb17",
"build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/7c/40/c9cefdd8ea3c47990b8a58ad4c88",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/28/0e/093db7f47c9bf5c5f1c2743e1e87",
"build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fd/f2/230d72c30f73e2a1803724617579",
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/45/c8/61d09e74212a59926ed3b1de5594",
"build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/60/e6/781d68ada0702d5517fc4c73a25f",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/3f/7b/6a6b59318d37ba71c841f3487713",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2e/7a/e742195098e9ca151ad715f421c2",
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/df/a5/e7a9f4f2d662b02d0ca05ae10744",
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/96/29/335b99ad58a7d3adc5290cec27c9",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/da/c2/5169d213b7064afd33d0c137c2b0",
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/8f/35/2a7f5c81b12e9c03ea8cf2b4a5ac",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/74/a3/17c72e2a90f42cf8113ee54140d5",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/94/6e/3d7662462b4a2390e78724dd7571",
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/18/d3/13e89623484056df9b293e5bb557",
"build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/6a/67/03e825ccc7d85940edb896a2a4fa",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e1/91/79f7ea75971674c4429db6f68b52",
"build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e7/de/7aff816cc607f98e6060748a4e43",
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/56/8e/bfd18c93e150f0210b6c59c55779",
"build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ed/dc/cd73fe886f0563e3aa660a0fac63",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2d/64/f6c1ce2c84743a7379adeb480df9",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f3/5a/14a3669b9c0107ea31520b6cfdf4",
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/37/7b/4470cd9677af871e523b95ad0092",
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/fc/ea/96cba4392f86c5207f78eb7c3e97",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/57/81/7b9b1a4ecac8afca7e2a4fcacdc8",
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/70/d7/ce06a0226af75ef6f2a86ac2e5ed",
"build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/7d/b6/475f313a5e1163d8b18f81fda053",
"build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/6c/78/4d4cd81c4b925a202fe4d961ab69",
"build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ce/42/dabc253464415881a92d09a5cbcb",
@ -3969,12 +3970,12 @@
"build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/52/b2/d066bd3e31452e6662d055f7f7a4",
"build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b0/2e/bd0ad8735d54d5fb7cf480f9dc88",
"build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/80/9f/eac377e047bcd3354d20cca82a98",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/5b/7c/db680211090fcd9f1f6362086cbf",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/30/e0/057f49fd6f61f0af5ba596312a4f",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/13/d9/f88a9db30dff01c95598ffcf1485",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/5f/d5/2dd5f85efdbe20b6b31d55b8819a",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/c4/c3/3ab6a365ddd16359613fea37b52b",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/1b/ec/d7cfd9cd30931d0122735496d8b7",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/b0/ba/b71d5a1fcf12ca00221255b5a2a2",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/a1/af/218ccc56019294b3ac3d7cf6d693"
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/74/cf/8cfc5b53618c0b0e3aa8cf05d1e1",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/df/71/f35faeb4f1d5b33a1ad5b7a6c26c",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/09/d0/8fd552e80cf89d6a51430755cb67",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/3b/87/3725a3ad1fd3f20e1ead77b5b7d9",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/aa/1a/71b97598c702ec447f335d76fca8",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/e8/41/db0ba40f1b974228c3a1cb0acc81",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/63/0f/5802a63c95ad9a6b018fff581bd8",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/5a/13/4e296d84e598a9d2dd78acc66122"
}

View File

@ -941,6 +941,8 @@
"ba_data/models/zoeUpperArm.bob",
"ba_data/models/zoeUpperLeg.bob",
"ba_data/python-site-packages/__pycache__/typing_extensions.cpython-38.opt-1.pyc",
"ba_data/python-site-packages/_yaml/__init__.py",
"ba_data/python-site-packages/_yaml/__pycache__/__init__.cpython-38.opt-1.pyc",
"ba_data/python-site-packages/typing_extensions.py",
"ba_data/python-site-packages/yaml/__init__.py",
"ba_data/python-site-packages/yaml/__pycache__/__init__.cpython-38.opt-1.pyc",

View File

@ -2438,6 +2438,7 @@ $(foreach element,$(SCRIPT_TARGETS_PYC_PRIVATE_ANDROID),\
$(eval $(call make-opt-pyc-target,$(element))))
SCRIPT_TARGETS_PY_PRIVATE_COMMON = \
build/ba_data/python-site-packages/_yaml/__init__.py \
build/ba_data/python-site-packages/typing_extensions.py \
build/ba_data/python-site-packages/yaml/__init__.py \
build/ba_data/python-site-packages/yaml/composer.py \
@ -2458,6 +2459,7 @@ SCRIPT_TARGETS_PY_PRIVATE_COMMON = \
build/ba_data/python-site-packages/yaml/tokens.py
SCRIPT_TARGETS_PYC_PRIVATE_COMMON = \
build/ba_data/python-site-packages/_yaml/__pycache__/__init__.cpython-38.opt-1.pyc \
build/ba_data/python-site-packages/__pycache__/typing_extensions.cpython-38.opt-1.pyc \
build/ba_data/python-site-packages/yaml/__pycache__/__init__.cpython-38.opt-1.pyc \
build/ba_data/python-site-packages/yaml/__pycache__/composer.cpython-38.opt-1.pyc \

View File

@ -31,10 +31,12 @@ class AboutGatherTab(GatherTab):
region_left: float,
region_bottom: float,
) -> ba.Widget:
party_button_label = ('X' if ba.app.iircade_mode else ba.charstr(
ba.SpecialChar.TOP_BUTTON))
message = ba.Lstr(
resource='gatherWindow.aboutDescriptionText',
subs=[('${PARTY}', ba.charstr(ba.SpecialChar.PARTY_ICON)),
('${BUTTON}', ba.charstr(ba.SpecialChar.TOP_BUTTON))],
('${BUTTON}', party_button_label)],
)
# Let's not talk about sharing in vr-mode; its tricky to fit more

View File

@ -21,7 +21,7 @@
namespace ballistica {
// These are set automatically via script; don't modify them here.
const int kAppBuildNumber = 20379;
const int kAppBuildNumber = 20380;
const char* kAppVersion = "1.6.4";
// Our standalone globals.

View File

@ -1568,6 +1568,9 @@ auto Joystick::GetDeviceIdentifier() -> std::string {
}
auto Joystick::GetPartyButtonName() const -> std::string {
if (g_buildconfig.iircade_build()) {
return "X";
}
return g_game->CharStr(SpecialChar::kTopButton);
}