From 4d829f9a619ef6c0deb553164b1473d0a76ff028 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 23 Jan 2025 11:14:49 -0800 Subject: [PATCH] restored larger buttons and layout on co-op score screen for unified 16:9 safe area --- .efrocachemap | 48 +++++++++---------- CHANGELOG.md | 2 +- src/assets/ba_data/python/baenv.py | 2 +- .../python/bascenev1lib/activity/coopscore.py | 4 +- src/ballistica/shared/ballistica.cc | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 4bc78e08..3e4cf123 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4174,22 +4174,22 @@ "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": "871cc2b603c3380a4e6410e49a294eb8", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "a1670c63dc8feefd283e303313142305", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "0f5951f1bcf846dbacbce3154ab05de9", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c89ee1ce99e02b7fde5bbe710bb20fe8", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "a4915c8065e1922fbf4517009bec9895", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "07a0a6bf6bc3b754eff4452803ef2ebf", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "7cce99fa65c061bd7cc2cdbf2698480f", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "06e411ec91d4bdec27bff79eca7bd2e5", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "c57fe8f81255c3165760616dbface818", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c8a365227a776d314d7f46f36494dc1f", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "053135ff5531b5d284338dc36da62972", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "eba59b13d857b201e77f82a8704ad171", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "0979153e376a28cabc28b45abaacf1d2", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "199e7f60711699d045f842c599a6949e", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "b11e8d4b1cc2ee5815ed3ee294b2189f", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "bf495eaaa5a89877fa75c565042f3680", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "534a39470e75054f85b2f937d0d26cec", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "aad82ad04a415ee24a5423ebf2f40aa0", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "c2ad2b594137ec51a560bb796a0c4f67", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c7450bc8b93b73c6150795ca061a1a71", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "cb89033c7bd7def772d6f8255c2f2a17", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "cf60f53868389d9d1622b1367994ba53", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "14adca7775251330325bb9f973bbb216", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "614d1918622e999e27adc86e21872f26", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "94a656100660b5d69287aa6e8e15e42c", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c8d0515c8e702429027de07fd69e2d43", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "70d2392682d2301e6ec6d208805cad5f", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "c3178337659de70b76df7472ad046443", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "ba2e043538ebf8272ea951e89d94633c", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "2b1a618b682ec6d2a1c032632a4b2634", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "326a8b4e5268f440e918c5be6c660922", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "a87898a25edad73ec64dd91b3ecf3ec4", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "162e6aae6056d594bc0c1d3a333a6e7e", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "bb64e2182b1a533679f93c5997f14584", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "162e6aae6056d594bc0c1d3a333a6e7e", @@ -4202,14 +4202,14 @@ "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "116b500c2d57caf06619408b2176e83b", "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "e3e9d9c7a94f8cd22939839fd8fbc178", "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "116b500c2d57caf06619408b2176e83b", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "adb36987cc93ca6dd3dd124da61b4530", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "abc23cb3942fa064a6dbf610dc5d0102", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "7e94d9e59c9e5b72bd00f225410eea0b", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "e3e06c3f1b0c54ab87c13555c978d691", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "46b9c30a5b8121bf07be1e61bbea529f", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "ad159f29776fa8bd2741140421edfa01", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "88af984712b58aa9d85543dcdad0cbdb", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "56f8590bc130b26075bac32a73a9dfac", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "4a5cd8c52ddaa9841577d53ec50c1fb5", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "4f1d8ce34bb2d834b0341a4770bcb7c0", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "bd72eae9b1082dba36fa6dea7b3b5d9f", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "b7660aee762fc8a5b0476ca37ad82ea3", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "4baaaf732f4e50439aeea8d1cbfdd90c", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "fea540f2be0ad7ca3545f3d36124169e", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "120c72b5f89890d9ee8337d78086cfb9", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "0bcc2d715e24b71f7ca5bf6e5e07f5ba", "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": "06042d31df0ff9af96b99477162e2a91", diff --git a/CHANGELOG.md b/CHANGELOG.md index c0a72afb..335b9e8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22238, api 9, 2025-01-23) +### 1.7.37 (build 22241, api 9, 2025-01-23) - 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/baenv.py b/src/assets/ba_data/python/baenv.py index 1079df75..e88efef9 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -53,7 +53,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 22238 +TARGET_BALLISTICA_BUILD = 22241 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/assets/ba_data/python/bascenev1lib/activity/coopscore.py b/src/assets/ba_data/python/bascenev1lib/activity/coopscore.py index ab1f5d05..fe2cbb2a 100644 --- a/src/assets/ba_data/python/bascenev1lib/activity/coopscore.py +++ b/src/assets/ba_data/python/bascenev1lib/activity/coopscore.py @@ -413,7 +413,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]): # avoid overlapping with tips at bottom. Could look nicer to # rework things in the middle to get more space, but would # rather not touch this old code more than necessary. - small_buttons = True + small_buttons = False if small_buttons: menu_button = bui.buttonwidget( @@ -730,7 +730,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]): color=(0.5, 1, 0.5, 1), h_align='center', scale=0.4, - position=(0, 260), + position=(0, 292), jitter=1.0, ).autoretain() Text( diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 63ca322c..1b9d8392 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 = 22238; +const int kEngineBuildNumber = 22241; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9;