mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-25 08:23:35 +08:00
resolve merge conflict
Merge branch 'master' of github.com:efroemling/ballistica into docs-generation
This commit is contained in:
Roman Trapeznikov
commit
b5ff2f6683
130
.efrocachemap
130
.efrocachemap
@ -420,41 +420,41 @@
|
||||
"assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/51/eb/0a567253cc08c94c5d315a64d9af",
|
||||
"assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/bc/8f/a9c51a09c418136e386b7fdf21c7",
|
||||
"assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/02/e5/84916e123f47ccf11ddda380d699",
|
||||
"assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/f4/ee/ee34ed3985e810bd795c7979ec95",
|
||||
"assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/0a/8c/4b3344df186e2f26d959bd886c72",
|
||||
"assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/0f/e1/94378b32c786d5365a7810a15d73",
|
||||
"assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/55/8c/8d0a0585e434b94865ae4befc090",
|
||||
"assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/fc/a4/813e4ef8c4204d8616aa68a80891",
|
||||
"assets/build/ba_data/data/languages/chinesetraditional.json": "https://files.ballistica.net/cache/ba1/ff/7c/3bcab4ae1f39977434acb0d6f795",
|
||||
"assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/f6/21/951b7ff02b0ad14b1f0ac55763c4",
|
||||
"assets/build/ba_data/data/languages/chinesetraditional.json": "https://files.ballistica.net/cache/ba1/ef/c2/a607f318b815f025a20ab92f0a7b",
|
||||
"assets/build/ba_data/data/languages/croatian.json": "https://files.ballistica.net/cache/ba1/66/bf/6e98398016da261296b8c306560e",
|
||||
"assets/build/ba_data/data/languages/czech.json": "https://files.ballistica.net/cache/ba1/19/c5/2b1ae9e2b622892ff8c0beaad25b",
|
||||
"assets/build/ba_data/data/languages/czech.json": "https://files.ballistica.net/cache/ba1/82/61/8319e81bc3fed77e8319a2fd6988",
|
||||
"assets/build/ba_data/data/languages/danish.json": "https://files.ballistica.net/cache/ba1/3f/46/e4da3c1d2b0ebf916df55c608b28",
|
||||
"assets/build/ba_data/data/languages/dutch.json": "https://files.ballistica.net/cache/ba1/97/90/39ba65c2ad714429aec82ea1ae3e",
|
||||
"assets/build/ba_data/data/languages/english.json": "https://files.ballistica.net/cache/ba1/5a/63/382c2cd707cd34d232f28f45f5d3",
|
||||
"assets/build/ba_data/data/languages/english.json": "https://files.ballistica.net/cache/ba1/99/2a/bdcfa0932cf73e5cf63fd8113b1b",
|
||||
"assets/build/ba_data/data/languages/esperanto.json": "https://files.ballistica.net/cache/ba1/4c/c7/0184b8178869d1a3827a1bfcd5bb",
|
||||
"assets/build/ba_data/data/languages/filipino.json": "https://files.ballistica.net/cache/ba1/b3/3b/65ec8c4100bf9170b85ad9b23164",
|
||||
"assets/build/ba_data/data/languages/french.json": "https://files.ballistica.net/cache/ba1/f7/15/08a411143de698f715c69551cea3",
|
||||
"assets/build/ba_data/data/languages/german.json": "https://files.ballistica.net/cache/ba1/83/a3/01a5ba0d128630afd31ecb518f82",
|
||||
"assets/build/ba_data/data/languages/filipino.json": "https://files.ballistica.net/cache/ba1/00/70/fabda1781ddbb540cd1c2a6278db",
|
||||
"assets/build/ba_data/data/languages/french.json": "https://files.ballistica.net/cache/ba1/b6/e0/37dd30b686f475733ccc4b3cab49",
|
||||
"assets/build/ba_data/data/languages/german.json": "https://files.ballistica.net/cache/ba1/20/3f/198dcc5cfed5789042e1595bd048",
|
||||
"assets/build/ba_data/data/languages/gibberish.json": "https://files.ballistica.net/cache/ba1/03/6a/4db89c5bf1ced8eb5a5615a4ae64",
|
||||
"assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/01/ea/cd9dac4a24a5c92495c37cd98371",
|
||||
"assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/8c/8e/67de1d9997a66299c8881d44ab22",
|
||||
"assets/build/ba_data/data/languages/hindi.json": "https://files.ballistica.net/cache/ba1/c2/f5/e7549f5179c22c6da97fafffc058",
|
||||
"assets/build/ba_data/data/languages/hungarian.json": "https://files.ballistica.net/cache/ba1/2d/e5/3737c6c3979cf381321c5472bea5",
|
||||
"assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/b1/81/d99fb5b8c368430944b357aa15fe",
|
||||
"assets/build/ba_data/data/languages/italian.json": "https://files.ballistica.net/cache/ba1/d7/f0/436072225f713259eaa5fa39ba5d",
|
||||
"assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/75/70/e33e6ee95830052e8f36cd2135f7",
|
||||
"assets/build/ba_data/data/languages/italian.json": "https://files.ballistica.net/cache/ba1/c7/16/e31ce16d1b4150c271401669f24f",
|
||||
"assets/build/ba_data/data/languages/korean.json": "https://files.ballistica.net/cache/ba1/d7/8b/acdfb39196be7856f8bad77eb6a0",
|
||||
"assets/build/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/f1/49/a7a94c6a662f65de4d8e9d5303f4",
|
||||
"assets/build/ba_data/data/languages/polish.json": "https://files.ballistica.net/cache/ba1/04/fa/b24dd48bfbf3c2d67ee5ad1269c3",
|
||||
"assets/build/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/83/e8/26ccc434b55b79a343cfe8cfaa7d",
|
||||
"assets/build/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/02/ab/e310f81582b6dc2ae93348d45166",
|
||||
"assets/build/ba_data/data/languages/polish.json": "https://files.ballistica.net/cache/ba1/d5/fe/422745cdbe51ccb4f2ced6f5554a",
|
||||
"assets/build/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/26/41/f1246ab56c6b7853f605c3a95889",
|
||||
"assets/build/ba_data/data/languages/romanian.json": "https://files.ballistica.net/cache/ba1/82/12/57bf144e12be229a9b70da9c45cb",
|
||||
"assets/build/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/97/38/c8ae1079059dd6b6579c89802ed8",
|
||||
"assets/build/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/e8/25/a304de7a79195cb37ce9340e4194",
|
||||
"assets/build/ba_data/data/languages/serbian.json": "https://files.ballistica.net/cache/ba1/e6/59/af13a5d296da5935699bec902ed7",
|
||||
"assets/build/ba_data/data/languages/slovak.json": "https://files.ballistica.net/cache/ba1/9f/a6/a2c9d7f3f90a2320aa45ccfd65cd",
|
||||
"assets/build/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/6d/25/745fec991d43eadfbde149d897bf",
|
||||
"assets/build/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/87/5d/d36a8a2e9cb0f02731a3fd7af000",
|
||||
"assets/build/ba_data/data/languages/swedish.json": "https://files.ballistica.net/cache/ba1/50/9f/be006ba19be6a69a57837eb6dca0",
|
||||
"assets/build/ba_data/data/languages/tamil.json": "https://files.ballistica.net/cache/ba1/3c/cf/89114640ffa253721583c0d2699b",
|
||||
"assets/build/ba_data/data/languages/tamil.json": "https://files.ballistica.net/cache/ba1/cb/11/e11957be752c3dc552898b60ab20",
|
||||
"assets/build/ba_data/data/languages/thai.json": "https://files.ballistica.net/cache/ba1/74/3d/c3d40a1e5ee1edf82555da05eda9",
|
||||
"assets/build/ba_data/data/languages/turkish.json": "https://files.ballistica.net/cache/ba1/e8/0b/6825043ce101a831732eb9c97e4f",
|
||||
"assets/build/ba_data/data/languages/turkish.json": "https://files.ballistica.net/cache/ba1/0a/4f/90fcd63bd12a7648b2a1e9b01586",
|
||||
"assets/build/ba_data/data/languages/ukrainian.json": "https://files.ballistica.net/cache/ba1/87/20/259904441097b886b841d7c4d09a",
|
||||
"assets/build/ba_data/data/languages/venetian.json": "https://files.ballistica.net/cache/ba1/35/31/47dbbc1e3a581565681d4a0c0361",
|
||||
"assets/build/ba_data/data/languages/venetian.json": "https://files.ballistica.net/cache/ba1/71/59/356404b8db683d8c946a40ca02e5",
|
||||
"assets/build/ba_data/data/languages/vietnamese.json": "https://files.ballistica.net/cache/ba1/0b/24/3cc2b5a6ebe4bca1e01b40f8ed09",
|
||||
"assets/build/ba_data/data/maps/big_g.json": "https://files.ballistica.net/cache/ba1/47/0a/a617cc85d927b576c4e6fc1091ed",
|
||||
"assets/build/ba_data/data/maps/bridgit.json": "https://files.ballistica.net/cache/ba1/03/4b/57ee9b42854b26f23f81bd8c58ef",
|
||||
@ -944,7 +944,11 @@
|
||||
"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/_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/26/a1/b771d51fc1cc475cf1f44f9d43d2",
|
||||
"assets/build/ba_data/python-site-packages/certifi/__init__.py": "https://files.ballistica.net/cache/ba1/ce/d9/322bf171d394cc808da13acf80fe",
|
||||
"assets/build/ba_data/python-site-packages/certifi/__main__.py": "https://files.ballistica.net/cache/ba1/b2/bb/d7d8216212bcf66cdc3067700fb7",
|
||||
"assets/build/ba_data/python-site-packages/certifi/cacert.pem": "https://files.ballistica.net/cache/ba1/7a/a9/08fc8386cfb7c8680cf9b1a42ef4",
|
||||
"assets/build/ba_data/python-site-packages/certifi/core.py": "https://files.ballistica.net/cache/ba1/57/a9/d6b6a7cb08e2318fbe4bc246f609",
|
||||
"assets/build/ba_data/python-site-packages/typing_extensions.py": "https://files.ballistica.net/cache/ba1/03/bb/cd4d0182aa81d3bc6dcf57044530",
|
||||
"assets/build/ba_data/python-site-packages/yaml/__init__.py": "https://files.ballistica.net/cache/ba1/e5/47/17715ca7620f3b9749558b9dcb2d",
|
||||
"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/f4/29/cd8c7f5a2296d8f1715ad49b5797",
|
||||
@ -3967,50 +3971,50 @@
|
||||
"assets/src/ba_data/python/ba/_generated/__init__.py": "https://files.ballistica.net/cache/ba1/ee/e8/cad05aa531c7faf7ff7b96db7f6e",
|
||||
"assets/src/ba_data/python/ba/_generated/enums.py": "https://files.ballistica.net/cache/ba1/b2/e5/0ee0561e16257a32830645239f34",
|
||||
"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/88/fa/12a0c294c686015a09b4e483fb5a",
|
||||
"build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/58/fd/d72fbca459b185e8afbb06809ed6",
|
||||
"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/12/3f/6bb33262268ec504c42889599d03",
|
||||
"build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/db/53/ea4f6e7fae365e12c005a8d8a207",
|
||||
"build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/17/95/1b4b9f735830a3e4569ff38bcaf3",
|
||||
"build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/53/08/51bcc266af4f781b51f901f1035c",
|
||||
"build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7c/5a/8073a7469267775f911146e5a63b",
|
||||
"build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a4/0b/4b8d1d1860e07d6c310491737038",
|
||||
"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/bc/05/865ee1d03b3bc560e2fb723767f5",
|
||||
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/8d/1c/6e9568248f1314a7b1d4cb4c39ca",
|
||||
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/12/31/a9be39151d99a41505ca048e9629",
|
||||
"build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d3/58/e2b9debb00c8fde97dc38963af0a",
|
||||
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/62/3c/cc07faff46fc8a19efc08c0d3c10",
|
||||
"build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d8/aa/72c60fcf1848c6f4c744390317d3",
|
||||
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/73/75/101c990503a9ba965331040d9bf7",
|
||||
"build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d2/b6/01a84b2ccc5056d6479a3da492d4",
|
||||
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/9b/57/86fdcd4b5646d76ef6c0b433eead",
|
||||
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/6d/ef/4689aedf79f95b27fb584baff536",
|
||||
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/c3/43/f1d740ee7581d08b7bc47e4a1e3c",
|
||||
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/29/2c/d67cc5a3c2af08cedc9f81cc6b31",
|
||||
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/ae/c7/499833108f4a230e576b1d2686f0",
|
||||
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/91/c9/44e47eb68aa3f16bd73f23abda1d",
|
||||
"build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d7/9c/d585f497c36b22f6872b4d8b0d14",
|
||||
"build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/53/cd/7bcdeb377a33413266fcbc066b13",
|
||||
"build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/5c/5b/15c498b609f447f346cd2f004915",
|
||||
"build/prefab/lib/linux_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/62/d4/e6bbb3e7730c9f5a4519c3a94f06",
|
||||
"build/prefab/lib/linux_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ae/2d/6e509a3a27127d365dc9af83ab2b",
|
||||
"build/prefab/lib/linux_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/36/18/b81804ac8d0384fc72f0367371a1",
|
||||
"build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e1/64/fcd5e883cd2c979be76e9e9f7987",
|
||||
"build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c7/6b/8326914b322f281c5ab03c6ced51",
|
||||
"build/prefab/lib/mac_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/0e/07/ae4fffc008f05352690c16ea144f",
|
||||
"build/prefab/lib/mac_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/66/f3/6268d6d28f9412ea65f5fa134749",
|
||||
"build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/59/a3/37af52a4d954b5e13bd690ccbf8c",
|
||||
"build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/88/1e/24ca02cbce792d64c008affbb8b2",
|
||||
"build/prefab/lib/mac_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ba/a8/a8c6e992194a6d8f012ed89b80eb",
|
||||
"build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c4/0c/8469d0febecd1ef898627fb088c7",
|
||||
"build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/1f/b5/540e02a79ac1bae8b4ff74ae73e4",
|
||||
"build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a7/91/f4bc68c09b30b207bf66e62da00a",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/d1/c3/ffd69def77c4564ccb86025bc77b",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/7e/4b/eed633dcb3da435ee44fc917f3bf",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/30/1d/4cd247b5626fccbf9cb4cca8c6f3",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/26/1c/07cd64a03263f572dfdd25438b00",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/20/bf/182851b81a0a14d49cec25d7ed6d",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/fe/ff/703deeb403ee68a4414f60e97309",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/10/b3/19c3d5559ba7e9e877c2f2a51334",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/de/d5/851bca0dd2b7b608eb477075d3d0",
|
||||
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/0f/41/50fb52935e99d22064a846ba0228",
|
||||
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/96/d9/744aaf4cafdab3604c3ade120566",
|
||||
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/fd/da/d960a375186f00e31bfe525c4ddf",
|
||||
"build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/62/27/808783deef688eae80758fd366bb",
|
||||
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/08/13/8d736b50fc456c0f4bf28932cdba",
|
||||
"build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b2/7a/f146b4c46af2d879f9d2001f5549",
|
||||
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/de/5f/fc9a0bead56b3aebbe7ce5fe3e76",
|
||||
"build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a0/f1/1ff103dd68124320676dd5bb55b5",
|
||||
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/60/e1/0a32c6a13ef0584f9fd05c63a14c",
|
||||
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ff/ac/69a19cd8529e3be4c41c6b9dc41b",
|
||||
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/0e/f9/e5c30b3c21cd0f56bf5c2273152b",
|
||||
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/f6/a3/ddeb4ac188dcd75180229af77c7e",
|
||||
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/80/32/eaa12833c0c1058e8de23ba61ef0",
|
||||
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/1a/7e/78c2ca66e9fe29c94e837846b833",
|
||||
"build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/05/31/c89531314b9ad630e191a5821a0c",
|
||||
"build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a6/4f/6ed44d4194bfe50d1fa634823b6d",
|
||||
"build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/4b/c7/948c131d58594bfc9358c76fc9cc",
|
||||
"build/prefab/lib/linux_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/94/57/cd3580bf48aa736523a81bf132b9",
|
||||
"build/prefab/lib/linux_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/6b/80/d71d814dbb7fd2c7062524d74ac3",
|
||||
"build/prefab/lib/linux_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f4/fa/7084c793e3a0de5ada3a4c5ef242",
|
||||
"build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/88/f9/076ea39266eaaf256f75bbed1af3",
|
||||
"build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/11/cc/7a587313f931221d486c0af4868b",
|
||||
"build/prefab/lib/mac_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d4/75/16ff39f4507a3d7b5c063eccea2e",
|
||||
"build/prefab/lib/mac_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/9a/50/1221d18faf9363305f5d8c370a0a",
|
||||
"build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a7/ea/840e778dc33042219f7c7068ef20",
|
||||
"build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/bc/ab/e803c965fa448e268afc49555ab7",
|
||||
"build/prefab/lib/mac_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/44/24/cf847c839553d5ed959550581ac1",
|
||||
"build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/08/e0/90f957a27cba0a9aac1b5269cc95",
|
||||
"build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/0f/85/bee2da67697275c634cd88d5cf4d",
|
||||
"build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/08/0c/9396b12f9653cd7587f6daf5f58d",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/40/12/4f8ac59e0d505e26d672840ec894",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/11/25/0c493ecada2cd87fc84bf7877f3e",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/57/93/363cdc3317d902c9c1f92bd63696",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/6c/9f/2293738027a75bcd83f62ddd9810",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/28/1f/780afd766603475f611e6e6804d7",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/da/1c/a841b30ce31b3b41078948b24fe1",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/77/24/b769aadc90eb68c2183cdad3f719",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/64/22/c1e56da255ca05406a7c45cf22b5",
|
||||
"src/ballistica/generated/python_embedded/binding.inc": "https://files.ballistica.net/cache/ba1/c5/18/29d9fe8e483ce222d3263336f7e6",
|
||||
"src/ballistica/generated/python_embedded/bootstrap.inc": "https://files.ballistica.net/cache/ba1/65/ac/d5c4162a71028c1bfa73ebc1f881"
|
||||
"src/ballistica/generated/python_embedded/bootstrap.inc": "https://files.ballistica.net/cache/ba1/9d/7e/0a5125aa421e722c59d22b8beb19"
|
||||
}
|
||||
25
.idea/dictionaries/ericf.xml
generated
25
.idea/dictionaries/ericf.xml
generated
@ -167,6 +167,7 @@
|
||||
<w>bacfg</w>
|
||||
<w>backgrounded</w>
|
||||
<w>backgrounding</w>
|
||||
<w>backwin</w>
|
||||
<w>bacloud</w>
|
||||
<w>bacloudcmd</w>
|
||||
<w>bacommon</w>
|
||||
@ -183,6 +184,7 @@
|
||||
<w>bametainternal</w>
|
||||
<w>barcolor</w>
|
||||
<w>barebones</w>
|
||||
<w>baseaddr</w>
|
||||
<w>baseh</w>
|
||||
<w>basemult</w>
|
||||
<w>basepos</w>
|
||||
@ -292,12 +294,14 @@
|
||||
<w>bylw</w>
|
||||
<w>bytecount</w>
|
||||
<w>byteswap</w>
|
||||
<w>cacert</w>
|
||||
<w>cachable</w>
|
||||
<w>cachebasename</w>
|
||||
<w>cacheentry</w>
|
||||
<w>cachefile</w>
|
||||
<w>cachemap</w>
|
||||
<w>cachepath</w>
|
||||
<w>cafile</w>
|
||||
<w>calced</w>
|
||||
<w>calcing</w>
|
||||
<w>calcs</w>
|
||||
@ -315,6 +319,7 @@
|
||||
<w>cbgn</w>
|
||||
<w>cbits</w>
|
||||
<w>cbot</w>
|
||||
<w>cbresults</w>
|
||||
<w>cbtn</w>
|
||||
<w>cbtnoffs</w>
|
||||
<w>ccfgs</w>
|
||||
@ -327,6 +332,7 @@
|
||||
<w>cend</w>
|
||||
<w>centeuro</w>
|
||||
<w>centiseconds</w>
|
||||
<w>certifi</w>
|
||||
<w>cfconfig</w>
|
||||
<w>cfenv</w>
|
||||
<w>cfgdir</w>
|
||||
@ -426,6 +432,7 @@
|
||||
<w>columnwidget</w>
|
||||
<w>colw</w>
|
||||
<w>commitconfig</w>
|
||||
<w>comms</w>
|
||||
<w>compat</w>
|
||||
<w>compileall</w>
|
||||
<w>compilelocations</w>
|
||||
@ -482,6 +489,7 @@
|
||||
<w>creditslist</w>
|
||||
<w>cresult</w>
|
||||
<w>cryptmodule</w>
|
||||
<w>cryptosimple</w>
|
||||
<w>cspbd</w>
|
||||
<w>cspnf</w>
|
||||
<w>cspre</w>
|
||||
@ -501,6 +509,7 @@
|
||||
<w>curstate</w>
|
||||
<w>curtime</w>
|
||||
<w>curtimestr</w>
|
||||
<w>curv</w>
|
||||
<w>customdata</w>
|
||||
<w>customizebrowser</w>
|
||||
<w>cutscenes</w>
|
||||
@ -606,6 +615,7 @@
|
||||
<w>downmix</w>
|
||||
<w>dpad</w>
|
||||
<w>dpath</w>
|
||||
<w>dpos</w>
|
||||
<w>dprofilename</w>
|
||||
<w>drawscore</w>
|
||||
<w>drawscreen</w>
|
||||
@ -731,6 +741,7 @@
|
||||
<w>excstr</w>
|
||||
<w>exec'ed</w>
|
||||
<w>execcode</w>
|
||||
<w>execed</w>
|
||||
<w>execing</w>
|
||||
<w>execlocals</w>
|
||||
<w>executils</w>
|
||||
@ -898,6 +909,7 @@
|
||||
<w>futimens</w>
|
||||
<w>fval</w>
|
||||
<w>fverts</w>
|
||||
<w>fwefocjwerj</w>
|
||||
<w>gameactivity</w>
|
||||
<w>gamebutton</w>
|
||||
<w>gameclass</w>
|
||||
@ -943,6 +955,7 @@
|
||||
<w>getcurrency</w>
|
||||
<w>getcwd</w>
|
||||
<w>getdata</w>
|
||||
<w>getenv</w>
|
||||
<w>gethostbyname</w>
|
||||
<w>getifaddr</w>
|
||||
<w>getinputdevice</w>
|
||||
@ -1145,6 +1158,7 @@
|
||||
<w>iometa</w>
|
||||
<w>ioprep</w>
|
||||
<w>ioprepped</w>
|
||||
<w>ioprepping</w>
|
||||
<w>ipaddress</w>
|
||||
<w>ipos</w>
|
||||
<w>iprof</w>
|
||||
@ -1165,9 +1179,11 @@
|
||||
<w>janktastic</w>
|
||||
<w>janky</w>
|
||||
<w>jascha</w>
|
||||
<w>jcrc</w>
|
||||
<w>jdict</w>
|
||||
<w>jenkinsfile</w>
|
||||
<w>jexport</w>
|
||||
<w>jfwe</w>
|
||||
<w>jisx</w>
|
||||
<w>jite</w>
|
||||
<w>jittering</w>
|
||||
@ -1513,6 +1529,7 @@
|
||||
<w>ndbm</w>
|
||||
<w>ndkpath</w>
|
||||
<w>nearbytab</w>
|
||||
<w>nearstr</w>
|
||||
<w>neededsettings</w>
|
||||
<w>ness</w>
|
||||
<w>netcode</w>
|
||||
@ -1936,6 +1953,7 @@
|
||||
<w>recv</w>
|
||||
<w>redist</w>
|
||||
<w>redistributables</w>
|
||||
<w>regionid</w>
|
||||
<w>regtp</w>
|
||||
<w>reimported</w>
|
||||
<w>relpath</w>
|
||||
@ -1998,6 +2016,7 @@
|
||||
<w>runonly</w>
|
||||
<w>runpy</w>
|
||||
<w>runpylint</w>
|
||||
<w>runseconds</w>
|
||||
<w>runswindows</w>
|
||||
<w>rval</w>
|
||||
<w>safecolor</w>
|
||||
@ -2391,6 +2410,7 @@
|
||||
<w>timetype</w>
|
||||
<w>tipstext</w>
|
||||
<w>titletext</w>
|
||||
<w>tlog</w>
|
||||
<w>tmpdir</w>
|
||||
<w>tmpf</w>
|
||||
<w>tmppath</w>
|
||||
@ -2426,6 +2446,7 @@
|
||||
<w>tracemalloc</w>
|
||||
<w>tradeoff</w>
|
||||
<w>trailcolor</w>
|
||||
<w>transportagentrequest</w>
|
||||
<w>transtime</w>
|
||||
<w>trapeznikov</w>
|
||||
<w>tref</w>
|
||||
@ -2443,6 +2464,7 @@
|
||||
<w>tval</w>
|
||||
<w>tvalue</w>
|
||||
<w>tvos</w>
|
||||
<w>twidth</w>
|
||||
<w>twrths</w>
|
||||
<w>txtactor</w>
|
||||
<w>txtl</w>
|
||||
@ -2477,6 +2499,7 @@
|
||||
<w>uiupkeeptimer</w>
|
||||
<w>unallowed</w>
|
||||
<w>uname</w>
|
||||
<w>unbased</w>
|
||||
<w>unbounds</w>
|
||||
<w>uncollectible</w>
|
||||
<w>underruns</w>
|
||||
@ -2519,6 +2542,7 @@
|
||||
<w>useragentstring</w>
|
||||
<w>userbase</w>
|
||||
<w>userfunctions</w>
|
||||
<w>usid</w>
|
||||
<w>utcnow</w>
|
||||
<w>utimensat</w>
|
||||
<w>uuidmodule</w>
|
||||
@ -2577,6 +2601,7 @@
|
||||
<w>weakref</w>
|
||||
<w>weakrefs</w>
|
||||
<w>weakrefset</w>
|
||||
<w>weakwin</w>
|
||||
<w>webbrowser</w>
|
||||
<w>webpage</w>
|
||||
<w>webpages</w>
|
||||
|
||||
14
CHANGELOG.md
14
CHANGELOG.md
@ -1,13 +1,21 @@
|
||||
### 1.6.8 (20444)
|
||||
### 1.6.9 (20480, 2022-02-21)
|
||||
- Upgraded Android Python to 3.9.10
|
||||
- Fixed an issue with SSL in Android builds that was preventing communication with the master-server in 1.6.8
|
||||
- Added a new network-diagnostics tool at 'Settings->Advanced->Network Testing'. Can be used to diagnose issues talking to master-servers/etc. (especially useful now that SSL can factor in)
|
||||
- Added clipboard support to Mac test build (thought pasting currently requires ctrl-v instead of cmd-v).
|
||||
- Fixed an issue where non-ascii characters in device names could break network communication.
|
||||
|
||||
### 1.6.8 (20458, 2022-02-16)
|
||||
- Added Filipino language (Thanks David!)
|
||||
- Restored pre-v1.5 jump behaviour.
|
||||
- All communication with the master-server should now be secure (https) using root certificates from the [certifi](https://github.com/certifi/python-certifi) project. Please holler if you run into any connection issues with this version.
|
||||
|
||||
### 1.6.7 (20436)
|
||||
- Fixed a vulnerability which could expose device-account uuids.
|
||||
- Now generating Linux Arm64 server and test builds (currently built against Ubuntu 20).
|
||||
- Mac test builds are now Universal binaries (Arm64 & x86-64 versions bundled together).
|
||||
- Mac test builds are now notarized and distributed via a snazzy .dmg instead of a zip file, so the OS should no longer try to prevent you from running them.
|
||||
- Now, when pushing new builds to https://files.ballistica.net/bombsquad/builds , corresponding checksums are written to a different server and can be accessed via https://tools.ballistica.net/checksums
|
||||
- Test builds can now be found at <https://ballistica.net/builds> - this page shows more info about the builds, including file checksums (stored on a separate server from the actual files for increased security).
|
||||
|
||||
### 1.6.6 (20394)
|
||||
- Beginning work on moving to new asset system.
|
||||
@ -18,7 +26,7 @@
|
||||
- Added co-op support to server builds (thanks Dliwk!)
|
||||
- Updated everything from Python 3.8 to Python 3.9. The biggest immediate impact to our code is that basic types such as list, dict, and tuple can be used in annotations, eliminating the need to import typing.Dict, typing.List, etc. See python.org for more changes.
|
||||
- Note: accessing mods on external storage on Android will not work in this release. This functionality has not been working in recent versions of Android due to increased security features anyway and I am in the process of replacing it with a cloud based system for installing mods. More on this soon.
|
||||
- Python 3.9 no longer supports Windows 7 or earlier (according to https://www.python.org/downloads/windows/) so if you are running such a version of Windows you will need to stick to older builds.
|
||||
- Python 3.9 no longer supports Windows 7 or earlier (according to <https://www.python.org/downloads/windows/>) so if you are running such a version of Windows you will need to stick to older builds.
|
||||
|
||||
### 1.6.4 (20382)
|
||||
- Some cleanups in the Favorites tab of the gather window.
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
|
||||
|
||||
The Ballistica project is the foundation for the next generation of [BombSquad](http://bombsquadgame.com). It will be debuting with the upcoming 1.5 release of the game and lays the foundation for some of the big changes coming in 2.0.
|
||||
The Ballistica project is the foundation for the next generation of [BombSquad](http://bombsquadgame.com). It debuted with version 1.5 of the game and lays the foundation for some of the big changes coming in 2.0.
|
||||
|
||||
[Head to the project wiki to get started](https://github.com/efroemling/ballistica/wiki), or learn more about the project below.
|
||||
|
||||
### Project Goals
|
||||
* Cleanup
|
||||
* BombSquad's codebase, and especially its scripting layer, have grown a lot over its lifetime, but not always in a 'designed' way. It was overdue for a major refactoring, which should keep it more maintainable for years to come. Examples of this include breaking up the monstrous twenty-six-thousand-line bsUI.py file into a much cleaner individual subpackages, updating all code from Python 2.7 to 3.7, and adding type annotations to the entire codebase.
|
||||
* BombSquad's codebase, and especially its scripting layer, have grown a lot over its lifetime, but not always in a 'designed' way. It was overdue for a major refactoring, which should keep it more maintainable for years to come. Examples of this include breaking up the monstrous twenty-six-thousand-line bsUI.py file into a much cleaner individual subpackages, updating all code from Python 2.7 to the latest 3.X versions, and adding type annotations to the entire codebase.
|
||||
* Provide modders and tinkerers with the best possible development environment
|
||||
* I've spent a lot of time incorporating auto-formatters, type-checkers, linters, and smart IDEs into my development workflow and have found them to be an enormous help. By sharing my setup here I hope to make them easily accessible to everyone.
|
||||
* Improve transparency
|
||||
|
||||
@ -946,6 +946,13 @@
|
||||
"ba_data/python-site-packages/__pycache__/typing_extensions.cpython-39.opt-1.pyc",
|
||||
"ba_data/python-site-packages/_yaml/__init__.py",
|
||||
"ba_data/python-site-packages/_yaml/__pycache__/__init__.cpython-39.opt-1.pyc",
|
||||
"ba_data/python-site-packages/certifi/__init__.py",
|
||||
"ba_data/python-site-packages/certifi/__main__.py",
|
||||
"ba_data/python-site-packages/certifi/__pycache__/__init__.cpython-39.opt-1.pyc",
|
||||
"ba_data/python-site-packages/certifi/__pycache__/__main__.cpython-39.opt-1.pyc",
|
||||
"ba_data/python-site-packages/certifi/__pycache__/core.cpython-39.opt-1.pyc",
|
||||
"ba_data/python-site-packages/certifi/cacert.pem",
|
||||
"ba_data/python-site-packages/certifi/core.py",
|
||||
"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-39.opt-1.pyc",
|
||||
|
||||
@ -445,12 +445,10 @@
|
||||
"ba_data/python/bastd/ui/settings/__pycache__/keyboard.cpython-39.opt-1.pyc",
|
||||
"ba_data/python/bastd/ui/settings/__pycache__/nettesting.cpython-39.opt-1.pyc",
|
||||
"ba_data/python/bastd/ui/settings/__pycache__/plugins.cpython-39.opt-1.pyc",
|
||||
"ba_data/python/bastd/ui/settings/__pycache__/ps3controller.cpython-39.opt-1.pyc",
|
||||
"ba_data/python/bastd/ui/settings/__pycache__/remoteapp.cpython-39.opt-1.pyc",
|
||||
"ba_data/python/bastd/ui/settings/__pycache__/testing.cpython-39.opt-1.pyc",
|
||||
"ba_data/python/bastd/ui/settings/__pycache__/touchscreen.cpython-39.opt-1.pyc",
|
||||
"ba_data/python/bastd/ui/settings/__pycache__/vrtesting.cpython-39.opt-1.pyc",
|
||||
"ba_data/python/bastd/ui/settings/__pycache__/wiimote.cpython-39.opt-1.pyc",
|
||||
"ba_data/python/bastd/ui/settings/__pycache__/xbox360controller.cpython-39.opt-1.pyc",
|
||||
"ba_data/python/bastd/ui/settings/advanced.py",
|
||||
"ba_data/python/bastd/ui/settings/allsettings.py",
|
||||
@ -463,12 +461,10 @@
|
||||
"ba_data/python/bastd/ui/settings/keyboard.py",
|
||||
"ba_data/python/bastd/ui/settings/nettesting.py",
|
||||
"ba_data/python/bastd/ui/settings/plugins.py",
|
||||
"ba_data/python/bastd/ui/settings/ps3controller.py",
|
||||
"ba_data/python/bastd/ui/settings/remoteapp.py",
|
||||
"ba_data/python/bastd/ui/settings/testing.py",
|
||||
"ba_data/python/bastd/ui/settings/touchscreen.py",
|
||||
"ba_data/python/bastd/ui/settings/vrtesting.py",
|
||||
"ba_data/python/bastd/ui/settings/wiimote.py",
|
||||
"ba_data/python/bastd/ui/settings/xbox360controller.py",
|
||||
"ba_data/python/bastd/ui/soundtrack/__init__.py",
|
||||
"ba_data/python/bastd/ui/soundtrack/__pycache__/__init__.cpython-39.opt-1.pyc",
|
||||
|
||||
@ -351,12 +351,10 @@ SCRIPT_TARGETS_PY_PUBLIC = \
|
||||
build/ba_data/python/bastd/ui/settings/keyboard.py \
|
||||
build/ba_data/python/bastd/ui/settings/nettesting.py \
|
||||
build/ba_data/python/bastd/ui/settings/plugins.py \
|
||||
build/ba_data/python/bastd/ui/settings/ps3controller.py \
|
||||
build/ba_data/python/bastd/ui/settings/remoteapp.py \
|
||||
build/ba_data/python/bastd/ui/settings/testing.py \
|
||||
build/ba_data/python/bastd/ui/settings/touchscreen.py \
|
||||
build/ba_data/python/bastd/ui/settings/vrtesting.py \
|
||||
build/ba_data/python/bastd/ui/settings/wiimote.py \
|
||||
build/ba_data/python/bastd/ui/settings/xbox360controller.py \
|
||||
build/ba_data/python/bastd/ui/soundtrack/__init__.py \
|
||||
build/ba_data/python/bastd/ui/soundtrack/browser.py \
|
||||
@ -598,12 +596,10 @@ SCRIPT_TARGETS_PYC_PUBLIC = \
|
||||
build/ba_data/python/bastd/ui/settings/__pycache__/keyboard.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python/bastd/ui/settings/__pycache__/nettesting.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python/bastd/ui/settings/__pycache__/plugins.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python/bastd/ui/settings/__pycache__/ps3controller.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python/bastd/ui/settings/__pycache__/remoteapp.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python/bastd/ui/settings/__pycache__/testing.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python/bastd/ui/settings/__pycache__/touchscreen.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python/bastd/ui/settings/__pycache__/vrtesting.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python/bastd/ui/settings/__pycache__/wiimote.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python/bastd/ui/settings/__pycache__/xbox360controller.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python/bastd/ui/soundtrack/__pycache__/__init__.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python/bastd/ui/soundtrack/__pycache__/browser.cpython-39.opt-1.pyc \
|
||||
@ -2475,6 +2471,9 @@ $(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/certifi/__init__.py \
|
||||
build/ba_data/python-site-packages/certifi/__main__.py \
|
||||
build/ba_data/python-site-packages/certifi/core.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 \
|
||||
@ -2496,6 +2495,9 @@ SCRIPT_TARGETS_PY_PRIVATE_COMMON = \
|
||||
|
||||
SCRIPT_TARGETS_PYC_PRIVATE_COMMON = \
|
||||
build/ba_data/python-site-packages/_yaml/__pycache__/__init__.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python-site-packages/certifi/__pycache__/__init__.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python-site-packages/certifi/__pycache__/__main__.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python-site-packages/certifi/__pycache__/core.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python-site-packages/__pycache__/typing_extensions.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python-site-packages/yaml/__pycache__/__init__.cpython-39.opt-1.pyc \
|
||||
build/ba_data/python-site-packages/yaml/__pycache__/composer.cpython-39.opt-1.pyc \
|
||||
@ -4785,6 +4787,9 @@ FONT_TARGETS = \
|
||||
build/ba_data/fonts/fontSmall6.fdata \
|
||||
build/ba_data/fonts/fontSmall7.fdata
|
||||
|
||||
PEM_TARGETS = \
|
||||
build/ba_data/python-site-packages/certifi/cacert.pem
|
||||
|
||||
DATA_TARGETS = \
|
||||
build/ba_data/data/langdata.json \
|
||||
build/ba_data/data/languages/arabic.json \
|
||||
@ -7075,6 +7080,9 @@ build/%.ogg : ../.efrocachemap
|
||||
build/%.fdata : ../.efrocachemap
|
||||
@cd .. && tools/pcommand efrocache_get assets/$@
|
||||
|
||||
build/%.pem : ../.efrocachemap
|
||||
@cd .. && tools/pcommand efrocache_get assets/$@
|
||||
|
||||
# Langdata one-off json file.
|
||||
build/ba_data/data/langdata.json : ../.efrocachemap
|
||||
@cd .. && tools/pcommand efrocache_get assets/$@
|
||||
@ -7155,7 +7163,7 @@ SCRIPT_TARGETS_ANDROID = $(SCRIPT_TARGETS_PY_PRIVATE_ANDROID) \
|
||||
SCRIPT_TARGETS_COMMON = $(SCRIPT_TARGETS_PY_PUBLIC) \
|
||||
$(SCRIPT_TARGETS_PYC_PUBLIC) $(SCRIPT_TARGETS_PY_PUBLIC_TOOLS) \
|
||||
$(SCRIPT_TARGETS_PYC_PUBLIC_TOOLS) $(SCRIPT_TARGETS_PY_PRIVATE_COMMON) \
|
||||
$(SCRIPT_TARGETS_PYC_PRIVATE_COMMON)
|
||||
$(SCRIPT_TARGETS_PYC_PRIVATE_COMMON) $(PEM_TARGETS)
|
||||
|
||||
# Build scripts for a specific platform.
|
||||
scripts-cmake: $(SCRIPT_TARGETS_CMAKE) $(SCRIPT_TARGETS_COMMON)
|
||||
|
||||
@ -1 +1 @@
|
||||
32362240586742836034231639790863797313
|
||||
135697331021140808219546877225423515533
|
||||
@ -1451,6 +1451,11 @@ def containerwidget(edit: ba.Widget = None,
|
||||
return ba.Widget()
|
||||
|
||||
|
||||
def contains_python_dist() -> bool:
|
||||
"""(internal)"""
|
||||
return bool()
|
||||
|
||||
|
||||
def debug_print_py_err() -> None:
|
||||
"""(internal)
|
||||
|
||||
|
||||
@ -3,8 +3,9 @@
|
||||
"""Functionality related to the high level state of the app."""
|
||||
from __future__ import annotations
|
||||
|
||||
from enum import Enum
|
||||
import random
|
||||
import logging
|
||||
from enum import Enum
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
import _ba
|
||||
@ -184,6 +185,9 @@ class App:
|
||||
|
||||
self.state = self.State.LAUNCHING
|
||||
|
||||
self._app_launched = False
|
||||
self._app_paused = False
|
||||
|
||||
# Config.
|
||||
self.config_file_healthy = False
|
||||
|
||||
@ -366,22 +370,40 @@ class App:
|
||||
self.accounts.on_app_launch()
|
||||
self.plugins.on_app_launch()
|
||||
|
||||
self.state = self.State.RUNNING
|
||||
# See note below in on_app_pause.
|
||||
if self.state != self.State.LAUNCHING:
|
||||
logging.error('on_app_launch found state %s; expected LAUNCHING.',
|
||||
self.state)
|
||||
|
||||
self._app_launched = True
|
||||
self._update_state()
|
||||
|
||||
# from ba._dependency import test_depset
|
||||
# test_depset()
|
||||
if bool(False):
|
||||
self._test_https()
|
||||
|
||||
def _update_state(self) -> None:
|
||||
if self._app_paused:
|
||||
self.state = self.State.PAUSED
|
||||
else:
|
||||
if self._app_launched:
|
||||
self.state = self.State.RUNNING
|
||||
else:
|
||||
self.state = self.State.LAUNCHING
|
||||
|
||||
def on_app_pause(self) -> None:
|
||||
"""Called when the app goes to a suspended state."""
|
||||
self.state = self.State.PAUSED
|
||||
|
||||
self._app_paused = True
|
||||
self._update_state()
|
||||
self.plugins.on_app_pause()
|
||||
|
||||
def on_app_resume(self) -> None:
|
||||
"""Run when the app resumes from a suspended state."""
|
||||
|
||||
self.state = self.State.RUNNING
|
||||
self._app_paused = False
|
||||
self._update_state()
|
||||
self.fg_state += 1
|
||||
self.accounts.on_app_resume()
|
||||
self.music.on_app_resume()
|
||||
|
||||
@ -60,12 +60,13 @@ def setup_asyncio() -> None:
|
||||
timetype=TimeType.REAL,
|
||||
repeat=True)
|
||||
|
||||
async def aio_test() -> None:
|
||||
print('TEST AIO TASK STARTING')
|
||||
assert _asyncio_event_loop is not None
|
||||
assert asyncio.get_running_loop() is _asyncio_event_loop
|
||||
await asyncio.sleep(2.0)
|
||||
print('TEST AIO TASK ENDING')
|
||||
|
||||
if bool(False):
|
||||
|
||||
async def aio_test() -> None:
|
||||
print('TEST AIO TASK STARTING')
|
||||
assert _asyncio_event_loop is not None
|
||||
assert asyncio.get_running_loop() is _asyncio_event_loop
|
||||
await asyncio.sleep(2.0)
|
||||
print('TEST AIO TASK ENDING')
|
||||
|
||||
_asyncio_event_loop.create_task(aio_test())
|
||||
|
||||
@ -25,8 +25,14 @@ class NetworkSubsystem:
|
||||
"""Network related app subsystem."""
|
||||
|
||||
def __init__(self) -> None:
|
||||
|
||||
# Anyone accessing/modifying region_pings should hold this lock.
|
||||
self.region_pings_lock = threading.Lock()
|
||||
self.region_pings: dict[str, float] = {}
|
||||
|
||||
# For debugging.
|
||||
self.v1_test_log: str = ''
|
||||
|
||||
|
||||
def get_ip_address_type(addr: str) -> socket.AddressFamily:
|
||||
"""Return socket.AF_INET6 or socket.AF_INET4 for the provided address."""
|
||||
|
||||
@ -91,21 +91,6 @@ class ControlsSettingsWindow(ba.Window):
|
||||
else:
|
||||
show_remote = False
|
||||
|
||||
show_ps3 = False
|
||||
# if platform == 'mac':
|
||||
# show_ps3 = True
|
||||
# height += spacing
|
||||
|
||||
show360 = False
|
||||
# if platform == 'mac' or is_fire_tv:
|
||||
# show360 = True
|
||||
# height += spacing
|
||||
|
||||
show_mac_wiimote = False
|
||||
# if platform == 'mac' and _ba.is_xcode_build():
|
||||
# show_mac_wiimote = True
|
||||
# height += spacing
|
||||
|
||||
# On windows (outside of oculus/vr), show an option to disable xinput.
|
||||
show_xinput_toggle = False
|
||||
if platform == 'windows' and not app.vr_mode:
|
||||
@ -152,9 +137,6 @@ class ControlsSettingsWindow(ba.Window):
|
||||
self._keyboard_button: Optional[ba.Widget] = None
|
||||
self._keyboard_2_button: Optional[ba.Widget] = None
|
||||
self._idevices_button: Optional[ba.Widget] = None
|
||||
self._ps3_button: Optional[ba.Widget] = None
|
||||
self._xbox_360_button: Optional[ba.Widget] = None
|
||||
self._wiimotes_button: Optional[ba.Widget] = None
|
||||
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(0, height - 49),
|
||||
@ -261,42 +243,6 @@ class ControlsSettingsWindow(ba.Window):
|
||||
down_widget=self._idevices_button)
|
||||
self._have_selected_child = True
|
||||
v -= spacing
|
||||
if show_ps3:
|
||||
self._ps3_button = btn = ba.buttonwidget(
|
||||
parent=self._root_widget,
|
||||
position=((width - button_width) / 2 + 5, v),
|
||||
size=(button_width, 43),
|
||||
autoselect=True,
|
||||
label=ba.Lstr(resource=self._r + '.ps3Text'),
|
||||
on_activate_call=self._do_ps3_controllers)
|
||||
if ba.app.ui.use_toolbars:
|
||||
ba.widget(edit=btn,
|
||||
right_widget=_ba.get_special_widget('party_button'))
|
||||
v -= spacing
|
||||
if show360:
|
||||
self._xbox_360_button = btn = ba.buttonwidget(
|
||||
parent=self._root_widget,
|
||||
position=((width - button_width) / 2 - 1, v),
|
||||
size=(button_width, 43),
|
||||
autoselect=True,
|
||||
label=ba.Lstr(resource=self._r + '.xbox360Text'),
|
||||
on_activate_call=self._do_360_controllers)
|
||||
if ba.app.ui.use_toolbars:
|
||||
ba.widget(edit=btn,
|
||||
right_widget=_ba.get_special_widget('party_button'))
|
||||
v -= spacing
|
||||
if show_mac_wiimote:
|
||||
self._wiimotes_button = btn = ba.buttonwidget(
|
||||
parent=self._root_widget,
|
||||
position=((width - button_width) / 2 + 5, v),
|
||||
size=(button_width, 43),
|
||||
autoselect=True,
|
||||
label=ba.Lstr(resource=self._r + '.wiimotesText'),
|
||||
on_activate_call=self._do_wiimotes)
|
||||
if ba.app.ui.use_toolbars:
|
||||
ba.widget(edit=btn,
|
||||
right_widget=_ba.get_special_widget('party_button'))
|
||||
v -= spacing
|
||||
|
||||
if show_xinput_toggle:
|
||||
|
||||
@ -397,31 +343,6 @@ class ControlsSettingsWindow(ba.Window):
|
||||
ba.app.ui.set_main_menu_window(
|
||||
RemoteAppSettingsWindow().get_root_widget())
|
||||
|
||||
def _do_ps3_controllers(self) -> None:
|
||||
# pylint: disable=cyclic-import
|
||||
from bastd.ui.settings.ps3controller import PS3ControllerSettingsWindow
|
||||
self._save_state()
|
||||
ba.containerwidget(edit=self._root_widget, transition='out_left')
|
||||
ba.app.ui.set_main_menu_window(
|
||||
PS3ControllerSettingsWindow().get_root_widget())
|
||||
|
||||
def _do_360_controllers(self) -> None:
|
||||
# pylint: disable=cyclic-import
|
||||
from bastd.ui.settings.xbox360controller import (
|
||||
XBox360ControllerSettingsWindow)
|
||||
self._save_state()
|
||||
ba.containerwidget(edit=self._root_widget, transition='out_left')
|
||||
ba.app.ui.set_main_menu_window(
|
||||
XBox360ControllerSettingsWindow().get_root_widget())
|
||||
|
||||
def _do_wiimotes(self) -> None:
|
||||
# pylint: disable=cyclic-import
|
||||
from bastd.ui.settings.wiimote import WiimoteSettingsWindow
|
||||
self._save_state()
|
||||
ba.containerwidget(edit=self._root_widget, transition='out_left')
|
||||
ba.app.ui.set_main_menu_window(
|
||||
WiimoteSettingsWindow().get_root_widget())
|
||||
|
||||
def _do_gamepads(self) -> None:
|
||||
# pylint: disable=cyclic-import
|
||||
from bastd.ui.settings.gamepadselect import GamepadSelectWindow
|
||||
@ -449,12 +370,6 @@ class ControlsSettingsWindow(ba.Window):
|
||||
sel_name = 'Keyboard2'
|
||||
elif sel == self._idevices_button:
|
||||
sel_name = 'iDevices'
|
||||
elif sel == self._ps3_button:
|
||||
sel_name = 'PS3'
|
||||
elif sel == self._xbox_360_button:
|
||||
sel_name = 'xbox360'
|
||||
elif sel == self._wiimotes_button:
|
||||
sel_name = 'Wiimotes'
|
||||
else:
|
||||
sel_name = 'Back'
|
||||
ba.app.ui.window_states[type(self)] = sel_name
|
||||
@ -471,12 +386,6 @@ class ControlsSettingsWindow(ba.Window):
|
||||
sel = self._keyboard_2_button
|
||||
elif sel_name == 'iDevices':
|
||||
sel = self._idevices_button
|
||||
elif sel_name == 'PS3':
|
||||
sel = self._ps3_button
|
||||
elif sel_name == 'xbox360':
|
||||
sel = self._xbox_360_button
|
||||
elif sel_name == 'Wiimotes':
|
||||
sel = self._wiimotes_button
|
||||
elif sel_name == 'Back':
|
||||
sel = self._back_button
|
||||
else:
|
||||
|
||||
@ -4,11 +4,297 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import time
|
||||
import copy
|
||||
import weakref
|
||||
from threading import Thread
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
import _ba
|
||||
import ba
|
||||
from bastd.ui.settings import testing
|
||||
from bastd.ui.settings.testing import TestingWindow
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from typing import Callable, Any, Optional
|
||||
|
||||
|
||||
class NetTestingWindow(testing.TestingWindow):
|
||||
class NetTestingWindow(ba.Window):
|
||||
"""Window that runs a networking test suite to help diagnose issues."""
|
||||
|
||||
def __init__(self, transition: str = 'in_right'):
|
||||
self._width = 820
|
||||
self._height = 500
|
||||
self._printed_lines: list[str] = []
|
||||
uiscale = ba.app.ui.uiscale
|
||||
super().__init__(root_widget=ba.containerwidget(
|
||||
size=(self._width, self._height),
|
||||
scale=(1.56 if uiscale is ba.UIScale.SMALL else
|
||||
1.2 if uiscale is ba.UIScale.MEDIUM else 0.8),
|
||||
stack_offset=(0.0, -7 if uiscale is ba.UIScale.SMALL else 0.0),
|
||||
transition=transition))
|
||||
self._done_button = ba.buttonwidget(parent=self._root_widget,
|
||||
position=(40, self._height - 77),
|
||||
size=(120, 60),
|
||||
scale=0.8,
|
||||
autoselect=True,
|
||||
label=ba.Lstr(resource='doneText'),
|
||||
on_activate_call=self._done)
|
||||
|
||||
self._copy_button = ba.buttonwidget(parent=self._root_widget,
|
||||
position=(self._width - 200,
|
||||
self._height - 77),
|
||||
size=(100, 60),
|
||||
scale=0.8,
|
||||
autoselect=True,
|
||||
label=ba.Lstr(resource='copyText'),
|
||||
on_activate_call=self._copy)
|
||||
|
||||
self._settings_button = ba.buttonwidget(
|
||||
parent=self._root_widget,
|
||||
position=(self._width - 100, self._height - 77),
|
||||
size=(60, 60),
|
||||
scale=0.8,
|
||||
autoselect=True,
|
||||
label=ba.Lstr(value='...'),
|
||||
on_activate_call=self._show_val_testing)
|
||||
|
||||
twidth = self._width - 450
|
||||
ba.textwidget(
|
||||
parent=self._root_widget,
|
||||
position=(self._width * 0.5, self._height - 55),
|
||||
size=(0, 0),
|
||||
text=ba.Lstr(resource='settingsWindowAdvanced.netTestingText'),
|
||||
color=(0.8, 0.8, 0.8, 1.0),
|
||||
h_align='center',
|
||||
v_align='center',
|
||||
maxwidth=twidth)
|
||||
|
||||
self._scroll = ba.scrollwidget(parent=self._root_widget,
|
||||
position=(50, 50),
|
||||
size=(self._width - 100,
|
||||
self._height - 140),
|
||||
capture_arrows=True,
|
||||
autoselect=True)
|
||||
self._rows = ba.columnwidget(parent=self._scroll)
|
||||
|
||||
ba.containerwidget(edit=self._root_widget,
|
||||
cancel_button=self._done_button)
|
||||
|
||||
# Now kick off the tests.
|
||||
# Pass a weak-ref to this window so we don't keep it alive
|
||||
# if we back out before it completes. Also set is as daemon
|
||||
# so it doesn't keep the app running if the user is trying to quit.
|
||||
Thread(
|
||||
daemon=True,
|
||||
target=ba.Call(_run_diagnostics, weakref.ref(self)),
|
||||
).start()
|
||||
|
||||
def print(self, text: str, color: tuple[float, float, float]) -> None:
|
||||
"""Print text to our console thingie."""
|
||||
for line in text.splitlines():
|
||||
txt = ba.textwidget(parent=self._rows,
|
||||
color=color,
|
||||
text=line,
|
||||
scale=0.75,
|
||||
flatness=1.0,
|
||||
shadow=0.0,
|
||||
size=(0, 20))
|
||||
ba.containerwidget(edit=self._rows, visible_child=txt)
|
||||
self._printed_lines.append(line)
|
||||
|
||||
def _copy(self) -> None:
|
||||
if not ba.clipboard_is_supported():
|
||||
ba.screenmessage('Clipboard not supported on this platform.',
|
||||
color=(1, 0, 0))
|
||||
return
|
||||
ba.clipboard_set_text('\n'.join(self._printed_lines))
|
||||
ba.screenmessage(f'{len(self._printed_lines)} lines copied.')
|
||||
|
||||
def _show_val_testing(self) -> None:
|
||||
ba.app.ui.set_main_menu_window(NetValTestingWindow().get_root_widget())
|
||||
ba.containerwidget(edit=self._root_widget, transition='out_left')
|
||||
|
||||
def _done(self) -> None:
|
||||
# pylint: disable=cyclic-import
|
||||
from bastd.ui.settings.advanced import AdvancedSettingsWindow
|
||||
ba.app.ui.set_main_menu_window(
|
||||
AdvancedSettingsWindow(transition='in_left').get_root_widget())
|
||||
ba.containerwidget(edit=self._root_widget, transition='out_right')
|
||||
|
||||
|
||||
def _run_diagnostics(weakwin: weakref.ref[NetTestingWindow]) -> None:
|
||||
# pylint: disable=too-many-statements
|
||||
|
||||
from efro.util import utc_now
|
||||
|
||||
have_error = [False]
|
||||
|
||||
# We're running in a background thread but UI stuff needs to run
|
||||
# in the logic thread; give ourself a way to pass stuff to it.
|
||||
def _print(text: str, color: tuple[float, float, float] = None) -> None:
|
||||
|
||||
def _print_in_logic_thread() -> None:
|
||||
win = weakwin()
|
||||
if win is not None:
|
||||
win.print(text, (1.0, 1.0, 1.0) if color is None else color)
|
||||
|
||||
ba.pushcall(_print_in_logic_thread, from_other_thread=True)
|
||||
|
||||
def _print_test_results(call: Callable[[], Any]) -> None:
|
||||
"""Run the provided call; return success/fail text & color."""
|
||||
starttime = time.monotonic()
|
||||
try:
|
||||
call()
|
||||
duration = time.monotonic() - starttime
|
||||
_print(f'Succeeded in {duration:.2f}s.', color=(0, 1, 0))
|
||||
except Exception:
|
||||
import traceback
|
||||
duration = time.monotonic() - starttime
|
||||
_print(traceback.format_exc(), color=(1.0, 1.0, 0.3))
|
||||
_print(f'Failed in {duration:.2f}s.', color=(1, 0, 0))
|
||||
have_error[0] = True
|
||||
|
||||
try:
|
||||
_print(f'Running network diagnostics...\n'
|
||||
f'ua: {_ba.app.user_agent_string}\n'
|
||||
f'time: {utc_now()}.')
|
||||
|
||||
if bool(False):
|
||||
_print('\nRunning dummy success test...')
|
||||
_print_test_results(_dummy_success)
|
||||
|
||||
_print('\nRunning dummy fail test...')
|
||||
_print_test_results(_dummy_fail)
|
||||
|
||||
# V1 ping
|
||||
baseaddr = _ba.get_master_server_address(internal=True,
|
||||
source=0,
|
||||
version=1)
|
||||
_print(f'\nContacting V1 master-server ({baseaddr})...')
|
||||
_print_test_results(lambda: _test_fetch(baseaddr))
|
||||
|
||||
# V1 alternate ping
|
||||
baseaddr = _ba.get_master_server_address(internal=True,
|
||||
source=1,
|
||||
version=1)
|
||||
_print(f'\nContacting V1 alt master-server ({baseaddr})...')
|
||||
_print_test_results(lambda: _test_fetch(baseaddr))
|
||||
|
||||
_print(f'\nV1-test-log: {ba.app.net.v1_test_log}')
|
||||
|
||||
curv1addr = _ba.get_master_server_address(internal=True, version=1)
|
||||
_print(f'\nCurrent V1 address: {curv1addr}')
|
||||
|
||||
_print('\nRunning V1 transaction...')
|
||||
_print_test_results(_test_v1_transaction)
|
||||
|
||||
# V2 ping
|
||||
baseaddr = _ba.get_master_server_address(internal=True, version=2)
|
||||
_print(f'\nContacting V2 master-server ({baseaddr})...')
|
||||
_print_test_results(lambda: _test_fetch(baseaddr))
|
||||
|
||||
# Get V2 nearby region
|
||||
with ba.app.net.region_pings_lock:
|
||||
region_pings = copy.deepcopy(ba.app.net.region_pings)
|
||||
nearest_region = (None if not region_pings else sorted(
|
||||
region_pings.items(), key=lambda i: i[1])[0])
|
||||
|
||||
if nearest_region is not None:
|
||||
nearstr = f'{nearest_region[0]}: {nearest_region[1]:.0f}ms'
|
||||
else:
|
||||
nearstr = '-'
|
||||
_print(f'\nChecking nearest V2 region ping ({nearstr})...')
|
||||
_print_test_results(lambda: _test_nearby_region_ping(nearest_region))
|
||||
|
||||
if have_error[0]:
|
||||
_print('\nDiagnostics complete. Some diagnostics failed.',
|
||||
color=(10, 0, 0))
|
||||
else:
|
||||
_print('\nDiagnostics complete. Everything looks good!',
|
||||
color=(0, 1, 0))
|
||||
except Exception:
|
||||
import traceback
|
||||
_print(
|
||||
f'An unexpected error occurred during testing;'
|
||||
f' please report this.\n'
|
||||
f'{traceback.format_exc()}',
|
||||
color=(1, 0, 0))
|
||||
|
||||
|
||||
def _dummy_success() -> None:
|
||||
"""Dummy success test."""
|
||||
time.sleep(1.2)
|
||||
|
||||
|
||||
def _dummy_fail() -> None:
|
||||
"""Dummy fail test case."""
|
||||
raise RuntimeError('fail-test')
|
||||
|
||||
|
||||
def _test_v1_transaction() -> None:
|
||||
"""Dummy fail test case."""
|
||||
if _ba.get_account_state() != 'signed_in':
|
||||
raise RuntimeError('Not signed in.')
|
||||
|
||||
starttime = time.monotonic()
|
||||
|
||||
# Gets set to True on success or string on error.
|
||||
results: list[Any] = [False]
|
||||
|
||||
def _cb(cbresults: Any) -> None:
|
||||
# Simply set results here; our other thread acts on them.
|
||||
if not isinstance(cbresults, dict) or 'party_code' not in cbresults:
|
||||
results[0] = 'Unexpected transaction response'
|
||||
return
|
||||
results[0] = True # Success!
|
||||
|
||||
def _do_it() -> None:
|
||||
# Fire off a transaction with a callback.
|
||||
_ba.add_transaction(
|
||||
{
|
||||
'type': 'PRIVATE_PARTY_QUERY',
|
||||
'expire_time': time.time() + 20,
|
||||
},
|
||||
callback=_cb,
|
||||
)
|
||||
_ba.run_transactions()
|
||||
|
||||
ba.pushcall(_do_it, from_other_thread=True)
|
||||
|
||||
while results[0] is False:
|
||||
time.sleep(0.01)
|
||||
if time.monotonic() - starttime > 10.0:
|
||||
raise RuntimeError('timed out')
|
||||
|
||||
# If we got left a string, its an error.
|
||||
if isinstance(results[0], str):
|
||||
raise RuntimeError(results[0])
|
||||
|
||||
|
||||
def _test_fetch(baseaddr: str) -> None:
|
||||
# pylint: disable=consider-using-with
|
||||
import urllib.request
|
||||
response = urllib.request.urlopen(urllib.request.Request(
|
||||
f'{baseaddr}/ping', None, {'User-Agent': _ba.app.user_agent_string}),
|
||||
timeout=10.0)
|
||||
if response.getcode() != 200:
|
||||
raise RuntimeError(
|
||||
f'Got unexpected response code {response.getcode()}.')
|
||||
data = response.read()
|
||||
if data != b'pong':
|
||||
raise RuntimeError('Got unexpected response data.')
|
||||
|
||||
|
||||
def _test_nearby_region_ping(
|
||||
nearest_region: Optional[tuple[str, float]]) -> None:
|
||||
"""Try to ping nearest v2 region."""
|
||||
if nearest_region is None:
|
||||
raise RuntimeError('No nearest region.')
|
||||
if nearest_region[1] > 500:
|
||||
raise RuntimeError('Ping too high.')
|
||||
|
||||
|
||||
class NetValTestingWindow(TestingWindow):
|
||||
"""Window to test network related settings."""
|
||||
|
||||
def __init__(self, transition: str = 'in_right'):
|
||||
@ -35,6 +321,8 @@ class NetTestingWindow(testing.TestingWindow):
|
||||
'increment': 1
|
||||
},
|
||||
]
|
||||
testing.TestingWindow.__init__(
|
||||
self, ba.Lstr(resource='settingsWindowAdvanced.netTestingText'),
|
||||
entries, transition)
|
||||
super().__init__(
|
||||
title=ba.Lstr(resource='settingsWindowAdvanced.netTestingText'),
|
||||
entries=entries,
|
||||
transition=transition,
|
||||
back_call=lambda: NetTestingWindow(transition='in_left'))
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
# Released under the MIT License. See LICENSE for details.
|
||||
#
|
||||
"""Settings UI related to PS3 controllers."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import _ba
|
||||
import ba
|
||||
|
||||
|
||||
class PS3ControllerSettingsWindow(ba.Window):
|
||||
"""UI showing info about using PS3 controllers."""
|
||||
|
||||
def __init__(self) -> None:
|
||||
width = 760
|
||||
height = 330 if _ba.is_running_on_fire_tv() else 540
|
||||
spacing = 40
|
||||
self._r = 'ps3ControllersWindow'
|
||||
uiscale = ba.app.ui.uiscale
|
||||
super().__init__(root_widget=ba.containerwidget(
|
||||
size=(width, height),
|
||||
transition='in_right',
|
||||
scale=(1.35 if uiscale is ba.UIScale.SMALL else
|
||||
1.3 if uiscale is ba.UIScale.MEDIUM else 1.0)))
|
||||
|
||||
btn = ba.buttonwidget(parent=self._root_widget,
|
||||
position=(37, height - 73),
|
||||
size=(135, 65),
|
||||
scale=0.85,
|
||||
label=ba.Lstr(resource='backText'),
|
||||
button_type='back',
|
||||
autoselect=True,
|
||||
on_activate_call=self._back)
|
||||
ba.containerwidget(edit=self._root_widget, cancel_button=btn)
|
||||
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(width * 0.5, height - 46),
|
||||
size=(0, 0),
|
||||
maxwidth=410,
|
||||
text=ba.Lstr(resource=self._r + '.titleText',
|
||||
subs=[('${APP_NAME}',
|
||||
ba.Lstr(resource='titleText'))]),
|
||||
color=ba.app.ui.title_color,
|
||||
h_align='center',
|
||||
v_align='center')
|
||||
|
||||
ba.buttonwidget(edit=btn,
|
||||
button_type='backSmall',
|
||||
size=(60, 60),
|
||||
label=ba.charstr(ba.SpecialChar.BACK))
|
||||
|
||||
v = height - 90
|
||||
v -= spacing
|
||||
|
||||
if _ba.is_running_on_fire_tv():
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(width * 0.5, height * 0.45),
|
||||
size=(0, 0),
|
||||
color=(0.7, 0.9, 0.7, 1.0),
|
||||
maxwidth=width * 0.95,
|
||||
max_height=height * 0.8,
|
||||
scale=1.0,
|
||||
text=ba.Lstr(resource=self._r +
|
||||
'.ouyaInstructionsText'),
|
||||
h_align='center',
|
||||
v_align='center')
|
||||
else:
|
||||
txts = ba.Lstr(resource=self._r +
|
||||
'.macInstructionsText').evaluate().split('\n\n\n')
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(width * 0.5, v - 29),
|
||||
size=(0, 0),
|
||||
color=(0.7, 0.9, 0.7, 1.0),
|
||||
maxwidth=width * 0.95,
|
||||
max_height=170,
|
||||
scale=1.0,
|
||||
text=txts[0].strip(),
|
||||
h_align='center',
|
||||
v_align='center')
|
||||
if txts:
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(width * 0.5, v - 280),
|
||||
size=(0, 0),
|
||||
color=(0.7, 0.9, 0.7, 1.0),
|
||||
maxwidth=width * 0.95,
|
||||
max_height=170,
|
||||
scale=1.0,
|
||||
text=txts[1].strip(),
|
||||
h_align='center',
|
||||
v_align='center')
|
||||
|
||||
ba.buttonwidget(parent=self._root_widget,
|
||||
position=(225, v - 176),
|
||||
size=(300, 40),
|
||||
label=ba.Lstr(resource=self._r +
|
||||
'.pairingTutorialText'),
|
||||
autoselect=True,
|
||||
on_activate_call=ba.Call(
|
||||
ba.open_url, 'http://www.youtube.com/watch'
|
||||
'?v=IlR_HxeOQpI&feature=related'))
|
||||
|
||||
def _back(self) -> None:
|
||||
from bastd.ui.settings import controls
|
||||
ba.containerwidget(edit=self._root_widget, transition='out_right')
|
||||
ba.app.ui.set_main_menu_window(
|
||||
controls.ControlsSettingsWindow(
|
||||
transition='in_left').get_root_widget())
|
||||
@ -11,7 +11,7 @@ import _ba
|
||||
import ba
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from typing import Any
|
||||
from typing import Any, Callable, Optional
|
||||
|
||||
|
||||
class TestingWindow(ba.Window):
|
||||
@ -20,11 +20,13 @@ class TestingWindow(ba.Window):
|
||||
def __init__(self,
|
||||
title: ba.Lstr,
|
||||
entries: list[dict[str, Any]],
|
||||
transition: str = 'in_right'):
|
||||
transition: str = 'in_right',
|
||||
back_call: Optional[Callable[[], ba.Window]] = None):
|
||||
uiscale = ba.app.ui.uiscale
|
||||
self._width = 600
|
||||
self._height = 324 if uiscale is ba.UIScale.SMALL else 400
|
||||
self._entries = copy.deepcopy(entries)
|
||||
self._back_call = back_call
|
||||
super().__init__(root_widget=ba.containerwidget(
|
||||
size=(self._width, self._height),
|
||||
transition=transition,
|
||||
@ -176,8 +178,8 @@ class TestingWindow(ba.Window):
|
||||
|
||||
def _do_back(self) -> None:
|
||||
# pylint: disable=cyclic-import
|
||||
import bastd.ui.settings.advanced
|
||||
from bastd.ui.settings.advanced import AdvancedSettingsWindow
|
||||
ba.containerwidget(edit=self._root_widget, transition='out_right')
|
||||
ba.app.ui.set_main_menu_window(
|
||||
bastd.ui.settings.advanced.AdvancedSettingsWindow(
|
||||
transition='in_left').get_root_widget())
|
||||
backwin = (self._back_call() if self._back_call is not None else
|
||||
AdvancedSettingsWindow(transition='in_left'))
|
||||
ba.app.ui.set_main_menu_window(backwin.get_root_widget())
|
||||
|
||||
@ -7,13 +7,13 @@ from __future__ import annotations
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
import ba
|
||||
from bastd.ui.settings import testing
|
||||
from bastd.ui.settings.testing import TestingWindow
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from typing import Any
|
||||
|
||||
|
||||
class VRTestingWindow(testing.TestingWindow):
|
||||
class VRTestingWindow(TestingWindow):
|
||||
"""Window for testing vr settings."""
|
||||
|
||||
def __init__(self, transition: str = 'in_right'):
|
||||
|
||||
@ -1,251 +0,0 @@
|
||||
# Released under the MIT License. See LICENSE for details.
|
||||
#
|
||||
"""Settings UI functionality related to wiimote support."""
|
||||
from __future__ import annotations
|
||||
|
||||
import _ba
|
||||
import ba
|
||||
|
||||
|
||||
class WiimoteSettingsWindow(ba.Window):
|
||||
"""Window for setting up Wiimotes."""
|
||||
|
||||
def __init__(self) -> None:
|
||||
self._r = 'wiimoteSetupWindow'
|
||||
width = 600
|
||||
height = 480
|
||||
spacing = 40
|
||||
super().__init__(root_widget=ba.containerwidget(size=(width, height),
|
||||
transition='in_right'))
|
||||
|
||||
btn = ba.buttonwidget(parent=self._root_widget,
|
||||
position=(55, height - 50),
|
||||
size=(120, 60),
|
||||
scale=0.8,
|
||||
autoselect=True,
|
||||
label=ba.Lstr(resource='backText'),
|
||||
button_type='back',
|
||||
on_activate_call=self._back)
|
||||
|
||||
ba.containerwidget(edit=self._root_widget, cancel_button=btn)
|
||||
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(width * 0.5, height - 28),
|
||||
size=(0, 0),
|
||||
text=ba.Lstr(resource=self._r + '.titleText'),
|
||||
maxwidth=270,
|
||||
color=ba.app.ui.title_color,
|
||||
h_align='center',
|
||||
v_align='center')
|
||||
|
||||
ba.buttonwidget(edit=btn,
|
||||
button_type='backSmall',
|
||||
size=(60, 60),
|
||||
label=ba.charstr(ba.SpecialChar.BACK))
|
||||
|
||||
v = height - 60.0
|
||||
v -= spacing
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(width * 0.5, v - 80),
|
||||
size=(0, 0),
|
||||
color=(0.7, 0.9, 0.7, 1.0),
|
||||
scale=0.75,
|
||||
text=ba.Lstr(resource=self._r + '.macInstructionsText'),
|
||||
maxwidth=width * 0.95,
|
||||
max_height=height * 0.5,
|
||||
h_align='center',
|
||||
v_align='center')
|
||||
v -= 230
|
||||
button_width = 200
|
||||
v -= 30
|
||||
btn = ba.buttonwidget(parent=self._root_widget,
|
||||
position=(width / 2 - button_width / 2, v + 1),
|
||||
autoselect=True,
|
||||
size=(button_width, 50),
|
||||
label=ba.Lstr(resource=self._r + '.listenText'),
|
||||
on_activate_call=WiimoteListenWindow)
|
||||
ba.containerwidget(edit=self._root_widget, start_button=btn)
|
||||
v -= spacing * 1.1
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(width * 0.5, v),
|
||||
size=(0, 0),
|
||||
color=(0.7, 0.9, 0.7, 1.0),
|
||||
scale=0.8,
|
||||
maxwidth=width * 0.95,
|
||||
text=ba.Lstr(resource=self._r + '.thanksText'),
|
||||
h_align='center',
|
||||
v_align='center')
|
||||
v -= 30
|
||||
this_button_width = 200
|
||||
ba.buttonwidget(parent=self._root_widget,
|
||||
position=(width / 2 - this_button_width / 2, v - 14),
|
||||
color=(0.45, 0.4, 0.5),
|
||||
autoselect=True,
|
||||
size=(this_button_width, 15),
|
||||
label=ba.Lstr(resource=self._r + '.copyrightText'),
|
||||
textcolor=(0.55, 0.5, 0.6),
|
||||
text_scale=0.6,
|
||||
on_activate_call=WiimoteLicenseWindow)
|
||||
|
||||
def _back(self) -> None:
|
||||
from bastd.ui.settings import controls
|
||||
ba.containerwidget(edit=self._root_widget, transition='out_right')
|
||||
ba.app.ui.set_main_menu_window(
|
||||
controls.ControlsSettingsWindow(
|
||||
transition='in_left').get_root_widget())
|
||||
|
||||
|
||||
class WiimoteListenWindow(ba.Window):
|
||||
"""Window shown while listening for a wiimote connection."""
|
||||
|
||||
def __init__(self) -> None:
|
||||
self._r = 'wiimoteListenWindow'
|
||||
width = 650
|
||||
height = 210
|
||||
super().__init__(root_widget=ba.containerwidget(size=(width, height),
|
||||
transition='in_right'))
|
||||
btn = ba.buttonwidget(parent=self._root_widget,
|
||||
position=(35, height - 60),
|
||||
size=(140, 60),
|
||||
autoselect=True,
|
||||
label=ba.Lstr(resource='cancelText'),
|
||||
scale=0.8,
|
||||
on_activate_call=self._dismiss)
|
||||
ba.containerwidget(edit=self._root_widget, cancel_button=btn)
|
||||
_ba.start_listening_for_wii_remotes()
|
||||
self._wiimote_connect_counter = 15
|
||||
ba.app.ui.dismiss_wii_remotes_window_call = ba.WeakCall(self._dismiss)
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(15, height - 55),
|
||||
size=(width - 30, 30),
|
||||
text=ba.Lstr(resource=self._r + '.listeningText'),
|
||||
color=ba.app.ui.title_color,
|
||||
maxwidth=320,
|
||||
h_align='center',
|
||||
v_align='center')
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(15, height - 110),
|
||||
size=(width - 30, 30),
|
||||
scale=1.0,
|
||||
text=ba.Lstr(resource=self._r + '.pressText'),
|
||||
maxwidth=width * 0.9,
|
||||
color=(0.7, 0.9, 0.7, 1.0),
|
||||
h_align='center',
|
||||
v_align='center')
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(15, height - 140),
|
||||
size=(width - 30, 30),
|
||||
color=(0.7, 0.9, 0.7, 1.0),
|
||||
scale=0.55,
|
||||
text=ba.Lstr(resource=self._r + '.pressText2'),
|
||||
maxwidth=width * 0.95,
|
||||
h_align='center',
|
||||
v_align='center')
|
||||
self._counter_text = ba.textwidget(parent=self._root_widget,
|
||||
position=(15, 23),
|
||||
size=(width - 30, 30),
|
||||
scale=1.2,
|
||||
text='15',
|
||||
h_align='center',
|
||||
v_align='top')
|
||||
for i in range(1, 15):
|
||||
ba.timer(1.0 * i,
|
||||
ba.WeakCall(self._decrement),
|
||||
timetype=ba.TimeType.REAL)
|
||||
ba.timer(15.0, ba.WeakCall(self._dismiss), timetype=ba.TimeType.REAL)
|
||||
|
||||
def _decrement(self) -> None:
|
||||
self._wiimote_connect_counter -= 1
|
||||
ba.textwidget(edit=self._counter_text,
|
||||
text=str(self._wiimote_connect_counter))
|
||||
|
||||
def _dismiss(self) -> None:
|
||||
ba.containerwidget(edit=self._root_widget, transition='out_left')
|
||||
_ba.stop_listening_for_wii_remotes()
|
||||
|
||||
|
||||
class WiimoteLicenseWindow(ba.Window):
|
||||
"""Window displaying the Darwiinremote software license."""
|
||||
|
||||
def __init__(self) -> None:
|
||||
self._r = 'wiimoteLicenseWindow'
|
||||
width = 750
|
||||
height = 550
|
||||
super().__init__(root_widget=ba.containerwidget(size=(width, height),
|
||||
transition='in_right'))
|
||||
btn = ba.buttonwidget(parent=self._root_widget,
|
||||
position=(65, height - 50),
|
||||
size=(120, 60),
|
||||
scale=0.8,
|
||||
autoselect=True,
|
||||
label=ba.Lstr(resource='backText'),
|
||||
button_type='back',
|
||||
on_activate_call=self._close)
|
||||
ba.containerwidget(edit=self._root_widget, cancel_button=btn)
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(0, height - 48),
|
||||
size=(width, 30),
|
||||
text=ba.Lstr(resource=self._r + '.titleText'),
|
||||
h_align='center',
|
||||
color=ba.app.ui.title_color,
|
||||
v_align='center')
|
||||
license_text = (
|
||||
'Copyright (c) 2007, DarwiinRemote Team\n'
|
||||
'All rights reserved.\n'
|
||||
'\n'
|
||||
' Redistribution and use in source and binary forms, with or '
|
||||
'without modification,\n'
|
||||
' are permitted provided that'
|
||||
' the following conditions are met:\n'
|
||||
'\n'
|
||||
'1. Redistributions of source code must retain the above copyright'
|
||||
' notice, this\n'
|
||||
' list of conditions and the following disclaimer.\n'
|
||||
'2. Redistributions in binary form must reproduce the above'
|
||||
' copyright notice, this\n'
|
||||
' list of conditions and the following disclaimer in the'
|
||||
' documentation and/or other\n'
|
||||
' materials provided with the distribution.\n'
|
||||
'3. Neither the name of this project nor the names of its'
|
||||
' contributors may be used to\n'
|
||||
' endorse or promote products derived from this software'
|
||||
' without specific prior\n'
|
||||
' written permission.\n'
|
||||
'\n'
|
||||
'THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND'
|
||||
' CONTRIBUTORS "AS IS"\n'
|
||||
'AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT'
|
||||
' LIMITED TO, THE\n'
|
||||
'IMPLIED WARRANTIES OF MERCHANTABILITY'
|
||||
' AND FITNESS FOR A PARTICULAR'
|
||||
' PURPOSE\n'
|
||||
'ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR'
|
||||
' CONTRIBUTORS BE\n'
|
||||
'LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,'
|
||||
' OR\n'
|
||||
'CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT'
|
||||
' OF\n'
|
||||
' SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;'
|
||||
' OR BUSINESS\n'
|
||||
'INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,'
|
||||
' WHETHER IN\n'
|
||||
'CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR'
|
||||
' OTHERWISE)\n'
|
||||
'ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF'
|
||||
' ADVISED OF THE\n'
|
||||
'POSSIBILITY OF SUCH DAMAGE.\n')
|
||||
license_text_scale = 0.62
|
||||
ba.textwidget(parent=self._root_widget,
|
||||
position=(100, height * 0.45),
|
||||
size=(0, 0),
|
||||
h_align='left',
|
||||
v_align='center',
|
||||
padding=4,
|
||||
color=(0.7, 0.9, 0.7, 1.0),
|
||||
scale=license_text_scale,
|
||||
maxwidth=width * 0.9 - 100,
|
||||
max_height=height * 0.85,
|
||||
text=license_text)
|
||||
|
||||
def _close(self) -> None:
|
||||
ba.containerwidget(edit=self._root_widget, transition='out_right')
|
||||
26
ballisticacore-cmake/.idea/dictionaries/ericf.xml
generated
26
ballisticacore-cmake/.idea/dictionaries/ericf.xml
generated
@ -77,6 +77,7 @@
|
||||
<w>backgrounded</w>
|
||||
<w>backgrounding</w>
|
||||
<w>backtraces</w>
|
||||
<w>backwin</w>
|
||||
<w>ballistica</w>
|
||||
<w>ballisticacore</w>
|
||||
<w>bamasteraddr</w>
|
||||
@ -84,6 +85,7 @@
|
||||
<w>bameta</w>
|
||||
<w>bametainternal</w>
|
||||
<w>barebones</w>
|
||||
<w>baseaddr</w>
|
||||
<w>basetype</w>
|
||||
<w>basicsize</w>
|
||||
<w>basn</w>
|
||||
@ -152,6 +154,8 @@
|
||||
<w>buttonup</w>
|
||||
<w>buttonwidget</w>
|
||||
<w>bwst</w>
|
||||
<w>cacert</w>
|
||||
<w>cafile</w>
|
||||
<w>calced</w>
|
||||
<w>calcing</w>
|
||||
<w>calcs</w>
|
||||
@ -165,6 +169,7 @@
|
||||
<w>capitan</w>
|
||||
<w>cargs</w>
|
||||
<w>cbgn</w>
|
||||
<w>cbresults</w>
|
||||
<w>cbtnoffs</w>
|
||||
<w>ccdd</w>
|
||||
<w>ccind</w>
|
||||
@ -172,6 +177,7 @@
|
||||
<w>ccylinder</w>
|
||||
<w>cend</w>
|
||||
<w>centiseconds</w>
|
||||
<w>certifi</w>
|
||||
<w>cfgdir</w>
|
||||
<w>cfgpath</w>
|
||||
<w>changeme</w>
|
||||
@ -210,6 +216,7 @@
|
||||
<w>collidable</w>
|
||||
<w>collider</w>
|
||||
<w>columnwidget</w>
|
||||
<w>comms</w>
|
||||
<w>connectattr</w>
|
||||
<w>containerwidget</w>
|
||||
<w>controlfp</w>
|
||||
@ -229,6 +236,7 @@
|
||||
<w>crom</w>
|
||||
<w>crosswire</w>
|
||||
<w>crvel</w>
|
||||
<w>cryptosimple</w>
|
||||
<w>csize</w>
|
||||
<w>cspr</w>
|
||||
<w>cspre</w>
|
||||
@ -240,6 +248,7 @@
|
||||
<w>ctracker</w>
|
||||
<w>cubemap</w>
|
||||
<w>curtime</w>
|
||||
<w>curv</w>
|
||||
<w>cutef</w>
|
||||
<w>cvar</w>
|
||||
<w>data</w>
|
||||
@ -296,6 +305,7 @@
|
||||
<w>downsample</w>
|
||||
<w>dpad</w>
|
||||
<w>dpads</w>
|
||||
<w>dpos</w>
|
||||
<w>drpt</w>
|
||||
<w>dsize</w>
|
||||
<w>dsound</w>
|
||||
@ -349,6 +359,7 @@
|
||||
<w>exargs</w>
|
||||
<w>exctype</w>
|
||||
<w>exec'ed</w>
|
||||
<w>execed</w>
|
||||
<w>execinfo</w>
|
||||
<w>execing</w>
|
||||
<w>exhash</w>
|
||||
@ -403,6 +414,7 @@
|
||||
<w>fovs</w>
|
||||
<w>fovx</w>
|
||||
<w>fovy</w>
|
||||
<w>fpath</w>
|
||||
<w>framebuffers</w>
|
||||
<w>framedef</w>
|
||||
<w>frameldefs</w>
|
||||
@ -423,6 +435,7 @@
|
||||
<w>funcname</w>
|
||||
<w>fval</w>
|
||||
<w>fvals</w>
|
||||
<w>fwefocjwerj</w>
|
||||
<w>gamecenter</w>
|
||||
<w>gamedata</w>
|
||||
<w>gamepacket</w>
|
||||
@ -445,6 +458,7 @@
|
||||
<w>getbitshigh</w>
|
||||
<w>getcollidemodel</w>
|
||||
<w>getdata</w>
|
||||
<w>getenv</w>
|
||||
<w>gethostbyname</w>
|
||||
<w>getifaddr</w>
|
||||
<w>getifaddrs</w>
|
||||
@ -545,6 +559,7 @@
|
||||
<w>iometa</w>
|
||||
<w>ioprep</w>
|
||||
<w>ioprepped</w>
|
||||
<w>ioprepping</w>
|
||||
<w>iserverget</w>
|
||||
<w>iserverput</w>
|
||||
<w>isinst</w>
|
||||
@ -565,7 +580,9 @@
|
||||
<w>janky</w>
|
||||
<w>jaxis</w>
|
||||
<w>jcjwf</w>
|
||||
<w>jcrc</w>
|
||||
<w>jdict</w>
|
||||
<w>jfwe</w>
|
||||
<w>jmessage</w>
|
||||
<w>jnames</w>
|
||||
<w>json's</w>
|
||||
@ -710,6 +727,7 @@
|
||||
<w>nameval</w>
|
||||
<w>ndebug</w>
|
||||
<w>nearbytab</w>
|
||||
<w>nearstr</w>
|
||||
<w>nearval</w>
|
||||
<w>needwindow</w>
|
||||
<w>negativex</w>
|
||||
@ -928,6 +946,7 @@
|
||||
<w>redundants</w>
|
||||
<w>refcounted</w>
|
||||
<w>refl</w>
|
||||
<w>regionid</w>
|
||||
<w>regtp</w>
|
||||
<w>rehel</w>
|
||||
<w>reimported</w>
|
||||
@ -962,6 +981,7 @@
|
||||
<w>rtypes</w>
|
||||
<w>rtypevar</w>
|
||||
<w>runnables</w>
|
||||
<w>runseconds</w>
|
||||
<w>rvec</w>
|
||||
<w>rvel</w>
|
||||
<w>safecolor</w>
|
||||
@ -1128,6 +1148,7 @@
|
||||
<w>timesteps</w>
|
||||
<w>timetype</w>
|
||||
<w>timetypes</w>
|
||||
<w>tlog</w>
|
||||
<w>tmpmat</w>
|
||||
<w>tomer</w>
|
||||
<w>topos</w>
|
||||
@ -1145,6 +1166,7 @@
|
||||
<w>tradeoff</w>
|
||||
<w>trailcolor</w>
|
||||
<w>transobj</w>
|
||||
<w>transportagentrequest</w>
|
||||
<w>treturn</w>
|
||||
<w>trifunovic</w>
|
||||
<w>trilinear</w>
|
||||
@ -1156,6 +1178,7 @@
|
||||
<w>tval</w>
|
||||
<w>tvos</w>
|
||||
<w>tweakage</w>
|
||||
<w>twidth</w>
|
||||
<w>twotimer</w>
|
||||
<w>twst</w>
|
||||
<w>typeobj</w>
|
||||
@ -1166,6 +1189,7 @@
|
||||
<w>udif</w>
|
||||
<w>uibounds</w>
|
||||
<w>uiid</w>
|
||||
<w>unbased</w>
|
||||
<w>unblessed</w>
|
||||
<w>uncas</w>
|
||||
<w>unchecking</w>
|
||||
@ -1184,6 +1208,7 @@
|
||||
<w>unsynchronized</w>
|
||||
<w>uppercased</w>
|
||||
<w>userspace</w>
|
||||
<w>usid</w>
|
||||
<w>uther</w>
|
||||
<w>uuidmodule</w>
|
||||
<w>uuids</w>
|
||||
@ -1227,6 +1252,7 @@
|
||||
<w>wdeprecated</w>
|
||||
<w>weakref</w>
|
||||
<w>weakthis</w>
|
||||
<w>weakwin</w>
|
||||
<w>weeeird</w>
|
||||
<w>welp</w>
|
||||
<w>whaaaaaaa</w>
|
||||
|
||||
@ -13,6 +13,37 @@
|
||||
<inspection_tool class="ConstructionIsNotAllowed" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="DuplicateSwitchCase" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="GrazieInspection" enabled="false" level="TYPO" enabled_by_default="false" />
|
||||
<inspection_tool class="HttpUrlsUsage" enabled="true" level="WEAK WARNING" enabled_by_default="true">
|
||||
<option name="ignoredUrls">
|
||||
<list>
|
||||
<option value="http://localhost" />
|
||||
<option value="http://127.0.0.1" />
|
||||
<option value="http://0.0.0.0" />
|
||||
<option value="http://www.w3.org/" />
|
||||
<option value="http://json-schema.org/draft" />
|
||||
<option value="http://java.sun.com/" />
|
||||
<option value="http://xmlns.jcp.org/" />
|
||||
<option value="http://javafx.com/javafx/" />
|
||||
<option value="http://javafx.com/fxml" />
|
||||
<option value="http://maven.apache.org/xsd/" />
|
||||
<option value="http://maven.apache.org/POM/" />
|
||||
<option value="http://www.springframework.org/schema/" />
|
||||
<option value="http://www.springframework.org/tags" />
|
||||
<option value="http://www.springframework.org/security/tags" />
|
||||
<option value="http://www.thymeleaf.org" />
|
||||
<option value="http://www.jboss.org/j2ee/schema/" />
|
||||
<option value="http://www.jboss.com/xml/ns/" />
|
||||
<option value="http://www.ibm.com/webservices/xsd" />
|
||||
<option value="http://activemq.apache.org/schema/" />
|
||||
<option value="http://schema.cloudfoundry.org/spring/" />
|
||||
<option value="http://schemas.xmlsoap.org/" />
|
||||
<option value="http://cxf.apache.org/schemas/" />
|
||||
<option value="http://primefaces.org/ui" />
|
||||
<option value="http://tiles.apache.org/" />
|
||||
<option value="http://" />
|
||||
</list>
|
||||
</option>
|
||||
</inspection_tool>
|
||||
<inspection_tool class="ImplicitPointerAndIntegerConversion" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="IncompatibleTypes" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="InitializationIssue" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
|
||||
@ -34,7 +34,8 @@
|
||||
"ansiwrap",
|
||||
"filelock",
|
||||
"Cocoa",
|
||||
"pdoc"
|
||||
"pdoc",
|
||||
"certifi"
|
||||
],
|
||||
"python_paths": [
|
||||
"assets/src/ba_data/python",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND -->
|
||||
<h4><em>last updated for Ballistica version 1.6.8 build 20446</em></h4>
|
||||
<h4><em>last updated for Ballistica version 1.6.9 build 20480</em></h4>
|
||||
<p>This page documents the Python classes and functions in the 'ba' module,
|
||||
which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p>
|
||||
<hr>
|
||||
|
||||
@ -21,8 +21,8 @@
|
||||
namespace ballistica {
|
||||
|
||||
// These are set automatically via script; don't modify them here.
|
||||
const int kAppBuildNumber = 20446;
|
||||
const char* kAppVersion = "1.6.8";
|
||||
const int kAppBuildNumber = 20480;
|
||||
const char* kAppVersion = "1.6.9";
|
||||
|
||||
// Our standalone globals.
|
||||
// These are separated out for easy access.
|
||||
|
||||
@ -42,15 +42,12 @@ auto FatalError::ReportFatalError(const std::string& message,
|
||||
if (!dialog_msg.empty()) {
|
||||
dialog_msg += "\n";
|
||||
}
|
||||
// (No longer adding this note; individual errors to which the log is
|
||||
// relevant can do to themselves).
|
||||
// dialog_msg += "See BallisticaCore log for details.";
|
||||
|
||||
auto starttime = time(nullptr);
|
||||
|
||||
// Launch a thread and give it a chance to directly send our logs to the
|
||||
// master-server. The standard mechanism probably won't get the job done
|
||||
// since it relies on the game thread loop and we're likely blocking that.
|
||||
// since it relies on the logic thread loop and we're likely blocking that.
|
||||
// But generally we want to stay in this function and call abort() or whatnot
|
||||
// from here so that our stack trace makes it into platform logs.
|
||||
int result{};
|
||||
|
||||
@ -385,7 +385,7 @@ auto HostActivity::Update(millisecs_t time_advance) -> millisecs_t {
|
||||
|
||||
// If we haven't been told to start yet, don't do anything more.
|
||||
if (!_started) {
|
||||
return 1000;
|
||||
return 100;
|
||||
}
|
||||
|
||||
// Advance base time by the specified amount, stopping at all timers along the
|
||||
@ -426,7 +426,9 @@ void HostActivity::GraphicsQualityChanged(GraphicsQuality q) {
|
||||
}
|
||||
|
||||
void HostActivity::Draw(FrameDef* frame_def) {
|
||||
if (!_started) return;
|
||||
if (!_started) {
|
||||
return;
|
||||
}
|
||||
scene()->Draw(frame_def);
|
||||
}
|
||||
|
||||
|
||||
@ -515,4 +515,12 @@ auto Utils::BaseName(const std::string& val) -> std::string {
|
||||
return lastvalid;
|
||||
}
|
||||
|
||||
auto Utils::StripNonAsciiFromUTF8(const std::string& str) -> std::string {
|
||||
auto uni = UnicodeFromUTF8(str, "wGcwe87");
|
||||
uni.erase(
|
||||
std::remove_if(uni.begin(), uni.end(), [](int i) { return i > 127; }),
|
||||
uni.end());
|
||||
return UTF8FromUnicode(uni);
|
||||
}
|
||||
|
||||
} // namespace ballistica
|
||||
|
||||
@ -40,6 +40,10 @@ class Utils {
|
||||
static auto GetRandomNameList() -> const std::list<std::string>&;
|
||||
static void SetRandomNameList(const std::list<std::string>& names);
|
||||
|
||||
/// Strip non-ascii chars from a utf-8 string (the full chars; not just
|
||||
/// control characters).
|
||||
static auto StripNonAsciiFromUTF8(const std::string& s) -> std::string;
|
||||
|
||||
static auto UnicodeFromUTF8(const std::string& s, const char* loc)
|
||||
-> std::vector<uint32_t>;
|
||||
static auto UTF8FromUnicode(std::vector<uint32_t> unichars) -> std::string;
|
||||
|
||||
@ -99,7 +99,6 @@ Joystick::Joystick(int sdl_joystick_id, const std::string& custom_device_name,
|
||||
sdl_joystick_ = nullptr;
|
||||
|
||||
is_mfi_controller_ = (custom_device_name_ == kMFiControllerName);
|
||||
is_mac_wiimote_ = (custom_device_name_ == "Wiimote");
|
||||
|
||||
// Hard code a few remote controls.
|
||||
// The newer way to do this is just set 'UI-Only' on the device config
|
||||
@ -297,27 +296,6 @@ Joystick::~Joystick() {
|
||||
child_joy_stick_ = nullptr;
|
||||
}
|
||||
|
||||
// If we're a wiimote, announce our departure.
|
||||
if (g_buildconfig.ostype_macos() && is_mac_wiimote_) {
|
||||
char msg[255];
|
||||
|
||||
int num = device_number();
|
||||
|
||||
// If we disconnected before any events came through, treat it as an error.
|
||||
snprintf(msg, sizeof(msg), "Wii Remote #%d", num);
|
||||
|
||||
// Ask the user to try again if the disconnect was immediate.
|
||||
std::string s;
|
||||
if (GetRealTime() - creation_time_ < 5000) {
|
||||
s = g_game->GetResourceString("controllerDisconnectedTryAgainText");
|
||||
} else {
|
||||
s = g_game->GetResourceString("controllerDisconnectedText");
|
||||
}
|
||||
Utils::StringReplaceOne(&s, "${CONTROLLER}", msg);
|
||||
ScreenMessage(s);
|
||||
g_audio->PlaySound(g_media->GetSound(SystemSoundID::kCorkPop));
|
||||
}
|
||||
|
||||
// Have SDL actually close the joystick in the main thread.
|
||||
// Send a message back to the main thread to close this SDL Joystick.
|
||||
// HMMM - can we just have the main thread close the joystick immediately
|
||||
@ -342,25 +320,7 @@ auto Joystick::GetDefaultPlayerName() -> std::string {
|
||||
return InputDevice::GetDefaultPlayerName();
|
||||
}
|
||||
|
||||
void Joystick::ConnectionComplete() {
|
||||
assert(InGameThread());
|
||||
|
||||
// Special case for mac wiimotes.
|
||||
if (g_buildconfig.ostype_macos() && is_mac_wiimote_) {
|
||||
char msg[128];
|
||||
|
||||
int num = device_number();
|
||||
|
||||
snprintf(msg, sizeof(msg), "Wii Remote #%d", num);
|
||||
g_audio->PlaySound(g_media->GetSound(SystemSoundID::kGunCock));
|
||||
|
||||
// Replace ${CONTROLLER} with it in our message.
|
||||
std::string s = g_game->GetResourceString("controllerConnectedText");
|
||||
Utils::StringReplaceOne(&s, "${CONTROLLER}", msg);
|
||||
ScreenMessage(s);
|
||||
return;
|
||||
}
|
||||
}
|
||||
void Joystick::ConnectionComplete() { assert(InGameThread()); }
|
||||
|
||||
auto Joystick::ShouldBeHiddenFromUser() -> bool {
|
||||
std::string d_name = GetDeviceName();
|
||||
|
||||
@ -115,7 +115,6 @@ class Joystick : public InputDevice {
|
||||
bool is_remote_app_{};
|
||||
bool is_mfi_controller_{};
|
||||
bool is_mac_ps3_controller_{};
|
||||
bool is_mac_wiimote_{};
|
||||
|
||||
millisecs_t ps3_last_joy_press_time_{-10000};
|
||||
|
||||
|
||||
@ -25,56 +25,65 @@ class PlatformApple : public Platform {
|
||||
auto DoHasTouchScreen() -> bool override;
|
||||
auto GetUIScale() -> UIScale override;
|
||||
auto IsRunningOnDesktop() -> bool override;
|
||||
void HandleLog(const std::string& msg) override;
|
||||
void SetupDataDirectory() override;
|
||||
void GetTextBoundsAndWidth(const std::string& text, Rect* r,
|
||||
float* width) override;
|
||||
void FreeTextTexture(void* tex) override;
|
||||
auto HandleLog(const std::string& msg) -> void override;
|
||||
auto SetupDataDirectory() -> void override;
|
||||
auto GetTextBoundsAndWidth(const std::string& text, Rect* r, float* width)
|
||||
-> void override;
|
||||
auto FreeTextTexture(void* tex) -> void override;
|
||||
auto CreateTextTexture(int width, int height,
|
||||
const std::vector<std::string>& strings,
|
||||
const std::vector<float>& positions,
|
||||
const std::vector<float>& widths, float scale)
|
||||
-> void* override;
|
||||
auto GetTextTextureData(void* tex) -> uint8_t* override;
|
||||
void GetFriendScores(const std::string& game, const std::string& game_version,
|
||||
void* py_callback) override;
|
||||
void SubmitScore(const std::string& game, const std::string& version,
|
||||
int64_t score) override;
|
||||
void ReportAchievement(const std::string& achievement) override;
|
||||
auto GetFriendScores(const std::string& game, const std::string& game_version,
|
||||
void* py_callback) -> void override;
|
||||
auto SubmitScore(const std::string& game, const std::string& version,
|
||||
int64_t score) -> void override;
|
||||
auto ReportAchievement(const std::string& achievement) -> void override;
|
||||
auto HaveLeaderboard(const std::string& game, const std::string& config)
|
||||
-> bool override;
|
||||
void ShowOnlineScoreUI(const std::string& show, const std::string& game,
|
||||
const std::string& game_version) override;
|
||||
void Purchase(const std::string& item) override;
|
||||
void RestorePurchases() override;
|
||||
auto ShowOnlineScoreUI(const std::string& show, const std::string& game,
|
||||
const std::string& game_version) -> void override;
|
||||
auto Purchase(const std::string& item) -> void override;
|
||||
auto RestorePurchases() -> void override;
|
||||
auto NewAutoReleasePool() -> void* override;
|
||||
void DrainAutoReleasePool(void* pool) override;
|
||||
void DoOpenURL(const std::string& url) override;
|
||||
void ResetAchievements() override;
|
||||
void GameCenterLogin() override;
|
||||
void PurchaseAck(const std::string& purchase,
|
||||
const std::string& order_id) override;
|
||||
auto DrainAutoReleasePool(void* pool) -> void override;
|
||||
auto DoOpenURL(const std::string& url) -> void override;
|
||||
auto ResetAchievements() -> void override;
|
||||
auto GameCenterLogin() -> void override;
|
||||
auto PurchaseAck(const std::string& purchase, const std::string& order_id)
|
||||
-> void override;
|
||||
auto IsOSPlayingMusic() -> bool override;
|
||||
void SetHardwareCursorVisible(bool visible) override;
|
||||
void QuitApp() override;
|
||||
void GetScoresToBeat(const std::string& level, const std::string& config,
|
||||
void* py_callback) override;
|
||||
void OpenFileExternally(const std::string& path) override;
|
||||
void OpenDirExternally(const std::string& path) override;
|
||||
void MacMusicAppInit() override;
|
||||
auto SetHardwareCursorVisible(bool visible) -> void override;
|
||||
auto QuitApp() -> void override;
|
||||
auto GetScoresToBeat(const std::string& level, const std::string& config,
|
||||
void* py_callback) -> void override;
|
||||
auto OpenFileExternally(const std::string& path) -> void override;
|
||||
auto OpenDirExternally(const std::string& path) -> void override;
|
||||
auto MacMusicAppInit() -> void override;
|
||||
auto MacMusicAppGetVolume() -> int override;
|
||||
void MacMusicAppSetVolume(int volume) override;
|
||||
void MacMusicAppGetLibrarySource() override;
|
||||
void MacMusicAppStop() override;
|
||||
auto MacMusicAppSetVolume(int volume) -> void override;
|
||||
auto MacMusicAppGetLibrarySource() -> void override;
|
||||
auto MacMusicAppStop() -> void override;
|
||||
auto MacMusicAppPlayPlaylist(const std::string& playlist) -> bool override;
|
||||
auto MacMusicAppGetPlaylists() -> std::list<std::string> override;
|
||||
void StartListeningForWiiRemotes() override;
|
||||
void StopListeningForWiiRemotes() override;
|
||||
auto StartListeningForWiiRemotes() -> void override;
|
||||
auto StopListeningForWiiRemotes() -> void override;
|
||||
auto IsEventPushMode() -> bool override;
|
||||
auto ContainsPythonDist() -> bool override;
|
||||
auto GetPlatformName() -> std::string override;
|
||||
auto GetSubplatformName() -> std::string override;
|
||||
|
||||
auto DoClipboardIsSupported() -> bool override;
|
||||
auto DoClipboardHasText() -> bool override;
|
||||
auto DoClipboardSetText(const std::string& text) -> void override;
|
||||
auto DoClipboardGetText() -> std::string override;
|
||||
|
||||
/// Return current text from the clipboard. Raises an Exception if
|
||||
/// clipboard is unsupported or if there's no text on the clipboard.
|
||||
auto ClipboardGetText() -> std::string;
|
||||
|
||||
private:
|
||||
// std::mutex log_mutex_;
|
||||
// std::string log_line_;
|
||||
|
||||
@ -787,10 +787,7 @@ auto Platform::IsStdinATerminal() -> bool {
|
||||
auto Platform::GetOSVersionString() -> std::string { return ""; }
|
||||
|
||||
auto Platform::GetUserAgentString() -> std::string {
|
||||
// Fetch our device name here from main thread so it'll be safe
|
||||
// to from other threads later (it gets cached as a string)
|
||||
std::string device = GetDeviceName();
|
||||
|
||||
std::string version = GetOSVersionString();
|
||||
if (!version.empty()) {
|
||||
version = " " + version;
|
||||
@ -832,10 +829,17 @@ auto Platform::GetUserAgentString() -> std::string {
|
||||
if (IsRunningOnTV()) {
|
||||
subplatform += " OnTV";
|
||||
}
|
||||
return std::string("BallisticaCore ") + kAppVersion + subplatform + " ("
|
||||
+ std::to_string(kAppBuildNumber) + ") ("
|
||||
+ g_buildconfig.platform_string() + version + "; " + device + "; "
|
||||
+ GetLocale() + ")";
|
||||
|
||||
std::string out{std::string("BallisticaCore ") + kAppVersion + subplatform
|
||||
+ " (" + std::to_string(kAppBuildNumber) + ") ("
|
||||
+ g_buildconfig.platform_string() + version + "; " + device
|
||||
+ "; " + GetLocale() + ")"};
|
||||
|
||||
// This gets shipped to various places which might choke on fancy unicode
|
||||
// characers, so let's limit to simple ascii.
|
||||
out = Utils::StripNonAsciiFromUTF8(out);
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
auto Platform::GetCWD() -> std::string {
|
||||
@ -1479,7 +1483,9 @@ auto Platform::DoClipboardGetText() -> std::string {
|
||||
if (out == nullptr) {
|
||||
throw Exception("Error fetching clipboard contents.", PyExcType::kRuntime);
|
||||
}
|
||||
return out;
|
||||
std::string out_s{out};
|
||||
SDL_free(out);
|
||||
return out_s;
|
||||
#else
|
||||
// Shouldn't get here since we default to no clipboard support.
|
||||
FatalError("Shouldn't get here.");
|
||||
|
||||
@ -238,6 +238,16 @@ auto PyHasUserMods(PyObject* self, PyObject* args) -> PyObject* {
|
||||
BA_PYTHON_CATCH;
|
||||
}
|
||||
|
||||
auto PyContainsPythonDist(PyObject* self, PyObject* args) -> PyObject* {
|
||||
BA_PYTHON_TRY;
|
||||
Platform::SetLastPyCall("contains_python_dist");
|
||||
if (g_platform->ContainsPythonDist()) {
|
||||
Py_RETURN_TRUE;
|
||||
}
|
||||
Py_RETURN_FALSE;
|
||||
BA_PYTHON_CATCH;
|
||||
}
|
||||
|
||||
auto PyValueTest(PyObject* self, PyObject* args, PyObject* keywds)
|
||||
-> PyObject* {
|
||||
BA_PYTHON_TRY;
|
||||
@ -1040,6 +1050,11 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
|
||||
"\n"
|
||||
"(internal)"},
|
||||
|
||||
{"contains_python_dist", PyContainsPythonDist, METH_VARARGS,
|
||||
"contains_python_dist() -> bool\n"
|
||||
"\n"
|
||||
"(internal)"},
|
||||
|
||||
{"get_idle_time", PyGetIdleTime, METH_VARARGS,
|
||||
"get_idle_time() -> int\n"
|
||||
"\n"
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import sys
|
||||
import signal
|
||||
import threading
|
||||
@ -100,6 +101,20 @@ if debug_build != sys.flags.dev_mode:
|
||||
print(f'WARNING: Mismatch in debug_build {debug_build}'
|
||||
f' and sys.flags.dev_mode {sys.flags.dev_mode}')
|
||||
|
||||
# In embedded situations (when we're providing our own Python) let's
|
||||
# also provide our own root certs so ssl works. We can consider overriding
|
||||
# this in particular embedded cases if we can verify that system certs
|
||||
# are working.
|
||||
# (We also allow forcing this via an env var if the user desires)
|
||||
# pylint: disable=wrong-import-position
|
||||
if (_ba.contains_python_dist()
|
||||
or os.environ.get('BA_USE_BUNDLED_ROOT_CERTS') == '1'):
|
||||
import certifi
|
||||
|
||||
# Let both OpenSSL and requests (if present) know to use this.
|
||||
os.environ['SSL_CERT_FILE'] = os.environ['REQUESTS_CA_BUNDLE'] = (
|
||||
certifi.where())
|
||||
|
||||
# FIXME: I think we should init Python in the main thread, which should
|
||||
# also avoid these issues. (and also might help us play better with
|
||||
# Python debuggers?)
|
||||
@ -136,7 +151,6 @@ if debug_build:
|
||||
del testthread
|
||||
|
||||
# Clear out the standard quit/exit messages since they don't work for us.
|
||||
# pylint: disable=wrong-import-position
|
||||
# pylint: disable=c-extension-no-member
|
||||
if not TYPE_CHECKING:
|
||||
import __main__
|
||||
|
||||
@ -331,6 +331,7 @@ def update_assets_makefile(projroot: str, check: bool) -> None:
|
||||
all_targets_private),
|
||||
_get_targets('FONT_TARGETS', '.fdata', '.fdata',
|
||||
all_targets_private),
|
||||
_get_targets('PEM_TARGETS', '.pem', '.pem', all_targets_private),
|
||||
_get_targets('DATA_TARGETS',
|
||||
'.json',
|
||||
'.json',
|
||||
|
||||
@ -337,7 +337,8 @@ def _sync_standard_game_data(cfg: Config) -> None:
|
||||
' --prune-empty-dirs')
|
||||
|
||||
if cfg.include_scripts:
|
||||
cmd += " --include '*.py' --include '*." + OPT_PYC_SUFFIX + "'"
|
||||
cmd += (f" --include '*.py' --include '*.pem'"
|
||||
f" --include '*.{OPT_PYC_SUFFIX}'")
|
||||
|
||||
if cfg.include_textures:
|
||||
assert cfg.tex_suffix is not None
|
||||
|
||||
@ -30,6 +30,12 @@ class PipRequirement:
|
||||
|
||||
# Note: we look directly for modules when possible instead of just pip
|
||||
# entries; this accounts for manual installations or other nonstandard setups.
|
||||
|
||||
# Note 2: We can probably just replace this with a simple requirements.txt
|
||||
# file, can't we? Feels like we're mostly reinventing the wheel here.
|
||||
# We just need a clean way to check/list missing stuff without necessarily
|
||||
# installing it. And as far as manually-installed bits, pip itself must
|
||||
# have some way to allow for that, right?...
|
||||
PIP_REQUIREMENTS = [
|
||||
PipRequirement(modulename='pylint', minversion=[2, 12, 2]),
|
||||
PipRequirement(modulename='mypy', minversion=[0, 931]),
|
||||
@ -46,6 +52,8 @@ PIP_REQUIREMENTS = [
|
||||
PipRequirement(pipname='types-requests', minversion=[2, 27, 7]),
|
||||
PipRequirement(pipname='types-pytz', minversion=[2021, 3, 4]),
|
||||
PipRequirement(pipname='types-PyYAML', minversion=[6, 0, 3]),
|
||||
PipRequirement(pipname='certifi', minversion=[2021, 10, 8]),
|
||||
PipRequirement(pipname='types-certifi', minversion=[2021, 10, 8, 1]),
|
||||
]
|
||||
|
||||
# Parts of full-tests suite we only run on particular days.
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
# Released under the MIT License. See LICENSE for details.
|
||||
#
|
||||
# pylint: disable=too-many-lines
|
||||
"""A nice collection of ready-to-use pcommands for this package."""
|
||||
from __future__ import annotations
|
||||
|
||||
@ -301,6 +302,18 @@ def gen_fulltest_buildfile_linux() -> None:
|
||||
batools.build.gen_fulltest_buildfile_linux()
|
||||
|
||||
|
||||
def python_version_android() -> None:
|
||||
"""Print Android embedded Python version."""
|
||||
from efrotools.pybuild import PY_VER_EXACT_ANDROID
|
||||
print(PY_VER_EXACT_ANDROID, end='')
|
||||
|
||||
|
||||
def python_version_apple() -> None:
|
||||
"""Print Apple embedded Python version."""
|
||||
from efrotools.pybuild import PY_VER_EXACT_APPLE
|
||||
print(PY_VER_EXACT_APPLE, end='')
|
||||
|
||||
|
||||
def python_build_apple() -> None:
|
||||
"""Build an embeddable python for mac/ios/tvos."""
|
||||
_python_build_apple(debug=False)
|
||||
@ -360,6 +373,12 @@ def python_android_patch() -> None:
|
||||
pybuild.android_patch()
|
||||
|
||||
|
||||
def python_android_patch_ssl() -> None:
|
||||
"""Patches Python ssl to prep for building for Android."""
|
||||
from efrotools import pybuild
|
||||
pybuild.android_patch_ssl()
|
||||
|
||||
|
||||
def python_apple_patch() -> None:
|
||||
"""Patches Python to prep for building for Apple platforms."""
|
||||
from efrotools import pybuild
|
||||
|
||||
@ -52,7 +52,7 @@ def ioprep(cls: type, globalns: dict = None) -> None:
|
||||
with localns set to the class dict (so that types defined in the class
|
||||
can be used) and globalns set to the containing module's class.
|
||||
It is possible to override globalns for special cases such as when
|
||||
prepping happens as part of an exec'ed string instead of within a
|
||||
prepping happens as part of an execed string instead of within a
|
||||
module.
|
||||
"""
|
||||
PrepSession(explicit=True,
|
||||
|
||||
@ -84,6 +84,12 @@ def is_urllib_network_error(exc: BaseException) -> bool:
|
||||
exc,
|
||||
(urllib.error.URLError, ConnectionError, http.client.IncompleteRead,
|
||||
http.client.BadStatusLine, socket.timeout)):
|
||||
# Special case: although an HTTPError is a subclass of URLError,
|
||||
# we don't return True for it. It means we have successfully
|
||||
# communicated with the server but what we are asking for is
|
||||
# not there/etc.
|
||||
if isinstance(exc, urllib.error.HTTPError):
|
||||
return False
|
||||
return True
|
||||
if isinstance(exc, OSError):
|
||||
if exc.errno == 10051: # Windows unreachable network error.
|
||||
|
||||
@ -15,7 +15,7 @@ if TYPE_CHECKING:
|
||||
ENABLE_OPENSSL = True
|
||||
NEWER_PY_TEST = True
|
||||
|
||||
PY_VER_EXACT_ANDROID = '3.9.7'
|
||||
PY_VER_EXACT_ANDROID = '3.9.10'
|
||||
PY_VER_EXACT_APPLE = '3.9.6'
|
||||
|
||||
# Filenames we prune from Python lib dirs in source repo to cut down on size.
|
||||
@ -177,6 +177,17 @@ def build_android(rootdir: str, arch: str, debug: bool = False) -> None:
|
||||
ftxt,
|
||||
"source = 'https://www.openssl.org/source/openssl-1.1.1h.tar.gz'",
|
||||
"source = 'https://www.openssl.org/source/openssl-1.1.1l.tar.gz'")
|
||||
|
||||
# Give ourselves a handle to patch the OpenSSL build.
|
||||
ftxt = replace_one(
|
||||
ftxt,
|
||||
' # OpenSSL handles NDK internal paths by itself',
|
||||
' # Ericf addition: do some patching:\n'
|
||||
' self.run(["../../../../../../../tools/pcommand",'
|
||||
' "python_android_patch_ssl"])\n'
|
||||
' # OpenSSL handles NDK internal paths by itself',
|
||||
)
|
||||
|
||||
writefile('Android/build_deps.py', ftxt)
|
||||
|
||||
# Tweak some things in the base build script; grab the right version
|
||||
@ -190,8 +201,6 @@ def build_android(rootdir: str, arch: str, debug: bool = False) -> None:
|
||||
writefile('build.sh', ftxt)
|
||||
|
||||
# Ok, let 'er rip
|
||||
# (we often run these builds in parallel so limit to 1 job a piece;
|
||||
# otherwise they each inherit the -j12 or whatever from the top level).
|
||||
exargs = ' --with-pydebug' if debug else ''
|
||||
run(f'ARCH={arch} ANDROID_API=21 ./build.sh{exargs}')
|
||||
print('python build complete! (android/' + arch + ')')
|
||||
@ -348,6 +357,30 @@ def _patch_setup_file(platform: str, arch: str) -> None:
|
||||
writefile(fname, txt)
|
||||
|
||||
|
||||
def android_patch_ssl() -> None:
|
||||
"""Run necessary patches on an android ssl before building."""
|
||||
|
||||
# We bundle our own SSL root certificates on various platforms and use
|
||||
# the OpenSSL 'SSL_CERT_FILE' env var override to get them to be used
|
||||
# by default. However, OpenSSL is picky about allowing env-vars to be
|
||||
# used and something about the Android environment makes it disallow
|
||||
# them. So we need to force the issue. Alternately we could explicitly
|
||||
# pass 'cafile' args to SSLContexts whenever we do network-y stuff
|
||||
# but it seems cleaner to just have things work by default.
|
||||
fname = 'crypto/getenv.c'
|
||||
txt = readfile(fname)
|
||||
txt = replace_one(
|
||||
txt,
|
||||
('char *ossl_safe_getenv(const char *name)\n'
|
||||
'{\n'),
|
||||
('char *ossl_safe_getenv(const char *name)\n'
|
||||
'{\n'
|
||||
' // ERICF TWEAK: ALWAYS ALLOW GETENV.\n'
|
||||
' return getenv(name);\n'),
|
||||
)
|
||||
writefile(fname, txt)
|
||||
|
||||
|
||||
def winprune() -> None:
|
||||
"""Prune unneeded files from windows python dists."""
|
||||
for libdir in ('assets/src/windows/Win32/Lib',
|
||||
|
||||
@ -30,8 +30,9 @@ from batools.pcommand import (
|
||||
get_master_asset_src_dir, androidaddr, push_ipa, printcolors,
|
||||
gen_fulltest_buildfile_android, gen_fulltest_buildfile_windows,
|
||||
gen_fulltest_buildfile_apple, gen_fulltest_buildfile_linux,
|
||||
python_build_apple, python_build_apple_debug, python_build_android,
|
||||
python_build_android_debug, python_android_patch, python_apple_patch,
|
||||
python_version_android, python_version_apple, python_build_apple,
|
||||
python_build_apple_debug, python_build_android, python_build_android_debug,
|
||||
python_android_patch, python_android_patch_ssl, python_apple_patch,
|
||||
python_gather, python_winprune, capitalize, upper, efrocache_update,
|
||||
efrocache_get, get_modern_make, warm_start_asset_build, gendocs,
|
||||
update_docs_md, list_pip_reqs, install_pip_reqs, checkenv,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user