From c012382d77d4527acf726bcdb34046348ec4e83d Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 5 Sep 2024 16:16:17 -0700 Subject: [PATCH] ci fix --- .efrocachemap | 40 +++++++++---------- CHANGELOG.md | 2 +- .../ba_data/python/babase/_devconsole.py | 16 ++++---- src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/shared/ballistica.cc | 2 +- 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index dba8b0db..d60532a1 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4096,26 +4096,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": "95dd83eeba34a46aae069cf53222cf26", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "3ea066eb5a531ac568ea7ddae3f06d74", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "b2947b0b5befc5a49c6ffb6e8e4fadaa", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "fd993504ac5e887197ddc801a08fa067", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "231c01850994ee9c96f322b6bec55112", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "15ae4cfab312216ce326fd513a7a72c9", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "0a75e93a21ffb4cf4b888289188e6cb2", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "f2e1c250004f0f028a93f4497ae82dfd", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "50653816eac879c6e0d0787ffec6045c", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "91aa009738cbd48525048f3050c496e6", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "b72e781565fbfe06848f6c38c65691ff", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "252ebec577b0dd2accf3bc0d35d7974e", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "d9e2e578711787da9627acc4be514430", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "0a5e4d6b0c9278b4b6adb48b816bae2e", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "bf90751a34c9b11ed6b9b9a80a8e7ad2", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "8d0d41802c8daa56262a49db49f72094", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "44286b725dbe9c9f03d8cd47b48e2ed1", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "f58bc022f7ef2c64cbe5ac395c928552", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "50995542eb1479baeb19454f2f4c73e4", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "fff08091342f8b0d0525df053d4d80e0", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "66adb6a7efe291a738213cacf22e7c0e", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "b673694187f5d1997d400fc0ab85dfb4", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "9607ce824cdbbc50bbc0b0db62f5a681", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "68b1b35a0f756edd731f2d80acecd6f6", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "67c867700fc5a64271af014d0b5d3979", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "774ae28d8d5590996bd213e4c727940a", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "d504af98d093549a84d1be53e9975cd5", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "6f73f426095cdc8867843410c9eec2ff", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "c399f425a0c67ee2a72cc1eb64fc6e9f", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "ecfb4208f747fff9824ab17e25b55b63", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "87511e98fa8c05a43589a7f2961fdb33", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "1fe7a8e5c2de3b2131f2e62244764478", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "fac8cb6b7e51f5bc79cfabeb4a437258", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "5e54f822d4c318da162e5acf5b073dbc", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "3cefa0b6e6f6b42a36680a21c1f9156e", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "4181938bacb5dc3205d486a9104bb5a3", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "e8ba8761108783b5afd8dcb3a355a341", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "802d5f7d9a42090247577e650cf8c022", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "cd9bf4cbc6653154160649027e86d4c2", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "f63e7c67c51455340c6c865d8b4f6eaa", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "73ad3303fe1a82005918fbc5dae3446c", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "fa659b5d6119acba6570c92ce4d35ae2", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "73ad3303fe1a82005918fbc5dae3446c", diff --git a/CHANGELOG.md b/CHANGELOG.md index ceb78eb5..15505e78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 21997, api 9, 2024-09-05) +### 1.7.37 (build 21999, api 9, 2024-09-05) - 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/src/assets/ba_data/python/babase/_devconsole.py b/src/assets/ba_data/python/babase/_devconsole.py index 1422d71a..b858fcc7 100644 --- a/src/assets/ba_data/python/babase/_devconsole.py +++ b/src/assets/ba_data/python/babase/_devconsole.py @@ -161,11 +161,11 @@ class DevConsoleTabUI(DevConsoleTab): # v_align='center', # ) self.text( - 'Make sure all static UI fits in the' - ' virtual screen at all UI scales (not counting things' + 'Make sure all interactive UI fits in the' + ' virtual bounds at all UI-scales (not counting things' ' that follow screen edges).\n' - 'Note that some UI elements' - ' may not reflect scale changes until recreated.', + 'Note that some elements may not reflect UI-scale changes' + ' until recreated.', scale=0.6, pos=(15, 70), h_anchor='left', @@ -185,7 +185,7 @@ class DevConsoleTabUI(DevConsoleTab): ) x = 300 self.text( - 'UI Scale', + 'UI-Scale', pos=(x - 5, 15), h_anchor='left', h_align='right', @@ -196,14 +196,16 @@ class DevConsoleTabUI(DevConsoleTab): bwidth = 100 for scale in UIScale: self.button( - scale.name.lower(), + scale.name.capitalize(), pos=(x, 10), size=(bwidth, 30), h_anchor='left', label_scale=0.6, call=partial(_babase.app.set_ui_scale, scale), style=( - 'light' if scale is _babase.app.ui_v1.uiscale else 'normal' + 'light' + if scale.name.lower() == _babase.get_ui_scale() + else 'normal' ), ) x += bwidth + 2 diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index b71c88cf..483e28a2 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 = 21997 +TARGET_BALLISTICA_BUILD = 21999 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index da6a94aa..37e00f3a 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 = 21997; +const int kEngineBuildNumber = 21999; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9;