diff --git a/.efrocachemap b/.efrocachemap index 9231eba0..07e59daf 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -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": "2dd4e422903be4c49e784adf1419653a", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "075af3e80bf53538ef9f3080b2b63658", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "04b7d010bb6d9de3d107b0a6fa8ec6f1", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "0928e648767af6594ffc57c34482a6e5", - "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/full/linux_arm64_gui/debug/ballisticakit": "bd022f1b19b2fdbe7a48b9084dd8cb7a", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "1cfe22cea5f84b7bc5f8141d16d20575", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "f490b97609b282918b5233ad331efc62", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "8b864dcae5de4e4d8dd0ccbb8e57fa62", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "3b21dd0f65b32a20f5e255c4b2be7727", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "fe7a68d99dcd214fcc4048a9fc7cba15", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "05a85e2cf828727b74ddcea1f4e1222c", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "fd52509c4df00c5a9bb755cbf108e742", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "79828be9e11baaf3362de73958be3794", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "f73e3719c67bb542fb20b133f2e149c9", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "3767d48fbe6de53d3f0135440c7f3e39", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "2f520f7c438b6ebbdeb2c9c978821a5a", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "a79bfbab622090643dddeec57242c841", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "d3b4ab3992fb65e8ba7f2f79c662cfd4", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "f074e021a9b01b825988867915bc4fd6", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "f73ea5e1e7e7ae9c2a396928c4aaf200", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "8f72be8b1c92aed472681d7397ba3dfd", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "437d490133a4abbd7e2773a22c4b1011", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "6c711cb996cfef26c81abd3b0cc6668d", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "eb121e0ef12b070f0303b759d352045e", "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", diff --git a/CHANGELOG.md b/CHANGELOG.md index 67b1cdac..2bcf5e77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ -### 1.7.34 (build 21798, api 8, 2024-04-04) - +### 1.7.34 (build 21800, api 8, 2024-04-10) +- `_bascenev1.protocol_version()` now properly throw an exception if called + while scene-v1 is not active. + ### 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 while UIs are up (this could cause lots of chaos if it happened). diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 580f9392..9a92c0fd 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 = 21798 +TARGET_BALLISTICA_BUILD = 21800 TARGET_BALLISTICA_VERSION = '1.7.34' diff --git a/src/ballistica/scene_v1/python/methods/python_methods_scene.cc b/src/ballistica/scene_v1/python/methods/python_methods_scene.cc index c684628f..09f15847 100644 --- a/src/ballistica/scene_v1/python/methods/python_methods_scene.cc +++ b/src/ballistica/scene_v1/python/methods/python_methods_scene.cc @@ -1841,12 +1841,13 @@ static PyMethodDef PyHandleAppIntentExecDef = { "(internal)", }; -// ----------------------- handle_app_intent_default --------------------------- +// ---------------------------- protocol_version ------------------------------- static auto PyProtocolVersion(PyObject* self) -> PyObject* { BA_PYTHON_TRY; + return PyLong_FromLong( - SceneV1AppMode::GetSingleton()->host_protocol_version()); + SceneV1AppMode::GetActiveOrThrow()->host_protocol_version()); BA_PYTHON_CATCH; } diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 79fe5aef..a9d63993 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 = 21798; +const int kEngineBuildNumber = 21800; const char* kEngineVersion = "1.7.34"; const int kEngineApiVersion = 8;