From 71be7ed5b55001cd0a049c601a74967f29dcb781 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 22 Sep 2022 14:26:37 -0700 Subject: [PATCH] disabling manage v2 account button until backend is ready --- .efrocachemap | 40 +++++++++---------- CHANGELOG.md | 2 +- assets/src/ba_data/python/ba/_bootstrap.py | 2 +- .../python/bastd/ui/account/settings.py | 3 +- src/ballistica/ballistica.cc | 2 +- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 9bb7a48a..c2e23e35 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3995,26 +3995,26 @@ "assets/src/ba_data/python/ba/_generated/__init__.py": "https://files.ballistica.net/cache/ba1/ee/e8/cad05aa531c7faf7ff7b96db7f6e", "assets/src/ba_data/python/ba/_generated/enums.py": "https://files.ballistica.net/cache/ba1/b2/e5/0ee0561e16257a32830645239f34", "ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a", - "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/22/1a/aa582bbe92b9994feb18a988c2e8", - "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/83/fb/48b600e81dfc72bebcd27e46da16", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e0/61/aa1936f68baa5b7a0a2c717b5b7b", - "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/86/6f/aeeedea323abbd875f3116d293eb", - "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/32/9b/6ca4d3f8a45b8b031fb609b734ef", - "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/bb/87/6b9f71024419c82a5ec3032b4a99", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f2/5e/a5566aeb73dc726fa0ddd79a5cca", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/72/b8/83776352b4a7f26863569c5e4313", - "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/bb/67/282eaa50fb292a9d95c57fb1401f", - "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/b5/16/9ecc0dc2533791f9c2ed267f3b73", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/77/29/c5fa7b9348fbf2d905dd2f4535f4", - "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/04/15/c6cdf45290b02102ee1340b4e5a9", - "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/ab/1a/4823371d27224b5bad9246c9c2ca", - "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/19/a7/7622a9eeab17fdc04a715c039020", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/06/cd/afd8a3ff7666290980cf5dbf3df6", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2f/a6/2cb67b14864e900bc96298dd3101", - "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/4d/ef/106b00a511621d930e267a6c14f7", - "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/4b/e6/57e1c1bc9ef4208f18192653c3a5", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/36/ac/274cd75c84acf4e8242875e9ca05", - "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/c3/bf/84b89ed89fc702fcd400e321f188", + "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/97/dc/9c7d758e679b205469f2fe2e2612", + "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/fa/6e/64c83ecddad8d46d477ff0c2cf58", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/31/2f/31720bf2039c7b4b4d938e7548d0", + "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/40/bd/2469cbe3be72f7a7db516493d154", + "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/17/66/1c9c58d593f1ab399bdb430c8645", + "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d3/00/d8f53fa1d499d5b13c9d198def52", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b4/14/4387242b502e4989f14d0b9cf104", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a4/46/99b38c12fd49a60e40cd2b5d3f4b", + "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/cf/d7/4ba5e8af4a617cc13ed1d0ff6bc7", + "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/92/0e/81cc0495b6b5689150ce19cc3401", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/94/3c/4b1781f7c4a42e8f42784fc59961", + "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2b/be/a16c9b08d65f3314ab7a4b0977b2", + "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/7a/ee/d77ffd6bb0ba45d3e50184d40ab7", + "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/be/24/7a9d66f282beedbd264c67ad3ba7", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/47/6d/ee1ad35240825d8ace2ee771c596", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cb/f8/a82f8f16eec3b6e1545c1d683e4d", + "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/4d/d4/5a3b3a49acc3b9f5f6680eda69d3", + "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/64/f5/16f96592846a6a74f40012ffb658", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/a6/54/3698ab8f19f0539b8e83e7af0b47", + "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/ac/99/aac7b774c374dae31b01cd688e59", "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/41/b3/5a5813294b9281ca6bbb1f5caebe", "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/28/05/b6cc01e7b6762a3c8d47851cd30c", "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f7/8c/36acf6d02d7c322aed086cc4ec3f", diff --git a/CHANGELOG.md b/CHANGELOG.md index ba74fb7a..9252dcdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.9 (build 20877, api 7, 2022-09-21) +### 1.7.9 (build 20878, api 7, 2022-09-22) - Cleaned up the efro.message system to isolate response types that are used purely internally (via a new SysResponse type). - Fixed bug with 'Disable Camera Shake' option. (GitHub #511) - Fixed an issue where Co-op football would play no music. diff --git a/assets/src/ba_data/python/ba/_bootstrap.py b/assets/src/ba_data/python/ba/_bootstrap.py index 325e4b70..2898d390 100644 --- a/assets/src/ba_data/python/ba/_bootstrap.py +++ b/assets/src/ba_data/python/ba/_bootstrap.py @@ -45,7 +45,7 @@ def bootstrap() -> None: # Give a soft warning if we're being used with a different binary # version than we expect. - expected_build = 20877 + expected_build = 20878 running_build: int = env['build_number'] if running_build != expected_build: print( diff --git a/assets/src/ba_data/python/bastd/ui/account/settings.py b/assets/src/ba_data/python/bastd/ui/account/settings.py index 8d57fbbb..eab2379c 100644 --- a/assets/src/ba_data/python/bastd/ui/account/settings.py +++ b/assets/src/ba_data/python/bastd/ui/account/settings.py @@ -253,7 +253,8 @@ class AccountSettingsWindow(ba.Window): reset_progress_button_space = 70.0 show_manage_v2_account_button = (self._signed_in - and account_type == 'V2') + and account_type == 'V2' + and bool(False)) # Disabled for now. manage_v2_account_button_space = 100.0 show_player_profiles_button = self._signed_in diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc index 578bebac..46c40cd8 100644 --- a/src/ballistica/ballistica.cc +++ b/src/ballistica/ballistica.cc @@ -32,7 +32,7 @@ namespace ballistica { // These are set automatically via script; don't modify them here. -const int kAppBuildNumber = 20877; +const int kAppBuildNumber = 20878; const char* kAppVersion = "1.7.9"; // Our standalone globals.