From 83b4f90a5092678aff30c6be18afd3513f7d7dc8 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 16 May 2024 13:59:05 -0700 Subject: [PATCH 1/2] work work --- .efrocachemap | 66 +++++++++---------- CHANGELOG.md | 2 +- src/assets/ba_data/python/baenv.py | 2 +- .../python/bauiv1lib/account/settings.py | 3 +- src/ballistica/shared/ballistica.cc | 2 +- 5 files changed, 37 insertions(+), 38 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 4a99135a..5eee78fe 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -421,21 +421,21 @@ "build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26", "build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8", "build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55", - "build/assets/ba_data/data/langdata.json": "c3b61c805a025a3d8667231004ccf2c7", + "build/assets/ba_data/data/langdata.json": "d8e4efbe103da8931f9f7264651b89e1", "build/assets/ba_data/data/languages/arabic.json": "5c27239be3d4f8daefd9f3bd7e99ff8d", - "build/assets/ba_data/data/languages/belarussian.json": "0a2b0ae82298cec42764558b5b49e4dd", + "build/assets/ba_data/data/languages/belarussian.json": "260d190aae3282a726b4a27019972d58", "build/assets/ba_data/data/languages/chinese.json": "fcd59e90c12e8106ce418b65b97b3db6", "build/assets/ba_data/data/languages/chinesetraditional.json": "319565f8a15667488f48dbce59278e39", "build/assets/ba_data/data/languages/croatian.json": "e671b9d0c012be1a30f9c15eb1b81860", "build/assets/ba_data/data/languages/czech.json": "15be4fd59895135bad0265f79b362d5b", "build/assets/ba_data/data/languages/danish.json": "8e57db30c5250df2abff14a822f83ea7", "build/assets/ba_data/data/languages/dutch.json": "b0900d572c9141897d53d6574c471343", - "build/assets/ba_data/data/languages/english.json": "4af8c7fd2a8cd8a4600b99bff6e1d633", + "build/assets/ba_data/data/languages/english.json": "9754e816d3bc3214b7e809950d642309", "build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880", "build/assets/ba_data/data/languages/filipino.json": "4a79d212995b5417e7b29c10478ed160", "build/assets/ba_data/data/languages/french.json": "ee2a81129519d7030a617308da8c9195", "build/assets/ba_data/data/languages/german.json": "eaf3f1bf633566de133c61f4f5377e62", - "build/assets/ba_data/data/languages/gibberish.json": "e8155eeaa18bb99c2fa8889ca7047aae", + "build/assets/ba_data/data/languages/gibberish.json": "3e68d809bd6ede3b9e2c57c147737e42", "build/assets/ba_data/data/languages/greek.json": "ad3c0d38f34d809824892d6f22808dbf", "build/assets/ba_data/data/languages/hindi.json": "bb3548531daf7bc7fee4a28d48228c32", "build/assets/ba_data/data/languages/hungarian.json": "6b08fea24b72cc805ed0dc59e11c4cd6", @@ -445,7 +445,7 @@ "build/assets/ba_data/data/languages/malay.json": "f6ce0426d03a62612e3e436ed5d1be1f", "build/assets/ba_data/data/languages/persian.json": "b1c794d266ebd3d07fc29cb86f2fc40e", "build/assets/ba_data/data/languages/polish.json": "fecaa70e2b8ec46dc78767ad1bba3602", - "build/assets/ba_data/data/languages/portuguese.json": "3fac849a4e9e790b64727cd26f73fe6d", + "build/assets/ba_data/data/languages/portuguese.json": "360cba83371761dc645c8d05d42d0644", "build/assets/ba_data/data/languages/romanian.json": "b3e46efd6f869dbd78014570e037c290", "build/assets/ba_data/data/languages/russian.json": "5463543e108c4fa9be924f23adef6028", "build/assets/ba_data/data/languages/serbian.json": "d7452dd72ac0e51680cb39b5ebaa1c69", @@ -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": "3949ea7a39d6a2114b7500c7fcceb611", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "076c22066265be0845e611de999e0a68", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "984cf6a7071965f8053639a17e2f044b", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "466e173c53b5f08f98a4724b1de999bf", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "3d3126250a23f5fdc716153c556c6ae9", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "7d569a3c3c2923378e9a02f5e49de1b2", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "3d68d2d2837f084eee6b5c702e02ed41", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "9143d5b8335331d1c107af108ff914c4", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "ef430017676ce525d55fad0137ad51f3", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "b50de91cf73bb407f156a698c45e9e9a", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "039ab05ea21d61756187d632a52fbb8a", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "f0c2a4eea704f53d81e4a394c39a8936", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "4f4f8c765f3596f83f3caa39e569cf5d", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "1994972677f54b6ed681226690939d23", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "fec0105ec74a1886b9e6f58f78c9e576", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "95bc18eb743104c2c9bd6c42b393d056", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "0738788a6cb012a7285826be6d5bf340", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "f4a680b748da46e82839632e9ce05b1c", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "9548ee31d4fb2dc38971d293dc39b749", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "275a760bcdc13100865c0a9ae3ca9645", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "798f4beaf9bcedbbd838801fa21c59b8", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "e3d1446bbe3995bc656f977ce016de44", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "371bb531dc5a4cd178577622c485d5d0", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "37c9405732e84aaca188183c38896c9b", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "e266cb630a6aaff062ae8b805320d168", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "da731180827f74d0397ad8de3513d460", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "e265dcac18f1daccf9df488fcc1b6724", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "abc3bca14a09f7d72f00472ee69cbaa2", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "8ddbda92222c7004ddc5d5d5265c8b36", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "196db86a2f8a93a26acdf91266e4f588", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "458049ccaefe3da9c823723707e4f723", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "7b37b6c057fdfdaf7f409e09ee28edd4", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "4169cbedc319f853b12c0d1aeeb3ec76", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "d938a796ab3d13df5370f33301e18eca", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "de10d0ff6c94f41f0cca96c6ac233f9d", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "f43fe241e0f8835cbdea01f8bf74424d", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "0ec9f146e516e97cba74bff545beb5ac", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "ef8ed32faa6178f34ac533a345949606", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "f6d9dd96ce26ce92f4f1841db61b94df", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "47356ab0500fffba3aae23f108378571", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "9162b53189b80d4e5938cd142acd2a1a", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "2226d0e2d34051d962320c86464f3a2d", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "9162b53189b80d4e5938cd142acd2a1a", @@ -4074,14 +4074,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "299b6c4b83966040618b27563b700c2a", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "08c2f91d086e6f3fa73ebc299112358a", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "299b6c4b83966040618b27563b700c2a", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "852405655276879ba8cb1724da6bba22", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "9eb785085a8758436934f2ca2db587e3", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "ddf74dba629d08b230f3c5a89b633533", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "8f0ac7816eaecb70f5d74f9cc579c07b", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "da86846065ea86d5892dc4da24a39113", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "dd3e02e7393bff0b4a3a99fba85eef6d", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "9a4d5fb0c2d44f49eed823f441a75dd2", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "44dd5d6776ba0c21b4f323d99644ce3e", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "f026468f13c67ff1a9ca679ef8f6f7ab", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "84e4049beeb3b0f5e7cfd9b83121f536", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "345f75c6a7221a0e9f42635cac45d11f", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "e9a3ed12e36203698e628a36b566cd6c", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "a372e6ea4f901da8c7edc33643ee698f", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "e722f21fbfa76247065aa90ff3a67810", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "1cdead9aa5f01b64805e148b7b4bfc99", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "3183d6a8e592e9ee658f75be7cfeed73", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "5548f407d97e380069f6c596c4e36cd7", "src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d", diff --git a/CHANGELOG.md b/CHANGELOG.md index 03afd83a..c11dee14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.35 (build 21876, api 8, 2024-05-15) +### 1.7.35 (build 21879, api 8, 2024-05-16) - 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/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 59031863..17953a4e 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 = 21876 +TARGET_BALLISTICA_BUILD = 21879 TARGET_BALLISTICA_VERSION = '1.7.35' diff --git a/src/assets/ba_data/python/bauiv1lib/account/settings.py b/src/assets/ba_data/python/bauiv1lib/account/settings.py index 9e6759b0..f92697b6 100644 --- a/src/assets/ba_data/python/bauiv1lib/account/settings.py +++ b/src/assets/ba_data/python/bauiv1lib/account/settings.py @@ -702,9 +702,8 @@ class AccountSettingsWindow(bui.Window): on_activate_call=self._v2_proxy_sign_in_press, ) - # TODO: Add translation strings for these. v2labeltext: bui.Lstr | str = ( - 'Sign in with an email address' + bui.Lstr(resource=self._r + '.signInWithAnEmailAddressText') if show_game_center_sign_in_button or show_google_play_sign_in_button or show_device_sign_in_button diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 8414ee08..6e0291a4 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 = 21876; +const int kEngineBuildNumber = 21879; const char* kEngineVersion = "1.7.35"; const int kEngineApiVersion = 8; From 6fa12c8efc0cf3f944184fc29f5615b0406cbda3 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 18 May 2024 13:42:09 -0700 Subject: [PATCH 2/2] Latest public/internal sync. --- .efrocachemap | 66 +++++++++---------- CHANGELOG.md | 2 + config/requirements.txt | 4 +- .../python/bauiv1lib/settings/plugins.py | 3 +- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 5eee78fe..9443c7c5 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -421,18 +421,18 @@ "build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26", "build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8", "build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55", - "build/assets/ba_data/data/langdata.json": "d8e4efbe103da8931f9f7264651b89e1", + "build/assets/ba_data/data/langdata.json": "9d65eab8b2e3de658fe8dd9e0400b59f", "build/assets/ba_data/data/languages/arabic.json": "5c27239be3d4f8daefd9f3bd7e99ff8d", "build/assets/ba_data/data/languages/belarussian.json": "260d190aae3282a726b4a27019972d58", "build/assets/ba_data/data/languages/chinese.json": "fcd59e90c12e8106ce418b65b97b3db6", "build/assets/ba_data/data/languages/chinesetraditional.json": "319565f8a15667488f48dbce59278e39", "build/assets/ba_data/data/languages/croatian.json": "e671b9d0c012be1a30f9c15eb1b81860", - "build/assets/ba_data/data/languages/czech.json": "15be4fd59895135bad0265f79b362d5b", + "build/assets/ba_data/data/languages/czech.json": "74219f9b06ff098387b40f85a5b0124e", "build/assets/ba_data/data/languages/danish.json": "8e57db30c5250df2abff14a822f83ea7", "build/assets/ba_data/data/languages/dutch.json": "b0900d572c9141897d53d6574c471343", "build/assets/ba_data/data/languages/english.json": "9754e816d3bc3214b7e809950d642309", "build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880", - "build/assets/ba_data/data/languages/filipino.json": "4a79d212995b5417e7b29c10478ed160", + "build/assets/ba_data/data/languages/filipino.json": "920fc429ec9b587edc2c6294fffada71", "build/assets/ba_data/data/languages/french.json": "ee2a81129519d7030a617308da8c9195", "build/assets/ba_data/data/languages/german.json": "eaf3f1bf633566de133c61f4f5377e62", "build/assets/ba_data/data/languages/gibberish.json": "3e68d809bd6ede3b9e2c57c147737e42", @@ -440,21 +440,21 @@ "build/assets/ba_data/data/languages/hindi.json": "bb3548531daf7bc7fee4a28d48228c32", "build/assets/ba_data/data/languages/hungarian.json": "6b08fea24b72cc805ed0dc59e11c4cd6", "build/assets/ba_data/data/languages/indonesian.json": "9103845242b572aa8ba48e24f81ddb68", - "build/assets/ba_data/data/languages/italian.json": "ff3b100e21aacd9d883d8f618843cdfd", + "build/assets/ba_data/data/languages/italian.json": "e1d69eb1eec31442bf981121c7cfaf17", "build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597", "build/assets/ba_data/data/languages/malay.json": "f6ce0426d03a62612e3e436ed5d1be1f", - "build/assets/ba_data/data/languages/persian.json": "b1c794d266ebd3d07fc29cb86f2fc40e", + "build/assets/ba_data/data/languages/persian.json": "8bd6251e46c8ca7fcd075d989e79f0d9", "build/assets/ba_data/data/languages/polish.json": "fecaa70e2b8ec46dc78767ad1bba3602", - "build/assets/ba_data/data/languages/portuguese.json": "360cba83371761dc645c8d05d42d0644", + "build/assets/ba_data/data/languages/portuguese.json": "615a59bd03f84659158d9f2608a4ab21", "build/assets/ba_data/data/languages/romanian.json": "b3e46efd6f869dbd78014570e037c290", - "build/assets/ba_data/data/languages/russian.json": "5463543e108c4fa9be924f23adef6028", + "build/assets/ba_data/data/languages/russian.json": "a19ff3d240a3c8dc2508296c161bc59c", "build/assets/ba_data/data/languages/serbian.json": "d7452dd72ac0e51680cb39b5ebaa1c69", "build/assets/ba_data/data/languages/slovak.json": "3c08c748c96c71bd9e1d7291fb8817b6", - "build/assets/ba_data/data/languages/spanish.json": "e26abe27bec6709a925cb5c348ab4bbc", + "build/assets/ba_data/data/languages/spanish.json": "6d41c60539072d2dd9608579954403b0", "build/assets/ba_data/data/languages/swedish.json": "5142a96597d17d8344be96a603da64ac", "build/assets/ba_data/data/languages/tamil.json": "b9fcc523639f55e05c7f4e7914f3321a", "build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945", - "build/assets/ba_data/data/languages/turkish.json": "8c36a8d6d4265085d9698996cd3a18cd", + "build/assets/ba_data/data/languages/turkish.json": "fe4c7354ca6e657c2645969325af574a", "build/assets/ba_data/data/languages/ukrainian.json": "76ad64cb4911c8d5a3e4815b865ce5bd", "build/assets/ba_data/data/languages/venetian.json": "96e7607b0aa79b7eb48cac8df77e8e65", "build/assets/ba_data/data/languages/vietnamese.json": "b175cd0f01d0433355f144aeaa333409", @@ -4046,18 +4046,18 @@ "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "da731180827f74d0397ad8de3513d460", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "e265dcac18f1daccf9df488fcc1b6724", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "abc3bca14a09f7d72f00472ee69cbaa2", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "8ddbda92222c7004ddc5d5d5265c8b36", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "196db86a2f8a93a26acdf91266e4f588", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "458049ccaefe3da9c823723707e4f723", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "7b37b6c057fdfdaf7f409e09ee28edd4", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "4169cbedc319f853b12c0d1aeeb3ec76", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "d938a796ab3d13df5370f33301e18eca", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "de10d0ff6c94f41f0cca96c6ac233f9d", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "f43fe241e0f8835cbdea01f8bf74424d", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "0ec9f146e516e97cba74bff545beb5ac", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "ef8ed32faa6178f34ac533a345949606", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "f6d9dd96ce26ce92f4f1841db61b94df", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "47356ab0500fffba3aae23f108378571", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f5c4aad85554354e8a4113430051d3c0", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "33f20935cb1cf6ccaf409846f84b241f", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "b0ce064a823d99ed4339795bcc1fbab6", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "62682664253767b108dd4a90670f3d8e", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "d9879931f0962b5775adbeca5ccf775e", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "4ca5c155c8acdd4440e8cbaf85edc0ff", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "e6380a0bb4434fab60ca89747a59dd55", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "cd7243e6a94a8c4d7e4cd9e2817677d9", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "9d5823f786d59206c9f65f5c7b982c77", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "9d8db2efd49a26203e3c34bdafea0328", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "b558bb689b502c628eb7ef28df6e775c", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "e55855561a2c1665bc04293761ac4a9a", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "9162b53189b80d4e5938cd142acd2a1a", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "2226d0e2d34051d962320c86464f3a2d", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "9162b53189b80d4e5938cd142acd2a1a", @@ -4066,22 +4066,22 @@ "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "b3942d4e7c940d86fc039ae149756d3f", "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "c2d287b53bdac7e5302fe833ac052d2c", "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "b3942d4e7c940d86fc039ae149756d3f", - "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "ae7eef1a68deb6d6bb54679664c5f9f1", - "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "7d92c616a8fcc0f9f5e7cf404379900e", - "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "ae7eef1a68deb6d6bb54679664c5f9f1", - "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "7d92c616a8fcc0f9f5e7cf404379900e", + "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "6c3d9a42b9cdc7af45f7273f76010dd5", + "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "404e2e994a58d2e930f189ab835ada45", + "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "6c3d9a42b9cdc7af45f7273f76010dd5", + "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "404e2e994a58d2e930f189ab835ada45", "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "848cfd50cf15726e3acefd60204a85c5", "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "299b6c4b83966040618b27563b700c2a", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "08c2f91d086e6f3fa73ebc299112358a", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "299b6c4b83966040618b27563b700c2a", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "f026468f13c67ff1a9ca679ef8f6f7ab", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "84e4049beeb3b0f5e7cfd9b83121f536", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "345f75c6a7221a0e9f42635cac45d11f", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "e9a3ed12e36203698e628a36b566cd6c", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "a372e6ea4f901da8c7edc33643ee698f", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "e722f21fbfa76247065aa90ff3a67810", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "1cdead9aa5f01b64805e148b7b4bfc99", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "3183d6a8e592e9ee658f75be7cfeed73", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "bf9b070d79c29b59a1a5a601f970181d", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "e4993050ca26d3407551c797207e7934", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "929ebabc472bf475bb0f761229e4b818", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "dbb096b31a43d7cf85d35404c2ae7222", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "892547735582daf94fd474d96ff02843", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "40f2bd5953e012d590c577ee28e488bb", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "6383d87955a72c1e63cf1626810bb81f", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "838f1b34920f9ab7b59fb2b353ddb367", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "5548f407d97e380069f6c596c4e36cd7", "src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d", diff --git a/CHANGELOG.md b/CHANGELOG.md index 72e9c2c3..a8e14605 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,8 @@ Previously, a server's address was always determined automatically based on how it connected to the master server, but this would only provide one of the two forms. Now it is possible to provide both. +- Spaz classes now have a `default_hitpoints` which makes customizing that + easier (Thanks rabbitboom!) - (WORK IN PROGRESS) As of this version, servers are *required* to be accessible via ipv4 to appear in the public listing. So they may need to provide an ipv4 address in their config if the automatically detected one is ipv6. This should diff --git a/config/requirements.txt b/config/requirements.txt index 7cd8f9d5..4988589f 100644 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -4,9 +4,9 @@ filelock==3.14.0 furo==2024.5.6 mypy==1.10.0 pbxproj==4.1.0 -pdoc==14.4.0 +pdoc==14.5.0 pur==7.3.1 -pylint==3.2.0 +pylint==3.2.1 pylsp-mypy==0.6.8 pytest==8.2.0 python-daemon==3.0.1 diff --git a/src/assets/ba_data/python/bauiv1lib/settings/plugins.py b/src/assets/ba_data/python/bauiv1lib/settings/plugins.py index 6728fbb2..bcece4e6 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/plugins.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/plugins.py @@ -339,9 +339,8 @@ class PluginWindow(bui.Window): show = not enabled else: assert_never(self._category) - # show = False - if not show: # pylint: disable=possibly-used-before-assignment + if not show: continue item_y = sub_height - (num_shown + 1) * plug_line_height