diff --git a/.efrocachemap b/.efrocachemap index a6f8eac5..c0e0a327 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4038,26 +4038,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": "41f83778b832c4295b5459ca6d13d6b9", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "ab7dbe15ae191849468ed62f9a8ae79f", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "b14522369209e042b38d36e6c007f64e", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c39f80aa05cc4508e6df7599bfe7b669", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "ed0bfecdf788b80800323e3685062c38", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "b92635ecf6df8d1fd5c870640394f066", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "52528d0d6ca85a5ebaafa6e953e25e5f", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "4d9822529c3efb5e49fde73ae53007dd", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "059d77ed7f8b8c4d6394ac95f6de5f63", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "bc462ec34202f3317fb8e98dd297cdcd", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "66f62748034f9c105859037a01c7c748", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "51e5ad7bef454833ee6d1674103e0d2b", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "5ed5efa3e93808704f62238773f0492c", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "da51445201ad9fb5d61e25156bb4156b", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "1541c01b889833ddf895056bbd214d02", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "037e940f6c8af36948e18c559a54565b", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "e5cd0ab3d97a8716312b83743d0ba229", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "46be095ba226e8bec842388403c0784e", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "eca0060562ab4d4e839e2e6eded99ec8", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "84599fb32d088aa2734e3fad23500f1e", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "8ed7212a80b4b9ae361c64b998510afb", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "68ec82ad9e95305bb59dbd21379dfd6d", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "eb221e55254713d9070a0a01841cb74c", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "2b2d22949d533e1b1a4aa963782d20e2", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "2a01f1c1b14f46c75f03635e42b46450", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "196d2b43faa5e50dfa0ab766f7d99fea", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "b5a01fbaad2d10e11c52a1a069f47460", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "80a1780477074a8078012ea5173d8457", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "fe7ad5af71566bc62a5a8f2ae153397c", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "3166e547f1d0183d556da1458c865aec", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "9ff1b3838395fce75149aed51394ffca", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "d1101b65c7a1b82cad4c4d2d3e1d546e", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "470666e6db2a64417b953af77bc6c174", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "48ec6f972e5e33a49a67fb26ca79c720", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "d6fe0e17ebeef966409ecb7e36f68de6", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "dbf54df43f705ab70b29e47cb8b3469a", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "e2b04c1467d449f9724b1df66967d75f", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "93f1b0628dd7a3531888c01dfac7c9b8", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "1fd89dd5fc2d34b42c5f62c9afe3a20d", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "b59e9d245688d77790f975600a51bfea", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "24c1641a1bef7c56d8b3805fbd01ac30", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "3da37afad8903a3c24c38fb698a19ce1", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "24c1641a1bef7c56d8b3805fbd01ac30", diff --git a/CHANGELOG.md b/CHANGELOG.md index ebb32fc1..5a6acaeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.35 (build 21849, api 8, 2024-05-08) +### 1.7.35 (build 21850, api 8, 2024-05-08) - Fixed an issue where the engine would block at exit on some version of Linux until Ctrl-D was pressed in the calling terminal. - V2 accounts have been around for a while now, so the old V1 device login diff --git a/src/assets/.asset_manifest_public.json b/src/assets/.asset_manifest_public.json index 07ddf68c..97002d7a 100644 --- a/src/assets/.asset_manifest_public.json +++ b/src/assets/.asset_manifest_public.json @@ -508,12 +508,12 @@ "ba_data/python/bauiv1lib/settings/__pycache__/allsettings.cpython-312.opt-1.pyc", "ba_data/python/bauiv1lib/settings/__pycache__/audio.cpython-312.opt-1.pyc", "ba_data/python/bauiv1lib/settings/__pycache__/controls.cpython-312.opt-1.pyc", + "ba_data/python/bauiv1lib/settings/__pycache__/devtools.cpython-312.opt-1.pyc", "ba_data/python/bauiv1lib/settings/__pycache__/gamepad.cpython-312.opt-1.pyc", "ba_data/python/bauiv1lib/settings/__pycache__/gamepadadvanced.cpython-312.opt-1.pyc", "ba_data/python/bauiv1lib/settings/__pycache__/gamepadselect.cpython-312.opt-1.pyc", "ba_data/python/bauiv1lib/settings/__pycache__/graphics.cpython-312.opt-1.pyc", "ba_data/python/bauiv1lib/settings/__pycache__/keyboard.cpython-312.opt-1.pyc", - "ba_data/python/bauiv1lib/settings/__pycache__/moddingtools.cpython-312.opt-1.pyc", "ba_data/python/bauiv1lib/settings/__pycache__/nettesting.cpython-312.opt-1.pyc", "ba_data/python/bauiv1lib/settings/__pycache__/plugins.cpython-312.opt-1.pyc", "ba_data/python/bauiv1lib/settings/__pycache__/pluginsettings.cpython-312.opt-1.pyc", @@ -525,12 +525,12 @@ "ba_data/python/bauiv1lib/settings/allsettings.py", "ba_data/python/bauiv1lib/settings/audio.py", "ba_data/python/bauiv1lib/settings/controls.py", + "ba_data/python/bauiv1lib/settings/devtools.py", "ba_data/python/bauiv1lib/settings/gamepad.py", "ba_data/python/bauiv1lib/settings/gamepadadvanced.py", "ba_data/python/bauiv1lib/settings/gamepadselect.py", "ba_data/python/bauiv1lib/settings/graphics.py", "ba_data/python/bauiv1lib/settings/keyboard.py", - "ba_data/python/bauiv1lib/settings/moddingtools.py", "ba_data/python/bauiv1lib/settings/nettesting.py", "ba_data/python/bauiv1lib/settings/plugins.py", "ba_data/python/bauiv1lib/settings/pluginsettings.py", diff --git a/src/assets/Makefile b/src/assets/Makefile index c40d490a..39a0178e 100644 --- a/src/assets/Makefile +++ b/src/assets/Makefile @@ -401,12 +401,12 @@ SCRIPT_TARGETS_PY_PUBLIC = \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/allsettings.py \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/audio.py \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/controls.py \ + $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/devtools.py \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/gamepad.py \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/gamepadadvanced.py \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/gamepadselect.py \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/graphics.py \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/keyboard.py \ - $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/moddingtools.py \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/nettesting.py \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/plugins.py \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/pluginsettings.py \ @@ -677,12 +677,12 @@ SCRIPT_TARGETS_PYC_PUBLIC = \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/allsettings.cpython-312.opt-1.pyc \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/audio.cpython-312.opt-1.pyc \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/controls.cpython-312.opt-1.pyc \ + $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/devtools.cpython-312.opt-1.pyc \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/gamepad.cpython-312.opt-1.pyc \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/gamepadadvanced.cpython-312.opt-1.pyc \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/gamepadselect.cpython-312.opt-1.pyc \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/graphics.cpython-312.opt-1.pyc \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/keyboard.cpython-312.opt-1.pyc \ - $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/moddingtools.cpython-312.opt-1.pyc \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/nettesting.cpython-312.opt-1.pyc \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/plugins.cpython-312.opt-1.pyc \ $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/pluginsettings.cpython-312.opt-1.pyc \ diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 3582b04a..70ea8b28 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 = 21849 +TARGET_BALLISTICA_BUILD = 21850 TARGET_BALLISTICA_VERSION = '1.7.35' diff --git a/src/assets/ba_data/python/bauiv1lib/account/v2proxy.py b/src/assets/ba_data/python/bauiv1lib/account/v2proxy.py index 0ee06a33..a5a3ae6b 100644 --- a/src/assets/ba_data/python/bauiv1lib/account/v2proxy.py +++ b/src/assets/ba_data/python/bauiv1lib/account/v2proxy.py @@ -130,7 +130,9 @@ class V2ProxySignInWindow(bui.Window): def _get_server_address(self) -> str: plus = bui.app.plus assert plus is not None - return plus.get_master_server_address(version=2) + out = plus.get_master_server_address(version=2) + assert isinstance(out, str) + return out def _set_error_state(self, error_location: str) -> None: msaddress = self._get_server_address() diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index b8301138..5fe6e038 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 = 21849; +const int kEngineBuildNumber = 21850; const char* kEngineVersion = "1.7.35"; const int kEngineApiVersion = 8;