langs and tidying

This commit is contained in:
Eric 2024-11-11 09:03:22 -08:00
parent bfb458110c
commit ffc958de71
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
7 changed files with 53 additions and 38 deletions

64
.efrocachemap generated
View File

@ -421,13 +421,13 @@
"build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26", "build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26",
"build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8", "build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8",
"build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55", "build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55",
"build/assets/ba_data/data/langdata.json": "4fdebf86822ee3fea6eeab25ba579eab", "build/assets/ba_data/data/langdata.json": "b65096b19719a444753c2e7e134cf3e7",
"build/assets/ba_data/data/languages/arabic.json": "4a6fc46285d6289ee14a7ccd9e801ac4", "build/assets/ba_data/data/languages/arabic.json": "4a6fc46285d6289ee14a7ccd9e801ac4",
"build/assets/ba_data/data/languages/belarussian.json": "1004e5ea10b8deaef517fd37e9309521", "build/assets/ba_data/data/languages/belarussian.json": "1004e5ea10b8deaef517fd37e9309521",
"build/assets/ba_data/data/languages/chinese.json": "57d199cfd2a5cf493e777dd96cc12f7c", "build/assets/ba_data/data/languages/chinese.json": "57d199cfd2a5cf493e777dd96cc12f7c",
"build/assets/ba_data/data/languages/chinesetraditional.json": "904b35b656c53f9830e406565edd5120", "build/assets/ba_data/data/languages/chinesetraditional.json": "904b35b656c53f9830e406565edd5120",
"build/assets/ba_data/data/languages/croatian.json": "b23619cb396ac16640c47458f884b16a", "build/assets/ba_data/data/languages/croatian.json": "b23619cb396ac16640c47458f884b16a",
"build/assets/ba_data/data/languages/czech.json": "7f123919752ed1e9de5bd06b46fa811e", "build/assets/ba_data/data/languages/czech.json": "d18b7d1c6bf51fc81af4084ef0e69e3e",
"build/assets/ba_data/data/languages/danish.json": "8e57db30c5250df2abff14a822f83ea7", "build/assets/ba_data/data/languages/danish.json": "8e57db30c5250df2abff14a822f83ea7",
"build/assets/ba_data/data/languages/dutch.json": "734357560f53b4820221f6d60a0b79e8", "build/assets/ba_data/data/languages/dutch.json": "734357560f53b4820221f6d60a0b79e8",
"build/assets/ba_data/data/languages/english.json": "dffc4a03b94c74f11da188a7c4187eda", "build/assets/ba_data/data/languages/english.json": "dffc4a03b94c74f11da188a7c4187eda",
@ -443,7 +443,7 @@
"build/assets/ba_data/data/languages/italian.json": "3557cd4697da8c59ed33bda066e8cd93", "build/assets/ba_data/data/languages/italian.json": "3557cd4697da8c59ed33bda066e8cd93",
"build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597", "build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597",
"build/assets/ba_data/data/languages/malay.json": "f6ce0426d03a62612e3e436ed5d1be1f", "build/assets/ba_data/data/languages/malay.json": "f6ce0426d03a62612e3e436ed5d1be1f",
"build/assets/ba_data/data/languages/persian.json": "fc25780341e0dfebc393e4c1c846b7a9", "build/assets/ba_data/data/languages/persian.json": "2584895475fe62b3fe49a5ea5e69b4b1",
"build/assets/ba_data/data/languages/piratespeak.json": "b9fe871e6331b7178cbacbf7eb3033aa", "build/assets/ba_data/data/languages/piratespeak.json": "b9fe871e6331b7178cbacbf7eb3033aa",
"build/assets/ba_data/data/languages/polish.json": "89333fb207f9eb2f22fff5a95b022c35", "build/assets/ba_data/data/languages/polish.json": "89333fb207f9eb2f22fff5a95b022c35",
"build/assets/ba_data/data/languages/portuguese.json": "e1c4414fced051d2c1967417fd47650a", "build/assets/ba_data/data/languages/portuguese.json": "e1c4414fced051d2c1967417fd47650a",
@ -455,7 +455,7 @@
"build/assets/ba_data/data/languages/swedish.json": "3b179e7333183c70adb0811246b09959", "build/assets/ba_data/data/languages/swedish.json": "3b179e7333183c70adb0811246b09959",
"build/assets/ba_data/data/languages/tamil.json": "ead39b864228696a9b0d19344bc4b5ec", "build/assets/ba_data/data/languages/tamil.json": "ead39b864228696a9b0d19344bc4b5ec",
"build/assets/ba_data/data/languages/thai.json": "383540a1e9c7c131ac579f51afc87471", "build/assets/ba_data/data/languages/thai.json": "383540a1e9c7c131ac579f51afc87471",
"build/assets/ba_data/data/languages/turkish.json": "1be60cb9d302f4f7e56d330ca2266324", "build/assets/ba_data/data/languages/turkish.json": "9e8268786667aa3531593edb6ee66112",
"build/assets/ba_data/data/languages/ukrainian.json": "3a5b8132690fcd583d280879876c85b7", "build/assets/ba_data/data/languages/ukrainian.json": "3a5b8132690fcd583d280879876c85b7",
"build/assets/ba_data/data/languages/venetian.json": "abebcc38ca2655578e65428cc0dd3c45", "build/assets/ba_data/data/languages/venetian.json": "abebcc38ca2655578e65428cc0dd3c45",
"build/assets/ba_data/data/languages/vietnamese.json": "34a8b75acba2c0234e0b00fb4ef7d011", "build/assets/ba_data/data/languages/vietnamese.json": "34a8b75acba2c0234e0b00fb4ef7d011",
@ -4099,26 +4099,26 @@
"build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1",
"build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae",
"build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "a6841d15af7004dd8d2d386a842b4709", "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "d7f10c3f6cdb9cf2b617408c4021ba94",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "20c661b438cde04f39290c2be62ea75e", "build/prefab/full/linux_arm64_gui/release/ballisticakit": "cc61292668bd17f2fe46e073773d2987",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "183103bc7744a6be137f143462bca148", "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "b2c092184364928890c77282a5544e9e",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "3a8b771b086d7f32bd0f77728eb8c887", "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "7372c74f2900f47bcd6953693f788d72",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "a678e196b105a83509177ecb9a9a6d5a", "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "1e79fb952b6075e58413e6f257076916",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "37e331129561ac101082fce08ffbc486", "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "642ee237382bf3808483e6740b80f9b6",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "0751de47e88db5d9ce64f58f8bb45762", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "873580f2b9a6b7188d1a30abddb5c84c",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "92514f06443aa7dac0ad3d8988622976", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "6b801d131c8d806e4cd5e7bf0c9fa3d6",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "a7ca029db29d4b8327ed503db48d85f2", "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "a4f8909d27bdbee9b0cfc48834ae0be6",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "36c37c66319acfd4b7743e62b7cb1e77", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "94c19f209b480f260da24974a79528cd",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "1604c4533a5ac25e8eecaa142dcc2f6e", "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "664922197f3efde05ba6bab2f0991536",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "702f21a77364207bd5d16db422eb86f7", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "473c6da755e14a6becaab77e8a5ad177",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "1b43680783be88f487d7970b8aced715", "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "7635450968685b65cf9e0158cc5b6fd5",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "4a731236b62ff6c55256a466a85f6ce9", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "b0c911dd26aef2eea3718fe21d515147",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "e10dcd80e905db982cb27a25a95855c0", "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "0a3bdfe76614c15e1ab798d385e3183a",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "cf665bb5ff3b616c309890834f38cf50", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "de6f251f4a1db14a170ae1233706b40d",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "7b8324461441b1e0357ee2b5964772f7", "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "60e177e9f1cde10f41d8bffaa73d2be5",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "7442618d1ffd96cc4d68bdc30e62ad20", "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "ed57460f12c3f7710ba7ad0ddc2e619d",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "f1dc5326c6e36828a390d04e6c01ba8d", "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "b395fbc250273e3cf72ac3263f306035",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "14071d8daeafb1ccbc11076ef6ac5774", "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "07d9bb8210e810aa3d0d59f4ec3a85a0",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "45b1203c8f48993bb49cb5ede270cbbf", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "45b1203c8f48993bb49cb5ede270cbbf",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "462796ac70e26fe008fc0930753e8036", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "462796ac70e26fe008fc0930753e8036",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "45b1203c8f48993bb49cb5ede270cbbf", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "45b1203c8f48993bb49cb5ede270cbbf",
@ -4135,14 +4135,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "bb665a4035cd8ec9352d20c59c72031c", "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "bb665a4035cd8ec9352d20c59c72031c",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "9a326b4ecd0db9be46adf95955f8da6f", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "9a326b4ecd0db9be46adf95955f8da6f",
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "bb665a4035cd8ec9352d20c59c72031c", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "bb665a4035cd8ec9352d20c59c72031c",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "0ece1fdeab74de4be599504a591d949f", "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "980e276c07a349ce1d405648e8571b45",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "079c882f0c6baa10f2ef7f42b087f617", "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "580a173f173bfd9dff02acbb32c8deda",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "abcf724404c5b00035caaf079fc050e6", "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "9cb2034864c90769f5807d1c70e26da0",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "452d56bc2ac76417a381e264ad125308", "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "b6507cb75a003c81306b8f8ff19980b9",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "8b6394f42bcc5f399b0cd4c01a5fbd38", "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "d3d6e2fc2fb69c13774aab00313bdb37",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "d1575db9537f7d238be33f78b024e02e", "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "a5f1248f358af481c19529e5823891bc",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "b542956867ac391f152b9f891449a655", "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "87f51d2a14428265594bf30e5cc6eea7",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "ebf8090869fbc6f443a8eef83b1efebd", "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "6c13e826bd7146c8aa886858e9a5772c",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad", "src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "3a583e7e03bd4907b21adc3bf5729d15", "src/ballistica/base/mgen/pyembed/binding_base.inc": "3a583e7e03bd4907b21adc3bf5729d15",

View File

@ -1,4 +1,4 @@
### 1.7.37 (build 22086, api 9, 2024-11-08) ### 1.7.37 (build 22091, api 9, 2024-11-11)
- Bumping api version to 9. As you'll see below, there's some UI changes that - Bumping api version to 9. As you'll see below, there's some UI changes that
will require a bit of work for any UI mods to adapt to. If your mods don't will require a bit of work for any UI mods to adapt to. If your mods don't
touch UI stuff at all you can simply bump your api version and call it a day. touch UI stuff at all you can simply bump your api version and call it a day.

View File

@ -26,7 +26,7 @@ multiplayer action on small diorama-like environments built from real-world
objects'. If you've got something you'd like to create that can fit within that objects'. If you've got something you'd like to create that can fit within that
box (as BombSquad itself does), give Ballistica a look. Of course, there is box (as BombSquad itself does), give Ballistica a look. Of course, there is
nothing preventing you from going and building a first person shooter out of nothing preventing you from going and building a first person shooter out of
this stuff, but I wouldn't recommend it. this stuff, but I wouldn't recommend it..
* **Python tomfoolery** * **Python tomfoolery**

View File

@ -53,7 +53,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be # Build number and version of the ballistica binary we expect to be
# using. # using.
TARGET_BALLISTICA_BUILD = 22086 TARGET_BALLISTICA_BUILD = 22091
TARGET_BALLISTICA_VERSION = '1.7.37' TARGET_BALLISTICA_VERSION = '1.7.37'

View File

@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
namespace ballistica { namespace ballistica {
// These are set automatically via script; don't modify them here. // These are set automatically via script; don't modify them here.
const int kEngineBuildNumber = 22086; const int kEngineBuildNumber = 22091;
const char* kEngineVersion = "1.7.37"; const char* kEngineVersion = "1.7.37";
const int kEngineApiVersion = 9; const int kEngineApiVersion = 9;

View File

@ -347,6 +347,17 @@ def checkenv() -> None:
print(f'{Clr.BLD}Checking environment...{Clr.RST}', flush=True) print(f'{Clr.BLD}Checking environment...{Clr.RST}', flush=True)
# Make sure they've got cmake.
if (
subprocess.run(
['which', 'cmake'], check=False, capture_output=True
).returncode
!= 0
):
raise CleanError(
'cmake is required; please install it via apt, brew, etc.'
)
# Make sure they've got curl. # Make sure they've got curl.
if ( if (
subprocess.run( subprocess.run(

View File

@ -117,11 +117,15 @@ def build_pcommandbatch(inpaths: list[str], outpath: str) -> None:
if require: if require:
raise CleanError('pcommandbatch build failed.') from exc raise CleanError('pcommandbatch build failed.') from exc
if verbose:
traceback.print_exc()
# No biggie; we'll just use regular pcommand. # No biggie; we'll just use regular pcommand.
print( print(
f'{Clr.YLW}Warning: Unable to build pcommandbatch executable;' f'{Clr.YLW}Warning: Unable to build pcommandbatch executable;'
f' falling back to regular pcommand. Build with env var' f' symlinking to regular pcommand. Build with env var'
f' BA_PCOMMANDBATCH_BUILD_VERBOSE=1 to see what went wrong.' f' BA_PCOMMANDBATCH_BUILD_VERBOSE=1 to see'
f' what went wrong.'
f'{Clr.RST}', f'{Clr.RST}',
file=sys.stderr, file=sys.stderr,
) )