diff --git a/.efrocachemap b/.efrocachemap index ecce8b59..6c3444ad 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": "6e0c343aacae91cbe1547c687e94668e", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "098e142d582df6344e98394d6fb97db4", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "efd499526a39fd5179859a9e1625ec8d", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "6971d3fc8ae33a11482f1048d554b417", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "1220c1300c8cbe573fec751aa447de04", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "558d693e0437a5a27dae7d76fa1704f8", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "ee0a5079bca77d0d6acd8ebdf0fc3970", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "cf157e03d0507fdff6ff84437a177ac8", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "ba6b7c1f839d9c9e9fb873a089c0fa8a", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "bbb0ba330355a9338b3d67ffcc12d4c0", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "a89b14819ae8af278ec73c031a1af6f2", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "91e696d7b81d8066b29c567032427ac1", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "1f23c3a2788e9eb1b520d641fb88b324", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "914d24b36a02162edb938e4c9ec96fc4", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "51eb697d75b447f8b2b2fb540f38a14c", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "3bef3a27c3f4ac02ce38cadb9a57256b", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "140e5975208e167b54c894d12d2cd094", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "a0eef114cfc726deb89d700591258292", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "5f825428523357832b9d2504fdddea29", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "1dc44e1653e3f56311e3dccb5a043c60", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "95d3b3754686e9d8c0c2895ab7d4a9ef", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "e3a10a6162557f0b64b8bdd9d9229e24", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "832eaa27b31f6121d0381aaf53fdabfc", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "3ac128c996a7d4deeb9b91e30cce0464", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "c2e844b37743e2da5e2b1919ae793731", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "5c982aa2d96322a4a8f09ec1936a9796", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "1bbc7ec3c44fdc333a847795883bf31a", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "a500865463baa4a8c3984652f58d14bf", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "29c2a8fff49eead697f3408900f5f728", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "f77c2b93e5a160df583c446031cdb39e", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "91faf11638115b66ce588f87f8ba76b5", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "90f4af39be70330e6612934c493f5e30", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "92a16c5de14c19a77c74012035e6c1c4", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "0afbcacce3f606ff3715b44ccacb7538", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "d1ed86ad1a8895904eb398031cfa59ea", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "34be50255d63cfac06124e95cb888094", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "115d0ed634ce726705798ec06732d068", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "a30b4a3dea436d366366408833bf1299", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "fa21c12d85f2f71ee017d62479296b74", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "4654985fb946fb41e2ca9a46dd7f47a2", "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": "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", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "e7b856db02f1ce0214a82286c9d132b0", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "8fd0542f0c1e7ee1ff8742c4390ea221", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "1839372e1d8292d2448b11728b31f9e4", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "d4a46bf1f28322e5fb0904b0519312bf", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "318dc16cd148573d1110363d96f64bbb", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "3049a3bc0c86d870151856857c88abf2", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "ccd18401e52bb4a156e25413bf88be31", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "68c0c61ecdc257fd0a465b81e48f67ba", "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 1b4ff30d..48010603 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.34 (build 21815, api 8, 2024-04-24) +### 1.7.34 (build 21817, 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 06d2b4a1..538b053e 100644 --- a/src/assets/ba_data/python/babase/_app.py +++ b/src/assets/ba_data/python/babase/_app.py @@ -388,6 +388,7 @@ 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).""" @@ -407,6 +408,7 @@ class App: except Exception: logging.exception('Error importing baclassic.') return None + @property def plus(self) -> PlusSubsystem | None: """Our plus subsystem (if available).""" @@ -426,6 +428,7 @@ 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 784c01b2..6594c562 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 = 21815 +TARGET_BALLISTICA_BUILD = 21817 TARGET_BALLISTICA_VERSION = '1.7.34' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 040537c9..cb239c40 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 = 21815; +const int kEngineBuildNumber = 21817; const char* kEngineVersion = "1.7.34"; const int kEngineApiVersion = 8; diff --git a/tools/batools/appmodule.py b/tools/batools/appmodule.py index 81ccdf99..661de30d 100755 --- a/tools/batools/appmodule.py +++ b/tools/batools/appmodule.py @@ -93,6 +93,7 @@ def generate_app_module( # so we need to be consistent. if fset.allow_as_soft_requirement: contents += ( + f'\n' f'@property\n' f'def {fset.name}(self) -> {classname} | None:\n' f' """Our {fset.name} subsystem (if available)."""\n' @@ -118,6 +119,7 @@ def generate_app_module( ) else: contents += ( + f'\n' '@property\n' f'def {fset.name}(self) -> {classname}:\n' f' """Our {fset.name} subsystem'