mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-23 23:49:47 +08:00
polishing
This commit is contained in:
Eric Froemling
parent
fc301d8cc8
commit
d75683cefd
80
.efrocachemap
generated
80
.efrocachemap
generated
@ -2487,10 +2487,10 @@
|
||||
"build/assets/ba_data/textures/treesColor.ktx": "491ccd74c1a2914b79a706b12f6128b0",
|
||||
"build/assets/ba_data/textures/treesColor.pvr": "0cbecbe5914677d14416df2fb4639cd0",
|
||||
"build/assets/ba_data/textures/treesColor_preview.png": "7a7810fff02f92d84c7df1a10f996959",
|
||||
"build/assets/ba_data/textures/trophy.dds": "e4f80b80c764dabbed204f0510acdcf0",
|
||||
"build/assets/ba_data/textures/trophy.ktx": "5fbbd5fdb86b87c95da39d90a6562613",
|
||||
"build/assets/ba_data/textures/trophy.pvr": "dfe8391a1fd1393127092f8ea4fc91ad",
|
||||
"build/assets/ba_data/textures/trophy_preview.png": "9d3508c02a18eed1fd4356d4691456ab",
|
||||
"build/assets/ba_data/textures/trophy.dds": "4ba12ed111449c42bb986013e3cb9078",
|
||||
"build/assets/ba_data/textures/trophy.ktx": "efd465920398f409c2b5a53bc8c13727",
|
||||
"build/assets/ba_data/textures/trophy.pvr": "b4a61c2a5411893fc8466b955689bfc5",
|
||||
"build/assets/ba_data/textures/trophy_preview.png": "0d3113a8c32137f496d23286db2bcdbd",
|
||||
"build/assets/ba_data/textures/tv.dds": "41a8f0ddd8f595fec0988c4a8caef65a",
|
||||
"build/assets/ba_data/textures/tv.ktx": "0a84d64d668df5b258cbd4bc63351f60",
|
||||
"build/assets/ba_data/textures/tv.pvr": "c4de871c547fb02b752658f291234205",
|
||||
@ -4099,42 +4099,42 @@
|
||||
"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": "c2446e076e18a75c450775acfb679280",
|
||||
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "2113acf8d81d86c4648fab14fb7bf9a4",
|
||||
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "bf1b670a523db1a92e8634b9b9b417f5",
|
||||
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "b28a8710bc1165384539f35c60d71fdc",
|
||||
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "559ffe135fde3d5cbb108f5cdb018a65",
|
||||
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "b18af899f179860f2859706d93ad174d",
|
||||
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "44b814f41a3a4702f6841683fc2f3fa9",
|
||||
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "83c3293674eeb6fecbf2f42dca722c0c",
|
||||
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "db7abf0ed3cbb183acd244d615b9f05c",
|
||||
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "736919fc06b0ddab87bdad8950acb8e9",
|
||||
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "a4ef178eba2b7b3661a58e3f72602881",
|
||||
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "c53456084d1519e993b2739ac5649232",
|
||||
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "20d8f4fe2b87796a08e965b24d911046",
|
||||
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "569e9b9f76707d0d085f105e94db0fd0",
|
||||
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "75a05f54a4c87fef99ed800bf4b9c351",
|
||||
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "768b018384d457b292acdd03301308f6",
|
||||
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "6b5ba102e7c13652db95c30096f6bc25",
|
||||
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "cb8ab89546a0b0f1753de762055f64af",
|
||||
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "6b5ba102e7c13652db95c30096f6bc25",
|
||||
"build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "cb8ab89546a0b0f1753de762055f64af",
|
||||
"build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "1ac46b8c7845b7e85658bd56d2da5421",
|
||||
"build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "8e1b3728dc4733ca391534c178e34e38",
|
||||
"build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "1ac46b8c7845b7e85658bd56d2da5421",
|
||||
"build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "8e1b3728dc4733ca391534c178e34e38",
|
||||
"build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "0debb2bc242b680db4410353ef234659",
|
||||
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "35edf150514277863503c69a3a04c3c6",
|
||||
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "0debb2bc242b680db4410353ef234659",
|
||||
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "35edf150514277863503c69a3a04c3c6",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "9c85a3fcc9c32f8be5b78b7a3f088701",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "de95b4dcff01de30664def6e4e05a431",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "bbb6526c21891550feff27a3af5bf276",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "7e2ce2b7e400745f47a7b4dea84dcc52",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "1000cf4bc6726fb6b48ca9281f505947",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "fc1273e22286c290b6707636ca749e5d",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "dcfaec1f368e68da735ed7b4ef513314",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "84abf56bc4fd7fb13b5389937340a037",
|
||||
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "50d0964d88773c42240a5bab91bdb55b",
|
||||
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "f251ef80240622765973c3ef7c69c52a",
|
||||
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "ed5a3bab3db459f2f689d7d20d27b1d3",
|
||||
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "2c25dc80903426d04798d60ab034cccf",
|
||||
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "fcc9e1d77db31973a5b7fc94253cd395",
|
||||
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "974c55de42de299b4e0ae2ce80cc602b",
|
||||
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "25362f407d7aa6443009143a71dac4cc",
|
||||
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "6d2607f58e1d58506f371ededa39a93f",
|
||||
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "fbf112a5577022943d2517482af664c2",
|
||||
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "cda4565610d94db3536a72db44b8f061",
|
||||
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "92df5db19c30eba8c1abda56f25a8657",
|
||||
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ebe2508e3ffdd6670bfceeb659e1e113",
|
||||
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "4eab8af208c0525d3b0041482d6fadef",
|
||||
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "5fa353067144d00b79259b6d353d6676",
|
||||
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "85dc7db8ccdc016d7984fc361d20cc5b",
|
||||
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "e8054b92e88f6e0230cf320fb0015be5",
|
||||
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "7160ce46f35063764e1a5d3e0f0bd35b",
|
||||
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "206f0407a6d912b292c6530cd969030b",
|
||||
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "7160ce46f35063764e1a5d3e0f0bd35b",
|
||||
"build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "206f0407a6d912b292c6530cd969030b",
|
||||
"build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "cdb4b500ef2c285388824da423171431",
|
||||
"build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "7f37a6249393fc422a536b3e1622b96f",
|
||||
"build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "cdb4b500ef2c285388824da423171431",
|
||||
"build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "7f37a6249393fc422a536b3e1622b96f",
|
||||
"build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "e4e4c5ce769f8c3a1535b7a4e64e7d90",
|
||||
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "910f66cc0ddf5d17e751dc295f84e63e",
|
||||
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "e4e4c5ce769f8c3a1535b7a4e64e7d90",
|
||||
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "910f66cc0ddf5d17e751dc295f84e63e",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "67e333892eb9c549a0977931c38bfb74",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "7e5443e649cb63bd32ac99c860a3bbe8",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "61a11a9e832e646c52ddda720de8e639",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "929c50574c279d24e048a7cd9e3362db",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "71836aff8062a6925f4770a3d6ead4e2",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "b0b309105ad26e0123835a50c8c1793e",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "8c735fee3348fe41efc61d6fcbe6e3cd",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "75c49e5ec7410f372c90c728125e6fc2",
|
||||
"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": "3a583e7e03bd4907b21adc3bf5729d15",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
### 1.7.37 (build 22117, api 9, 2024-11-27)
|
||||
### 1.7.37 (build 22118, api 9, 2024-11-30)
|
||||
- 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.
|
||||
|
||||
@ -455,14 +455,14 @@ def copy_dev_console_history() -> None:
|
||||
)
|
||||
return
|
||||
|
||||
# Just dump everything in the log-handler's cache.
|
||||
# Just dump everything that's in the log-handler's cache.
|
||||
archive = envconfig.log_handler.get_cached()
|
||||
lines: list[str] = []
|
||||
stdnames = ('stdout', 'stderr')
|
||||
for entry in archive.entries:
|
||||
reltime = entry.time.timestamp() - envconfig.launch_time
|
||||
level_ex = '' if entry.name in stdnames else f' {entry.level.name}'
|
||||
lines.append(f'{reltime:.3f} {entry.name}{level_ex}: {entry.message}')
|
||||
lines.append(f'{reltime:.3f}{level_ex} {entry.name}: {entry.message}')
|
||||
|
||||
_babase.clipboard_set_text('\n'.join(lines))
|
||||
_babase.screenmessage(Lstr(resource='copyConfirmText'), color=(0, 1, 0))
|
||||
|
||||
@ -53,7 +53,7 @@ if TYPE_CHECKING:
|
||||
|
||||
# Build number and version of the ballistica binary we expect to be
|
||||
# using.
|
||||
TARGET_BALLISTICA_BUILD = 22117
|
||||
TARGET_BALLISTICA_BUILD = 22118
|
||||
TARGET_BALLISTICA_VERSION = '1.7.37'
|
||||
|
||||
|
||||
|
||||
@ -377,6 +377,11 @@ class AccountSettingsWindow(bui.MainWindow):
|
||||
)
|
||||
link_accounts_button_space = 70.0
|
||||
|
||||
show_v1_obsolete_note = self._v1_signed_in and (
|
||||
primary_v2_account is None
|
||||
)
|
||||
v1_obsolete_note_space = 80.0
|
||||
|
||||
show_unlink_accounts_button = show_link_accounts_button
|
||||
unlink_accounts_button_space = 90.0
|
||||
|
||||
@ -434,6 +439,8 @@ class AccountSettingsWindow(bui.MainWindow):
|
||||
self._sub_height += manage_account_button_space
|
||||
if show_link_accounts_button:
|
||||
self._sub_height += link_accounts_button_space
|
||||
if show_v1_obsolete_note:
|
||||
self._sub_height += v1_obsolete_note_space
|
||||
if show_unlink_accounts_button:
|
||||
self._sub_height += unlink_accounts_button_space
|
||||
if show_v2_link_info:
|
||||
@ -800,6 +807,26 @@ class AccountSettingsWindow(bui.MainWindow):
|
||||
bui.widget(edit=btn, show_buffer_bottom=40, show_buffer_top=100)
|
||||
self._sign_in_text = None
|
||||
|
||||
if show_v1_obsolete_note:
|
||||
v -= v1_obsolete_note_space
|
||||
bui.textwidget(
|
||||
parent=self._subcontainer,
|
||||
h_align='center',
|
||||
v_align='center',
|
||||
size=(0, 0),
|
||||
position=(self._sub_width * 0.5, v + 35.0),
|
||||
text=(
|
||||
'YOU ARE SIGNED IN WITH A V1 ACCOUNT.\n'
|
||||
'THESE ARE NO LONGER SUPPORTED AND MANY\n'
|
||||
'FEATURES WILL NOT WORK. PLEASE SWITCH TO\n'
|
||||
'A V2 ACCOUNT OR UPGRADE THIS ONE.'
|
||||
),
|
||||
maxwidth=self._sub_width * 0.8,
|
||||
color=(1, 0, 0),
|
||||
shadow=1.0,
|
||||
flatness=1.0,
|
||||
)
|
||||
|
||||
if show_manage_account_button:
|
||||
button_width = 300
|
||||
v -= manage_account_button_space
|
||||
@ -1233,8 +1260,8 @@ class AccountSettingsWindow(bui.MainWindow):
|
||||
plus = bui.app.plus
|
||||
assert plus is not None
|
||||
|
||||
# if this is not present, we haven't had contact from the server so
|
||||
# let's not proceed..
|
||||
# If this is not present, we haven't had contact from the server
|
||||
# so let's not proceed.
|
||||
if plus.get_v1_account_public_login_id() is None:
|
||||
return False
|
||||
accounts = plus.get_v1_account_misc_read_val_2('linkedAccounts', [])
|
||||
@ -1251,7 +1278,8 @@ class AccountSettingsWindow(bui.MainWindow):
|
||||
|
||||
def _should_show_legacy_unlink_button(self) -> bool:
|
||||
plus = bui.app.plus
|
||||
assert plus is not None
|
||||
if plus is None:
|
||||
return False
|
||||
|
||||
# Only show this when fully signed in to a v2 account.
|
||||
if not self._v1_signed_in or plus.accounts.primary is None:
|
||||
|
||||
@ -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 = 22117;
|
||||
const int kEngineBuildNumber = 22118;
|
||||
const char* kEngineVersion = "1.7.37";
|
||||
const int kEngineApiVersion = 9;
|
||||
|
||||
|
||||
@ -84,21 +84,12 @@ bool UIV1FeatureSet::PartyIconVisible() {
|
||||
|
||||
void UIV1FeatureSet::SetAccountState(bool signed_in, const std::string& name) {
|
||||
assert(root_widget_.Exists());
|
||||
// Store the value and plug it in if we've got a live widget.
|
||||
// account_signed_in_ = signed_in;
|
||||
// account_name_ = name;
|
||||
// if (auto* r = root_widget()) {
|
||||
root_widget_->SetAccountState(signed_in, name);
|
||||
// }
|
||||
}
|
||||
|
||||
void UIV1FeatureSet::SetSquadSizeLabel(int num) {
|
||||
assert(root_widget_.Exists());
|
||||
// Store the value and plug it in if we've got a live widget.
|
||||
// party_icon_number_ = num;
|
||||
// if (auto* r = root_widget()) {
|
||||
root_widget_->SetSquadSizeLabel(num);
|
||||
// }
|
||||
}
|
||||
|
||||
void UIV1FeatureSet::ActivatePartyIcon() {
|
||||
|
||||
@ -1289,7 +1289,7 @@ void RootWidget::SetAccountState(bool signed_in, const std::string& name) {
|
||||
assert(wb);
|
||||
|
||||
if (signed_in) {
|
||||
w->SetText(name);
|
||||
w->SetText(g_base->assets->CharStr(SpecialChar::kV2Logo) + name);
|
||||
w->set_color(0.0f, 0.4f, 0.1f, 1.0f);
|
||||
w->set_shadow(0.2f);
|
||||
w->set_flatness(1.0f);
|
||||
@ -1336,15 +1336,15 @@ void RootWidget::SetLeagueType(const std::string& val) {
|
||||
Vector3f color{};
|
||||
|
||||
if (val == "") {
|
||||
color = {0.5f, 0.5f, 0.5f};
|
||||
color = {0.4f, 0.4f, 0.4f};
|
||||
} else if (val == "b") {
|
||||
color = {1.0f, 0.7f, 0.5f};
|
||||
} else if (val == "s") {
|
||||
color = {1.0f, 1.0f, 1.0f};
|
||||
color = {1.0f, 1.0f, 1.4f};
|
||||
} else if (val == "g") {
|
||||
color = {1.4f, 0.8f, 0.2f};
|
||||
color = {1.4f, 1.0f, 0.4f};
|
||||
} else if (val == "d") {
|
||||
color = {1.2f, 0.8f, 1.5f};
|
||||
color = {1.0f, 0.8f, 2.0f};
|
||||
} else {
|
||||
g_core->Log(LogName::kBa, LogLevel::kError,
|
||||
"RootWidget: Invalid league type '" + val + "'.");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user