diff --git a/.efrocachemap b/.efrocachemap index 5bc02571..15abe22c 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4126,22 +4126,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": "1ffc1f5dcda65363be124baa30006ccd", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "4cc5de1993654275f1d5156af47581a1", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "15fd8eb2457aa3a925f723ef657f384c", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "1c4bb442f9a71ee616a85ff404ee4a1d", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "6c50ad81231ef51d23c09033babfef16", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "abbd6b5cb2708d1b45e748d4383794d4", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "35a616d3ef72a4867a36da69d0b997c7", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "c261940da039b1e32eb0137a6e2bdfa8", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "951b3624f3ea80423f00cae72be2854c", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "5079d46536257fb5d751461fde6eac50", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "17113f9727ada85f564042267a861f4b", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "822261f0c05dc5de3c68f9d76f8fd969", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "e63a924dde0304441f96a8304855754b", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "2bf917a51df7eb8f322d7d7cb5523458", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "95943c9107f7d3756bcf88a03a1673d1", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "194d951ddd839028b2c6efabdf53019f", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "c303bdf2bdf6e791eb868ebcdd4aa856", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "73aa001b9f357bced88a71c0eee3b18d", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "9d375baafe0cafdef9c65305bdf199fe", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "457e335910c0cf4ddbc2812e588ab368", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "09ff10f18fd1a11dc6e88b6433fd41d5", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "b28ae54d392027eb067164c959f053c6", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "75c4c58d9ba193d1d08a9a162bbd4e26", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "184163f241440de55fc054a845235dd0", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "862909706233b2aeb32f10ad1a12ad3a", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "367f56bea35b31b5a3c735df2838f90f", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "e74ef2c48341e00031246283ae9b2029", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "f9d87871c64ff4e41c8d823dae336915", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "d4d7823950d5f36f5d26bb0330dff002", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "5f0c0e81cbfa5e5ba77c5d00e3e3fc2f", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "7df1ef6774fde146e50975dc64939f2a", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "d4f1011dc938bd4c1f11d308174a853c", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "1c375e8003442dd3d059bc0baa260e61", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "40daac4bbc8990d5140f97e792bc4fb1", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "1c375e8003442dd3d059bc0baa260e61", @@ -4154,14 +4154,14 @@ "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "36bb6f32ab12e2a46b82155a93b2e527", "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "51884d81e2d7bdeb6b59a72f0247c8e1", "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "36bb6f32ab12e2a46b82155a93b2e527", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "0cd1427bb99690616b493a59e7d567d9", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "8b472a65a2407291dde5c54bb1c24df1", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "c97c08a508bd57b325cc8817d12af73f", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "082957f5ee4f2e5d50d62384bda60895", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "4d8bf5c5937ed8c6e4f5e775366590cb", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "11909c454caaa9d50f3ed70869964743", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "4a9492a2cfa1d944ea5618eb2ac9cb7b", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "e1aeaf29546c0a357214c68fb2f0399c", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "3f099257c64339fc33ed4ce76caf0632", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "0bd94da070a0865b1c4fdb9fe6359de2", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "f0030f259a17ee8e355d6d9e7a8d0785", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "11f52862b337e1ea424ccc1cd3a619cb", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "68f8395f083bdcdee5a97e44a532f25f", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "932c69024d166b37d70cd1f0ce9d27b0", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "43fc198b8bdfae4040e0e841e37c5067", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "df1d3d4fac93534b980a72817ecab32d", "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 c53ce5c0..91043003 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22189, api 9, 2025-01-14) +### 1.7.37 (build 22192, api 9, 2025-01-14) - 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 4c1136b3..6da19670 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 = 22189 +TARGET_BALLISTICA_BUILD = 22192 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/assets/ba_data/python/bauiv1lib/inbox.py b/src/assets/ba_data/python/bauiv1lib/inbox.py index eb4b7f27..4e8bae75 100644 --- a/src/assets/ba_data/python/bauiv1lib/inbox.py +++ b/src/assets/ba_data/python/bauiv1lib/inbox.py @@ -824,34 +824,36 @@ class InboxWindow(bui.MainWindow): ), label_color=(0.5, 0.7, 0.6), spacing_top=7.0, + spacing_bottom=0.0 if component.prizes else 7.0, ) total_height += section.get_height() sections.append(section) - section = _TextSection( - sub_width=sub_width, - text=bui.Lstr( - translate=( - 'serverResponses', - 'Your prize:', - ) - ), - spacing_top=6, - color=(1.0, 1.0, 1.0, 0.4), - scale=0.35, - ) - total_height += section.get_height() - sections.append(section) + if component.prizes: + section = _TextSection( + sub_width=sub_width, + text=bui.Lstr( + translate=( + 'serverResponses', + 'Your prize:', + ) + ), + spacing_top=6, + color=(1.0, 1.0, 1.0, 0.4), + scale=0.35, + ) + total_height += section.get_height() + sections.append(section) - section = _DisplayItemsSection( - sub_width=sub_width, - items=component.prizes, - width=70.0, - spacing_top=0.0, - spacing_bottom=0.0, - ) - total_height += section.get_height() - sections.append(section) + section = _DisplayItemsSection( + sub_width=sub_width, + items=component.prizes, + width=70.0, + spacing_top=0.0, + spacing_bottom=0.0, + ) + total_height += section.get_height() + sections.append(section) elif ctypeid is idcls.UNKNOWN: raise RuntimeError('Should not get here.') diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 7706a8b4..d926b954 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 = 22189; +const int kEngineBuildNumber = 22192; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9;