diff --git a/.efrocachemap b/.efrocachemap index 18a84952..201c993d 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4103,42 +4103,42 @@ "build/assets/windows/Win32/ucrtbased.dll": "bfd1180c269d3950b76f35a63655e9e1", "build/assets/windows/Win32/vc_redist.x86.exe": "15a5f1f876503885adbdf5b3989b3718", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "c8016b5962a9013f94e3af05997d1a28", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "51c5d1377cabdddb514bcc5d67cff181", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "ec871a338037c8e00bfef4515119e7cd", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "5dcc27823da279ffb31a704c887aeb54", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "4edd45b4d6b7550c3aefd8c64f54a3b9", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "2bddb3ec1fd7b3d345d34ce482f8a39d", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "ed41e2951939f7f8ecd2471c94420e4d", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "5fc1f21e0eef1b2122b08f37c34f3272", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "1cfc51382109d342bdbccc305f0910c8", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "330209da34ba652e10bf00fc38e0c46a", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "9cbe6bd4acfedd8cd90b075ee7af97ae", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "6fac95914873d4b20b2af1f096ace136", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "cc1bf9f7a2aa9f2e4cd575debe9e08c8", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "05ae9c00ffe153f2f35dd9284a439c17", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "7349c74e6c4b38620ec64cef45ee2a99", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "c62d5f9ec3f224bb7659080aabe8584e", - "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "7f06a3e871169a315fea2e76d1bd01db", - "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "845d1afbd32dbb82b6135f71ef6cc8f3", - "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "7f06a3e871169a315fea2e76d1bd01db", - "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "845d1afbd32dbb82b6135f71ef6cc8f3", - "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "3587a55cfce3bb8bcdc80566b37b34cf", - "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "167792a508037190954a60aa1f28f57b", - "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "3587a55cfce3bb8bcdc80566b37b34cf", - "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "167792a508037190954a60aa1f28f57b", - "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "bef2edf6cb26edc42ef7f27476c96309", - "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "704500ce5a49e58d33508b4d74deaac8", - "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "bef2edf6cb26edc42ef7f27476c96309", - "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "704500ce5a49e58d33508b4d74deaac8", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "110191eaa720b45fe4faa4ab71733cce", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "62e3a11647932c78589888338aa2dd37", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "93429c7115697703950aaa8fa084e33b", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "bc2a31bddb8b907ac93f04c6a06e543b", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "c1483f74b2117bcf17e72743a7e53a1e", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "94a9e8f13ee739ea5dae7c816db355e2", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "6a00610da4d3992afb5b2d19e719cfec", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "9e6053eb6c521a55690101b40e762201", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "5679c57e9f062babe3bc30c59b4e259b", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "85eb224abd29ef769b0429f754aa1f00", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "cfb118fcf2ab26cc9b8573855d926198", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "ea8290e9b8c46614a06f92e67dadb5be", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "cbca4ef71340187341cc5e135273581a", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "73723e1b19b6e84985462605a96654f7", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "b73b9f3a463ac06902dda8f70f11547d", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "ebd13391d2b0e78785f06b4cd5ec6465", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "9d3a95968e99a40265442ce1d0379b45", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "3e6f96efc2215f601dfd3ca4b9ab43fd", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "d85e3c636175516a096dae345932f4b6", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "62470f179f21fb79570bf488b3e7bcef", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "13510081ac3cf151eb8a1c19e5990ecc", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "1f381529e4cdd7f85950394fe3e23281", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "e466c3e95a8fa8fa32bd133abfd250f5", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "3985eedd8ca02a571e94a2100f39dfab", + "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "7be89afaa8f76db9125b9068825b9fc2", + "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "08fc092ff14906eca9e31d82ba74c42e", + "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "7be89afaa8f76db9125b9068825b9fc2", + "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "08fc092ff14906eca9e31d82ba74c42e", + "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "a7a74cef67f1af0ca19ca736682c8246", + "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "0c1fe05db5bb51a29ba4eb62fce3374b", + "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "a7a74cef67f1af0ca19ca736682c8246", + "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "0c1fe05db5bb51a29ba4eb62fce3374b", + "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "09b549be9f1f9bffb9e3ec0f2f250da8", + "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "74d89bb313924dda7ce6c48cd018a6ae", + "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "09b549be9f1f9bffb9e3ec0f2f250da8", + "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "74d89bb313924dda7ce6c48cd018a6ae", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "5c68c1f8555eb0461aad279612635a6a", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "ed35ed0efd56563dd1b693214a8825d5", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "5a8ced4d3466a11a15378239a06beeac", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "7143878970007805d6860340c46a7b36", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "f9a1366833d16972e1b4c0a3d0515db5", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "fef9c14fe464034fb743bfca3829a0ad", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "5cf97355e3ea2a28cdcf4e2843c55374", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "dd3e1a4d47d14a1d2136b87da4742520", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad", "src/ballistica/base/mgen/pyembed/binding_base.inc": "06042d31df0ff9af96b99477162e2a91", diff --git a/CHANGELOG.md b/CHANGELOG.md index 98b6676e..1a6a4079 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22133, api 9, 2024-12-12) +### 1.7.37 (build 22134, api 9, 2024-12-14) - 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 touch UI stuff at all you can simply bump your api version and call it a day. diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index efba3400..f0e8167b 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -53,7 +53,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 22133 +TARGET_BALLISTICA_BUILD = 22134 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 3a34c32a..893f3bd3 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 = 22133; +const int kEngineBuildNumber = 22134; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9; diff --git a/tools/efro/threadpool.py b/tools/efro/threadpool.py index 9086e51d..e10a94a9 100644 --- a/tools/efro/threadpool.py +++ b/tools/efro/threadpool.py @@ -39,7 +39,7 @@ class ThreadPoolExecutorPlus(ThreadPoolExecutor): self._max_no_wait_count = ( max_no_wait_count if max_no_wait_count is not None - else 50 if max_workers is None else max_workers * 4 + else 50 if max_workers is None else max_workers * 2 ) self._last_no_wait_warn_time: float | None = None self._no_wait_count_lock = threading.Lock()