From 6e8d64d741ab980bcaac29f2bdefc4172ad6edf2 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 23 Jan 2025 11:38:16 -0800 Subject: [PATCH] oops fixed test-build text pos --- .efrocachemap | 48 +++++++++---------- CHANGELOG.md | 2 +- src/assets/ba_data/python/baenv.py | 2 +- .../ba_data/python/bascenev1lib/mainmenu.py | 2 +- src/ballistica/shared/ballistica.cc | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 48fa487f..6cd41ef6 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": "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": "6b61b6cc1a46f44ca7a3a80ae4394161", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c8d0515c8e702429027de07fd69e2d43", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "7038f1c3c95654331dd0a1d9d38910cc", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "c3178337659de70b76df7472ad046443", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "83baa62983ac30e80db3e01104908f8a", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "230a140b65166e58937722a47fedea98", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "a27d98f473cb834261e94ba9f4cc0252", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "986c1b4a14c5524238c4c8bb20462e68", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "d4afb7e36d8b5360a8d732d2376d4e68", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "30249d058b53a881b5b650f3f917d4da", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "59941114752afae94b5f329a8f8a6507", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "048f4aeba96993057f3d50411e4ea6fc", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "94187f3e4a1876a7277bcdf7c1a67f4c", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "badd58f901bf87cc9436f39e42ed8439", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "9de51fe0e366a49956aba76cfedcc6f7", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "02ddadc779977f459208dc21f30fd643", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "5484a872372738395494e5777533f14f", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "de0bb0b788f097a9addad57932500b99", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "bb6cad7a63021a7c33383fa4e47e9642", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "c3c75f8597e30f03f957cae588cf8438", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "942f37a6fb716ccbcc6ffca60f409240", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "0daadde55aae6c0a8a4b6344de817b06", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "2d3651c7ac78dc1127b0982acd3a2a56", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "630c5e33ee248495687a71f7a44b3e09", "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": "c6ff4d4914fcf07398624058bbb44fbf", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "cf752c007f547ca12cb60468ced16e6f", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "74e19c139f4a647a3cfa9758f4a0355f", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "1148996ed9a09cf5387c7fc833cd16e1", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "834872d380ea739cde7442665e3c119e", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "4320ed893a0c6a5e0050179f0516d333", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "99dcd5960dfcce5a1573af0364aa69bc", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "147c49cc783215add64f9acee23c62cb", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "b2b24eb3bc59037d1e7662411cae1311", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "a084d05e8a52a92b7e7c52a90ab7ebb8", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "e9894eed647dec7df66362241bc5696c", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "1aa74944c3a64da210b7187dd7a5d6c3", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "ed15f730698e4e933a1056ab0c8df38f", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "b78869fd689be7c8487a1e08963fd603", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "2228085efc0f1787bb4d72436d06359e", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "44ec45854761d3e1a09561d569218c44", "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 335b9e8d..9944c5ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22241, api 9, 2025-01-23) +### 1.7.37 (build 22242, 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 e88efef9..f8ce0095 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 = 22241 +TARGET_BALLISTICA_BUILD = 22242 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/assets/ba_data/python/bascenev1lib/mainmenu.py b/src/assets/ba_data/python/bascenev1lib/mainmenu.py index 43931bf4..1755d638 100644 --- a/src/assets/ba_data/python/bascenev1lib/mainmenu.py +++ b/src/assets/ba_data/python/bascenev1lib/mainmenu.py @@ -86,7 +86,7 @@ class MainMenuActivity(bs.Activity[bs.Player, bs.Team]): # Throw in test build info. self.beta_info = self.beta_info_2 = None if env.test: - pos = (230, -5) + pos = (230, 35) self.beta_info = bs.NodeActor( bs.newnode( 'text', diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 1b9d8392..f57866d9 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 = 22241; +const int kEngineBuildNumber = 22242; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9;