diff --git a/.efrocachemap b/.efrocachemap index 54578eba..adfc8f18 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -432,7 +432,7 @@ "build/assets/ba_data/audio/zoeOw.ogg": "b2d705c31c9dcc1efdc71394764c3beb", "build/assets/ba_data/audio/zoePickup01.ogg": "e9366dc2d2b8ab8b0c4e2c14c02d0789", "build/assets/ba_data/audio/zoeScream01.ogg": "903e0e45ee9b3373e9d9ce20c814374e", - "build/assets/ba_data/data/langdata.json": "d109aa56e5aabca2666974107607ea3d", + "build/assets/ba_data/data/langdata.json": "c2796fecf77ee0bb600e874cc57f5c31", "build/assets/ba_data/data/languages/arabic.json": "d95c590f7db91a9e8b7df4b9b58c8529", "build/assets/ba_data/data/languages/belarussian.json": "009b452aa308bf2b2f7e92d9b78ba5ff", "build/assets/ba_data/data/languages/chinese.json": "5363a79f843e6be7ef47a840f47cc17d", @@ -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": "190cf431fb58f58a90c3b1f1b3b2cd8e", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "d52a35acfdf26e2bec59bafa1cf1a9cd", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "790fbee4aa460212dcbc09ce0a133dd7", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "6eae53649da1f422d33132f4c0b38c1f", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "d22dac1f95d99902e73eb7e704f7a77b", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "17a58dde669858b88329f8526b0e20d4", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "472f1ba85c258391fa6c67627ac957d2", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "ff14729577a1a0ddd9609235e4b93f7b", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "a0376d99830ae4818eea852ae4f241ee", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "f338b429a183182d8bde539b710ae07a", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "bfcd3a32d494ca064bc3cbfb8fc7e110", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "e241c83ef781822756452349ecf973cd", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "aa38f6679f6a89a1ef8534671230bcf1", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "2c3ca2e9f5f845cfaf18231a78e21c24", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "edaa517ca583975d8d46de3ce7426cfb", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "cdc00ff8e151989a643bb33f314d9cc8", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "0de70d818eafab255fa57163820088ab", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "ab6f08c875c0918a945d5febf8185027", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "558dadd14c1fdb58cb849035b71aaf2e", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "9d34333f3f27cef39c51e44015ff922d", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "ba8e35a3aac7f6f1df24cc7e6485a44f", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "b6cb29e41feab09766268d15addbf485", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "efed7a7cbaadc7bd074d5b80918ab62b", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "35cf7817b577ea0d769c434b44c7839b", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "6eedd99a1118fdd4849b29cf50d9021d", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "de6af8bafb4e0bfa2a49904462aec51a", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "74d5966f46df6d81c1832d96f9675fad", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "726a8ea5d7b6cd9dee01d4c8f56f9877", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "89d30000f756383cd37f908c65064b24", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "102b59cc3fa63256f809cd1e4caa25a5", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "e5855cc2eeb3d582d75841a6e5cb4c15", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "bb84f8c8f0c5ec40101ebae0ce40e784", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "2ee184af9b80d60afea7f97aba29cb16", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "37c5f795ccbaeffeb5d6ede4fe9f3c19", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "2ee184af9b80d60afea7f97aba29cb16", @@ -4202,14 +4202,14 @@ "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "d258789fd7bdc5092aab87ccb4601921", "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "314516411d5ac8e991a6f742f399d4de", "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "d258789fd7bdc5092aab87ccb4601921", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "af09bfcde702cc15a1f9c434aecb60b8", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "6e2d4f66f04bde2c84188bbe6a2f3253", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "110e2b4178f61803b7ec63a5b0f37c06", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "bb340505487b31d30514990605db5395", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "a0181b1ba3e6c44f1d075d38b8f49c10", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "457e62f80aa030317512f744a60eb3fa", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "7f3805e26422a37c2fee915bb4ebe4de", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "3acf5b6457fff747908657c683e70bf1", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "c686172e811ae456b98574a1f9f235b1", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "0f26eb09d4bbe84df6aefad2befebccf", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "ecd1b70e1c0158ae54aa4774b00b72a9", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "9368001f09f1c9458479f83c1e78dac6", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "89744c8ea35463c870702a7e33ef25b0", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "d6c5ea44028135b153d215c9375bb260", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "61410e75d73fe840ea9fc956d6353abc", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "bff59ed9ddaf751a02ad9026092f19a3", "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 ee2edb3e..89dc486e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22252, api 9, 2025-01-25) +### 1.7.37 (build 22253, api 9, 2025-01-26) - 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 475bb66a..77809c99 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 = 22252 +TARGET_BALLISTICA_BUILD = 22253 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/assets/ba_data/python/bauiv1lib/coop/browser.py b/src/assets/ba_data/python/bauiv1lib/coop/browser.py index d2a144a4..f3b0ddb1 100644 --- a/src/assets/ba_data/python/bauiv1lib/coop/browser.py +++ b/src/assets/ba_data/python/bauiv1lib/coop/browser.py @@ -169,6 +169,11 @@ class CoopBrowserWindow(bui.MainWindow): 'Selected Coop Custom Level', None ) + if uiscale is bui.UIScale.SMALL: + tmaxw = 130 if bui.get_virtual_screen_size()[0] < 1320 else 175 + else: + tmaxw = 300 + # Don't want initial construction affecting our last-selected. self._do_selection_callbacks = False bui.textwidget( @@ -185,7 +190,7 @@ class CoopBrowserWindow(bui.MainWindow): h_align='center', color=app.ui_v1.title_color, scale=0.85 if uiscale is bui.UIScale.SMALL else 1.5, - maxwidth=280 if uiscale is bui.UIScale.SMALL else 500, + maxwidth=tmaxw, v_align='center', ) diff --git a/src/assets/ba_data/python/bauiv1lib/playlist/edit.py b/src/assets/ba_data/python/bauiv1lib/playlist/edit.py index b4626f9d..afb26acd 100644 --- a/src/assets/ba_data/python/bauiv1lib/playlist/edit.py +++ b/src/assets/ba_data/python/bauiv1lib/playlist/edit.py @@ -45,7 +45,7 @@ class PlaylistEditWindow(bui.MainWindow): root_widget=bui.containerwidget( size=(self._width, self._height), scale=( - 1.76 + 2.0 if uiscale is bui.UIScale.SMALL else 1.3 if uiscale is bui.UIScale.MEDIUM else 1.0 ), diff --git a/src/assets/ba_data/python/bauiv1lib/playlist/editgame.py b/src/assets/ba_data/python/bauiv1lib/playlist/editgame.py index 52ffe8ce..9fac9322 100644 --- a/src/assets/ba_data/python/bauiv1lib/playlist/editgame.py +++ b/src/assets/ba_data/python/bauiv1lib/playlist/editgame.py @@ -128,7 +128,7 @@ class PlaylistEditGameWindow(bui.MainWindow): root_widget=bui.containerwidget( size=(width, height + top_extra), scale=( - 1.95 + 2.3 if uiscale is bui.UIScale.SMALL else 1.35 if uiscale is bui.UIScale.MEDIUM else 1.0 ), diff --git a/src/assets/ba_data/python/bauiv1lib/playlist/mapselect.py b/src/assets/ba_data/python/bauiv1lib/playlist/mapselect.py index a5378595..935accd1 100644 --- a/src/assets/ba_data/python/bauiv1lib/playlist/mapselect.py +++ b/src/assets/ba_data/python/bauiv1lib/playlist/mapselect.py @@ -63,7 +63,7 @@ class PlaylistMapSelectWindow(bui.MainWindow): root_widget=bui.containerwidget( size=(width, height), scale=( - 1.95 + 2.3 if uiscale is bui.UIScale.SMALL else 1.3 if uiscale is bui.UIScale.MEDIUM else 1.0 ), diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 7b1a3df1..f853bcc9 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 = 22252; +const int kEngineBuildNumber = 22253; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9;