From 00733a0fe721ecaa4906bc4c4b907c2602c8a526 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 4 Apr 2024 09:35:25 -0700 Subject: [PATCH] language updates and tidying --- .efrocachemap | 66 ++++++++++++++--------------- CHANGELOG.md | 2 +- src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/shared/ballistica.cc | 2 +- tools/bacommon/transfer.py | 12 ++++-- 5 files changed, 45 insertions(+), 39 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 456628d8..ff92ed63 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -421,10 +421,10 @@ "build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26", "build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8", "build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55", - "build/assets/ba_data/data/langdata.json": "2f94615f152d0725ce04368f8ee66da3", + "build/assets/ba_data/data/langdata.json": "49b75d31e07e050e45676534ac8637b7", "build/assets/ba_data/data/languages/arabic.json": "2c2915e10124bb8f69206da9c608d57c", "build/assets/ba_data/data/languages/belarussian.json": "09954e550d13d3d9cb5a635a1d32a151", - "build/assets/ba_data/data/languages/chinese.json": "bb51b5aa614830c561e8fe2542a9ab8a", + "build/assets/ba_data/data/languages/chinese.json": "5fa538e855bcfe20e727e0ad5831efad", "build/assets/ba_data/data/languages/chinesetraditional.json": "319565f8a15667488f48dbce59278e39", "build/assets/ba_data/data/languages/croatian.json": "e671b9d0c012be1a30f9c15eb1b81860", "build/assets/ba_data/data/languages/czech.json": "15be4fd59895135bad0265f79b362d5b", @@ -436,21 +436,21 @@ "build/assets/ba_data/data/languages/french.json": "917e4174d6f0eb7f00c27fd79cfbb924", "build/assets/ba_data/data/languages/german.json": "eaf3f1bf633566de133c61f4f5377e62", "build/assets/ba_data/data/languages/gibberish.json": "a1afce99249645003017ebec50e716fe", - "build/assets/ba_data/data/languages/greek.json": "2a992c9ab69b48070b2ca4ca0fb3bb8a", + "build/assets/ba_data/data/languages/greek.json": "ad3c0d38f34d809824892d6f22808dbf", "build/assets/ba_data/data/languages/hindi.json": "90f54663e15d85a163f1848a8e9d8d07", "build/assets/ba_data/data/languages/hungarian.json": "796a290a8c44a1e7635208c2ff5fdc6e", "build/assets/ba_data/data/languages/indonesian.json": "9103845242b572aa8ba48e24f81ddb68", "build/assets/ba_data/data/languages/italian.json": "59159a9ca784709e807e0855a7ba28b6", "build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597", "build/assets/ba_data/data/languages/malay.json": "f6ce0426d03a62612e3e436ed5d1be1f", - "build/assets/ba_data/data/languages/persian.json": "835ea1d84ec197972f7ca3adb945fb88", + "build/assets/ba_data/data/languages/persian.json": "d42aa034d03f487edd15e651d6f469ab", "build/assets/ba_data/data/languages/polish.json": "9d22c6643c097c4cb268d0d6b6319cd4", "build/assets/ba_data/data/languages/portuguese.json": "5dcc9a324a8e926a6d5dd109cceaee1a", "build/assets/ba_data/data/languages/romanian.json": "b3e46efd6f869dbd78014570e037c290", "build/assets/ba_data/data/languages/russian.json": "3efaaf5eac320fceef029501dec4109b", "build/assets/ba_data/data/languages/serbian.json": "d7452dd72ac0e51680cb39b5ebaa1c69", "build/assets/ba_data/data/languages/slovak.json": "c00fb27cf982ffad5a4370ad3b16bd21", - "build/assets/ba_data/data/languages/spanish.json": "a15adbfeb16be4a956e34b2515b60f10", + "build/assets/ba_data/data/languages/spanish.json": "124e1f0073e3ee6af2de70dcd1a834d1", "build/assets/ba_data/data/languages/swedish.json": "5142a96597d17d8344be96a603da64ac", "build/assets/ba_data/data/languages/tamil.json": "b9fcc523639f55e05c7f4e7914f3321a", "build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945", @@ -4065,26 +4065,26 @@ "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "088595496eb98a04878bbe73946b7183", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "c71ab153668ac6e7a3c86928d710b3dc", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "047852a837e1998fe4244fc9d0f42bf4", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "ab587bae74ec414fb61923bea711caee", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "26557cd14dd30a17c84f8fb4abfd46d2", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "cb0885abc1eec8519b61fb8c385c2cda", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "e23061489f67b8f07dce2c4b5f114d8e", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "6c9570104d3313f91a36931acafd1090", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f3c753945d1abdd4f0c6f8e3b09f9142", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "4d2b3597d0ea7378e4152c90526cc001", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "29c970d3fca2600b26f8548618765060", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "456eb5053a70ce81098f3a9e8c7b8d78", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "b74de464c83e3e8f8a5a6fcf612b3e29", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "80c62e2c9d1af776395558d667884959", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "612fdb5723e3e861b940bc2e22e9d42c", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "7c9d660f3c7e98f37dc5be7a33e96f13", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "9e1cd5fda749d313f965b983440e47f8", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "21f34254dbd5c921b0f66c0a87eedb0d", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "519f0d00eb047512c17e5b4e40561fb0", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "cb5304039c065b6c0a34859166956b84", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "c3c2a9aac9d82e89f63f5c3126e819ab", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "6a031509cfb7d89f4b30e9e024f0be47", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "f4841f8f3ac255c38911c51357165b7c", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "3e9cfce74758f7c9b806ee1448a9111b", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "1f0f54a836ed7381c77a22a3928c4b3a", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "d6a12c876c4d6d628c14bb2bb4417862", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "47dde4684e31ad30a716a2418b40af2b", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "ce6672c10571a681f77b97ed207c586b", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "19d60081cebccb5913e192289579a901", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "7b977a90f42fc8d0f927dda8ccf73f6f", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "69ccba366aaaab21cb3c70663261af5d", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "0c41d6d0ddf3086d019e108bfef674c0", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "be0acd747df282f902b5b0201f5070c9", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "2be9243903752cd2169eed3e2da98620", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "1056dbbb435f186667f917ce5bbdd23f", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "82f93176bd1c2df2e579f8ef645f4a7a", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "fc0baf5c0d08bc8241133cb5645e29b4", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "b120ef0cd3cd3ef2d745aa943d819da3", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "c042fa1721afb0c66b19c854c9846f04", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "97bc6ad401f80a4e6f8ef752422b1d0f", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "56d6440f62c271c4ce9ef520400395a3", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9", @@ -4101,14 +4101,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "fbdc80e41c5883b4a893d2f0786e377f", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "5a850bb2ea487161611ae4191248e625", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "816794092cd962fcd1aab985c4a45775", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "940bc303e680d0fe99a0a9af54d1160c", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "5fbbb9a210e03479f1ffb3b761e17ca6", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "1373c3db22910e9560138b9fdc7305c5", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "ec91e2269d625bdb65fb72e3682e06d6", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "5b9eab98a5482514f09dc48d80528030", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "779401eeee70330450f0c76db66c5e06", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "ed02958cd913246c00b9393b99e4b8b1", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "8acba69e706f7d8bf4db519066f2d270", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "8ccaa89d0f7cadd519ae6037b811050c", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "57221107f2d456ed50feb9783cc4fcf7", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "d03c90ae9b3edbea0365df3a3e9d9327", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "b6e8c5a4ad43bbe9e93beeb81d43f032", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "f60b6d424bf6e8685683f1d61d555b45", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "fe3c1cfb547ecd9c228e5ae51e030204", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d", "src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f", diff --git a/CHANGELOG.md b/CHANGELOG.md index 9818e356..67b1cdac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.34 (build 21797, api 8, 2024-03-27) +### 1.7.34 (build 21798, api 8, 2024-04-04) ### 1.7.33 (build 21795, api 8, 2024-03-24) - Stress test input-devices are now a bit smarter; they won't press any buttons diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index a43ba8fd..580f9392 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21797 +TARGET_BALLISTICA_BUILD = 21798 TARGET_BALLISTICA_VERSION = '1.7.34' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index ba6ec686..79fe5aef 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 21797; +const int kEngineBuildNumber = 21798; const char* kEngineVersion = "1.7.34"; const int kEngineApiVersion = 8; diff --git a/tools/bacommon/transfer.py b/tools/bacommon/transfer.py index 65221cbd..aa8d38dc 100644 --- a/tools/bacommon/transfer.py +++ b/tools/bacommon/transfer.py @@ -31,7 +31,9 @@ class DirectoryManifest: files: Annotated[dict[str, DirectoryManifestFile], IOAttrs('f')] - # _empty_hash: str | None = None + # Soft-default added April 2024; can remove eventually once this + # attr is widespread in client. + exists: Annotated[bool, IOAttrs('e', soft_default=True)] @classmethod def create_from_disk(cls, path: Path) -> DirectoryManifest: @@ -42,6 +44,8 @@ class DirectoryManifest: pathstr = str(path) paths: list[str] = [] + exists = path.exists() + if path.is_dir(): # Build the full list of relative paths. for basename, _dirnames, filenames in os.walk(path): @@ -51,7 +55,7 @@ class DirectoryManifest: # Make sure we end up with forward slashes no matter # what the os.* stuff above here was using. paths.append(Path(fullname[len(pathstr) + 1 :]).as_posix()) - elif path.exists(): + elif exists: # Just return a single file entry if path is not a dir. paths.append(path.as_posix()) @@ -76,7 +80,9 @@ class DirectoryManifest: if cpus is None: cpus = 4 with ThreadPoolExecutor(max_workers=cpus) as executor: - return cls(files=dict(executor.map(_get_file_info, paths))) + return cls( + files=dict(executor.map(_get_file_info, paths)), exists=exists + ) def validate(self) -> None: """Log any odd data in the manifest; for debugging."""