diff --git a/.efrocachemap b/.efrocachemap index 04c9d305..57cd3537 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4174,22 +4174,22 @@ "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": "bcba337ed8ac9de4072ec4b0531cecc0", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "d9e3946c0fc9426b1989188bc7ad0bb5", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "13353d40a999bc4a28c37e510ca43632", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "3958d1b2c4b4e6248d128bb5095955c5", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "08c37833f49a94240b1836e7b4dd505d", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "bced16cde2c64a7e3a7cd519d74bcb33", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "7095335185d4a2e2af9b0fae22e59130", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "f79ac1270c9ee5f60eba58a707271172", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "2330d36d16dab1997707d61b4f534b6a", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "abcea01332b6f67e2b7dd7be868d5fc5", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "f3e46531db8b827655bfbb188d03991b", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "5c1086903c9a824c23ca6e5c640587df", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "43697b9fed85f29f40d4820e135f20d5", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "140ef329d160c07163f300c7317a4222", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "15637cd60e5a2990ffc10d6470d7be58", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "23847e31e247efc1f59ffbe046fd75be", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "92bd286969030fdcc3f0b8ebad115c74", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "711ea2ab6d63356b03ea7a29899afcef", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "513f33f187e85b909793ddd2aa9732a5", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "8e9824b44c359d404e2ad8fcf0f448f8", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "3409817015ddf936d5fc293d9d71c706", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "cb054db65cddf26f667d1842b17f2b7d", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "c97f0757f6282a46aad165ab2411818e", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "8302bf0d0ee175ae28c8fd2e24c71628", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "3f05bbbc8434cafe12b6692344cf5b6a", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "e367580ee6a85f7baf70f13f3e1b4867", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "cdf23977be0849e7e944e0a44cdaf140", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "23e305bc449464c6eef46867cd8c5363", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "0e5fc0e3f78ecc0a1cb382f00690829f", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "afcd6f10eca27f891a3c000fbfe80231", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "1c75953b11ccd3efe5396f2c0add5c9e", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "8d6c40f72e7d1abc922a0567c858b14f", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "2ee184af9b80d60afea7f97aba29cb16", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "37c5f795ccbaeffeb5d6ede4fe9f3c19", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "2ee184af9b80d60afea7f97aba29cb16", @@ -4202,14 +4202,14 @@ "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "d258789fd7bdc5092aab87ccb4601921", "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "314516411d5ac8e991a6f742f399d4de", "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "d258789fd7bdc5092aab87ccb4601921", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "e7c46aa9d11f7ac01821010e761c52e8", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "615f8cb29d397fae99d8799b09dba888", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "02d3ea8c69019e3e823757a681799060", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "d5edce6ed01e5788365d237caf33b2bb", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "1418609b6fc9bccdb9bf7491ceb1006c", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "116f2974f0d62881b7e0214bb3d55cf2", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "14673217ff28f3695c9fe764d0cf9d31", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "19085634b079ab18f88810588185aa0c", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "5393242850af9d26c0ee050765ee71cf", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "887c497ef3462b454bd00891e10da33b", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "37afc11cbb5bb3d8d5c617d285fd2ccf", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "36ef12603f477db495d4be42ae8428dc", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "9a935afd3302e43b8c8da97a901ee736", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "d02591202dd1201d6dd2c631344c2396", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "b079ea523eceb09c63f9269e1f2096dd", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "15693ffb865e33c99820ee4d4962a39c", "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 c440c3a1..bd3d9988 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22247, api 9, 2025-01-23) +### 1.7.37 (build 22248, api 9, 2025-01-23) - 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/config/requirements.txt b/config/requirements.txt index a1487add..66d95236 100644 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -7,7 +7,7 @@ pbxproj==4.2.1 pdoc==15.0.1 pur==7.3.3 pylint==3.3.3 -pylsp-mypy==0.6.9 +pylsp-mypy==0.7.0 pytest==8.3.4 python-daemon==3.1.2 python-lsp-black==2.0.0 diff --git a/src/assets/ba_data/python/baclassic/_accountv1.py b/src/assets/ba_data/python/baclassic/_accountv1.py index 5508a90d..10406f4c 100644 --- a/src/assets/ba_data/python/baclassic/_accountv1.py +++ b/src/assets/ba_data/python/baclassic/_accountv1.py @@ -212,7 +212,6 @@ class AccountV1Subsystem: 'Player Profiles' not in config or '__account__' not in config['Player Profiles'] ): - print('CREATING INITIAL') # Create a spaz with a nice default purply color. plus.add_v1_account_transaction( { diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index ff6ec4d3..40416921 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 = 22247 +TARGET_BALLISTICA_BUILD = 22248 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 6550f8a5..f74b2305 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 = 22247; +const int kEngineBuildNumber = 22248; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9; diff --git a/tools/efrotools/pylintplugins.py b/tools/efrotools/pylintplugins.py index d3fe138e..3b201e06 100644 --- a/tools/efrotools/pylintplugins.py +++ b/tools/efrotools/pylintplugins.py @@ -136,14 +136,22 @@ def func_annotations_filter(node: nc.NodeNG) -> nc.NodeNG: """Filter annotated function args/retvals. This accounts for deferred evaluation available in in Python 3.7+ - via 'from __future__ import annotations'. In this case we don't - want Pylint to complain about missing symbols in annotations when - they aren't actually needed at runtime. + via 'from __future__ import annotations'. In this case we don't want + Pylint to complain about missing symbols in annotations when they + aren't actually needed at runtime. And we strip out stuff under + TYPE_CHECKING blocks which means they'd often be seen as missing. """ # Only do this if deferred annotations are on. if not using_future_annotations(node): return node + # If this function has type-params, clear them and remove them from + # our locals. + if node.type_params: + for typevar in node.type_params: + del node.locals[typevar.name.name] + node.type_params.clear() + # Wipe out argument annotations. # Special-case: certain function decorators *do*