diff --git a/.efrocachemap b/.efrocachemap index 7af0ba06..32d0781e 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4056,26 +4056,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": "6c7508f088e0b061b0d443a51e6a852b", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "f6598ab7468acdec2ccc730d21e56fb0", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "532877b098f19696d19b1997a09f826d", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "63c466b9d41dbb548473bb98c2091fd2", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "61b5b25750bb5ab345013cb985f86551", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "5d7052354d7d68337e1ee853f6b9a757", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "20f068094c73beaa8c231ed058f32a28", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "848c1e4376474504f0d03fbecb2bf933", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "a699fb523ed5b9959014ceab98fe1c2b", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "456f860358d90f3dfaddffc5bd5d5eaa", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "b53a1d296d46fd782210dc3fe41b3306", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "63689cb81be98b9731b47757ff1768ed", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "f7a100bdb8431973c969b9817ce3239a", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "db2eca1c74a8eaf6169ab638223a15ed", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "1a44aae131f2208742d7c04d905ea2ea", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "7c7c4c3a64a3c82d6e89b7846f6f4ad4", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "9ac60da735da0e07d82cabbb0a23e3d2", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "3756377852b3e9ad4bbf079dee7a9e73", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "89c9207961bc55ea4ccaf2a9c64d4e1d", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "517249ffc950c28968a94e97dd6a4205", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "51eb8ee7f97835a487494bbe3869d702", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "bb5eade6de1fb338cbcb2cb691d4eebd", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "eeb855680f33e8901fcb23c4cb539369", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "403d1b20dc11319c6667039f012035c7", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "0fbf1ff1896de970aefe40b034966789", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "c63dcfbd5d429fb54a30b36e373c7c34", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "9264a2f5261cd3b56fced39db78cbf16", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "b78682fac01bedf15ef4ee13f0aede78", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "6242c63e436030308c8c918ce9ea3214", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "2a59b67dfdae26c4e2226c432f316cfc", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "315dacb75a96693695fe6c2aaf51073a", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "8535ef87b65343afdf9c1127c878dced", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "ca3ce870b93304802c3ea255aa73c3dd", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "076feb0c841deef01e26d1035d7c0721", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "ccb41c4fe7badef30f9bff7dff5d11dc", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "573d8bfa6e42ad03b3a8805b3644eaf3", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "5c81e62b2efc773a78f1ce24a914cb8c", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "539bf968a5ae26ae8f530c4bc99d03f8", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "a2ce60fe2c2bca31bbc0f11de54ef7bd", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "1a43b70c78f9acb51ce21ea19e49a471", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d838781c9192c6d1db86bd540478aadf", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "b9f7438c554cdadedd0d71aabb3a1d86", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d838781c9192c6d1db86bd540478aadf", @@ -4092,14 +4092,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "5471a38a2f6cc967b6518b7976d48cae", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "807b53c6ca38c392a7477f250d3a85e5", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "5471a38a2f6cc967b6518b7976d48cae", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "eda0b395775cdedf080e0d80aa7fbe7c", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "d8d746575d21eb26b56319f2d23b142d", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "6b6078e47e9993a9b2d9e08dd24adf22", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "ed7c7cd11e33fd5c9fa1bf7015cfc431", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "a69b5ba73dac421de34352f480dca39a", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "48fc85dbf186820241733d2d447f299f", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "957d5f95c29d018025fc4517acb2216d", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "d65f649dc8b6a1dbd0686ea95294605e", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "bbef6f83e4ece86c1ea79e8ce47d646e", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "38874969e7105641158e9534bd742f21", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "ffe0bf5f6930ed1cc6bec73fb561fbd1", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "266ca62586a3b4834b7db75dc06b5edc", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "09a7c3163096f00cea9dcdeefbd80704", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "3a7ee2f16d31cd3993c88a83436852d8", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "ee9694195368d80badf7cb91febe7e74", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "d3d35acc83d8b2480c4a10a88c97903c", "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 1527604c..e2825063 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.34 (build 21812, api 8, 2024-04-24) +### 1.7.34 (build 21813, api 8, 2024-04-24) - Bumped Python version from 3.11 to 3.12 for all builds and project tools. One of the things this means is that we can use `typing.override` instead of the `typing_extensions` version so the annoying requirement of installing diff --git a/src/assets/ba_data/python/babase/_app.py b/src/assets/ba_data/python/babase/_app.py index 5cf3bc04..06d2b4a1 100644 --- a/src/assets/ba_data/python/babase/_app.py +++ b/src/assets/ba_data/python/babase/_app.py @@ -388,7 +388,6 @@ class App: # __FEATURESET_APP_SUBSYSTEM_PROPERTIES_BEGIN__ # This section generated by batools.appmodule; do not edit. - @property def classic(self) -> ClassicSubsystem | None: """Our classic subsystem (if available).""" @@ -399,7 +398,6 @@ class App: @staticmethod def _create_classic_subsystem() -> ClassicSubsystem | None: # pylint: disable=cyclic-import - try: from baclassic import ClassicSubsystem @@ -409,7 +407,6 @@ class App: except Exception: logging.exception('Error importing baclassic.') return None - @property def plus(self) -> PlusSubsystem | None: """Our plus subsystem (if available).""" @@ -420,7 +417,6 @@ class App: @staticmethod def _create_plus_subsystem() -> PlusSubsystem | None: # pylint: disable=cyclic-import - try: from baplus import PlusSubsystem @@ -430,7 +426,6 @@ class App: except Exception: logging.exception('Error importing baplus.') return None - @property def ui_v1(self) -> UIV1Subsystem: """Our ui_v1 subsystem (always available).""" diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 1aaae17c..bdd45d17 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 = 21812 +TARGET_BALLISTICA_BUILD = 21813 TARGET_BALLISTICA_VERSION = '1.7.34' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index bc0d4449..a3beedec 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 = 21812; +const int kEngineBuildNumber = 21813; const char* kEngineVersion = "1.7.34"; const int kEngineApiVersion = 8; diff --git a/tools/batools/appmodule.py b/tools/batools/appmodule.py index 3b5a00c7..81ccdf99 100755 --- a/tools/batools/appmodule.py +++ b/tools/batools/appmodule.py @@ -69,11 +69,10 @@ def generate_app_module( contents = '' for fsetname in sorted(all_fset_names): - # for _fsname, fset in sorted(fsets.items()): if fsetname in missing_soft_fset_names: contents += ( f'\n' - f'@cached_property\n' + f'@property\n' f'def {fsetname}(self) -> Any | None:\n' f' """Our {fsetname} subsystem (not available' f' in this project)."""\n' @@ -94,10 +93,6 @@ def generate_app_module( # so we need to be consistent. if fset.allow_as_soft_requirement: contents += ( - # f'\n' - # f'_{fset.name}_init_lock = Lock()\n' - f'\n' - # f'@cached_property\n' f'@property\n' f'def {fset.name}(self) -> {classname} | None:\n' f' """Our {fset.name} subsystem (if available)."""\n' @@ -110,12 +105,6 @@ def generate_app_module( f'def _create_{fset.name}_subsystem()' f' -> {classname} | None:\n' f' # pylint: disable=cyclic-import\n' - f'\n' - # f' # cached_property is not thread safe as of' - # f' Python 3.12, so we\n' - # f' # need to wrangle that ourself' - # f' to avoid multiple instantiations.\n' - # f'\n' f' try:\n' f' from {modname} import {classname}\n' f'\n' @@ -129,8 +118,6 @@ def generate_app_module( ) else: contents += ( - f'\n' - # f'@cached_property\n' '@property\n' f'def {fset.name}(self) -> {classname}:\n' f' """Our {fset.name} subsystem'