Latest public/internal sync.

This commit is contained in:
Eric 2024-03-13 14:17:11 -07:00
parent 3a372c1a31
commit 222f28e626
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
2 changed files with 24 additions and 25 deletions

34
.efrocachemap generated
View File

@ -3521,7 +3521,7 @@
"build/assets/pylib-apple/zoneinfo/_common.py": "5b52bdac4156dcbac96743fa99468bf2",
"build/assets/pylib-apple/zoneinfo/_tzpath.py": "f021e91036bd38590f2ce643b59dc881",
"build/assets/pylib-apple/zoneinfo/_zoneinfo.py": "d000d61aa8998d0076c37f96cf40ca69",
"build/assets/sphinx/template/conf.py": "f095d5b0fd30c3776e9ee1256c9c035b",
"build/assets/sphinx/template/conf.py": "1d00917de95f8f62f372caa1146ff602",
"build/assets/windows/Win32/DLLs/_asyncio.pyd": "36024ca5f0f257dd4edfe1a3e92c1a07",
"build/assets/windows/Win32/DLLs/_asyncio_d.pyd": "a809fe3d7f3b6931e5f127821d0d30b6",
"build/assets/windows/Win32/DLLs/_bz2.pyd": "cf535d3d0a020f0ae5ff20336a56ba3b",
@ -4069,18 +4069,18 @@
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "d274844bc22a695d1ab75855dfa9313d",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "320c18e3900246441164f3fc0f50c76e",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "f576f7e4a29ce0c1b3c1fee330a087e8",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "3d64e8cdd86aacb85ff46bc31b68f6ca",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "ec8be3716a4636e4c4ea99100bb173a0",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "16b2a238064d00b98bde534d888f3012",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "f1f62d5e3ae16909fcc6a81f44ad5c63",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "ee6c80a56994a0be5e377474ccf077b2",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "eff2828ae6de6bdadaa97b1c28d393cd",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "a4d42fa94529da103093b589062011dc",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "fb9e882b485aa79a440158f8d5d27b7b",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "697fdd2e9baf6e5a39f25780ac401305",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "2b341714f29bb86c8621ca7d8e6b47ee",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "82e85a85697829b68b2c7767ea36fadf",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "1e2ff43543c81114d90a0854b58e6c9f",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "6774b85a5699361c6829d2f9cc8e28a8",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "9756ca295fc39ef34f327968f8af694f",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "8ecb04c58c56e0c25fefd6b3002ac643",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "eafab89aeb0f4708b4d305b393393fcc",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "abc4bb20768498174019ee34ac0d8fed",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "f5059d9384e36e4a01a69f57c9f0bf40",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "71f5fb174030e954fe8fce5c67f090a3",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "e8d8d8991d2df40dfe4f9a0e167d22ce",
"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",
@ -4097,14 +4097,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "fbdc80e41c5883b4a893d2f0786e377f",
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "8c0e9e61d1fd181880283b3c1ca23fd5",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "5a79b4cf27ce798d23741d46043de014",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "f4d46d65ce5924b7348e86a5a0a96cdb",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "d9a76fea59cf167073297139a3b30791",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "890a94f1091f9eba729991eac95fe523",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "bb57e51c4dba3dbccc86ad177b4c1a0d",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "e331ee4c1374a73f2325f86ac98f7f53",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a1b03a030785baa7d65bfafcf1a1839f",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "b04c0e9f0753d99707dc0091f838c724",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "526a6da71fee4e782a5e881cfc747d53",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "9148df22e55a23d1fc5c0674f476af3e",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "a46936b72035132ddde1dc166b507d7b",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "33595ffc0c36f2280a9215b48284c322",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "432bf79a12258e353a498399d248775f",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "6cd33778d0c471e79b252696a22d69ba",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a735a0b19249050d2b6b428be6274c37",
"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",

View File

@ -803,15 +803,14 @@ class EditProfileWindow(bui.Window):
# Make sure we're not renaming to another existing profile.
profiles: dict = bui.app.config.get('Player Profiles', {})
if (
self._existing_profile != new_name
and new_name in profiles.keys()
):
if self._existing_profile != new_name and new_name in profiles.keys():
# NOTE: Implement a new LSTR!
bui.screenmessage(bui.Lstr(
resource='nameDuplicateText',
fallback_value='Cannot rename to existing profile!'
))
bui.screenmessage(
bui.Lstr(
resource='nameDuplicateText',
fallback_value='Cannot rename to existing profile!',
)
)
bui.getsound('error').play()
return False