From 327324a08a4ac09d6a7e8b0587194f27fb321721 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Fri, 6 Dec 2024 23:18:17 -0800 Subject: [PATCH] missing bits --- .efrocachemap | 52 +++++++++++++------------ CHANGELOG.md | 2 +- src/assets/.asset_manifest_private.json | 4 ++ src/assets/Makefile | 4 ++ src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/shared/ballistica.cc | 2 +- 6 files changed, 39 insertions(+), 27 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index ea435bbb..2e6f6764 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -1322,6 +1322,10 @@ "build/assets/ba_data/textures/buttonSquare.dds": "8b4091b6fc25d964059673062cc9faa6", "build/assets/ba_data/textures/buttonSquare.ktx": "21fe9898e50c6d44151e059e0a4b94ea", "build/assets/ba_data/textures/buttonSquare.pvr": "c454666fa706aed388e4ce366248b34d", + "build/assets/ba_data/textures/buttonSquareWide.dds": "5ab9ff791eae959d49f7ac1018f395a9", + "build/assets/ba_data/textures/buttonSquareWide.ktx": "043bbadbe5adff0236d2841fcaeadb87", + "build/assets/ba_data/textures/buttonSquareWide.pvr": "ca3773bfeacc8dcf42387a6da6ef0807", + "build/assets/ba_data/textures/buttonSquareWide_preview.png": "a5a02ed8a9a0b4d0043fcf21fc0f5f8a", "build/assets/ba_data/textures/buttonSquare_preview.png": "e5dc8e92b0306b218be7b6c927aa4e06", "build/assets/ba_data/textures/chTitleChar1.dds": "d8c615a51d900da15b8aba5ce35296bf", "build/assets/ba_data/textures/chTitleChar1.ktx": "44384ea28c9fe01440deb1fc80c7224a", @@ -4099,22 +4103,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": "4fef5a35efc6a2e74b6238ec87838be4", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "9ff03f147a4b5effc838bc2539c17227", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "455c1b9e6bba6db619756c25f6203b80", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "27ab3c363db144716d818003bd7a18f9", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "d9c645eb18380486349dd04f7fee4725", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "15606ae17b5d02daa4fbc6549e8f1290", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "fc798bac8c9e780695eabc930b605c2d", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "43a57614eb5df0c52ee8e64c3061d47d", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "7eec8b4ba4bb300f5f7389ca5a6abec3", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "5924800f1d7870bda557716722b2373b", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "0ab737966bf957046ca15121b1beafbb", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "f835b62e09a9933f5d4c98ba3c3195b1", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "7e2c3b108f358e5dcee152f7acbba90f", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "b2a7b275c79f8f8ea23b7ea1ec1bc3e6", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "1d17fe8c07b5ec076f799e4e758354a1", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "cb7eac5051dda9024db0076f7c7a0a64", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "350b2bde93ebd0b898af75e7c537593e", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "aa93eac2ca5e2b585bc58007a9a7374d", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "195d8e78d9598bd94d6912de4c7c08f1", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "e5f9cd858fb8b699fd79fe75a54acdcb", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "5455d6b73d70b60390f2455cd145f6fd", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "b2eda8f3cb29e99157e47852aad17930", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "eb3cc9dc20632ce84d1b2cd4d3072ea8", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "b3f2fce44e5552093825190b763826a8", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "20b8de1495c2d82e079e6ea1ea720888", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "a624bd02b74589a097aa265e7c42fc10", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "25630bca72b77a6dc56013ee0e8367a3", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "030e2ee45f19c69770e079d48a474b7c", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "ee59e9bf36b46e574f33a3826430b5d2", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "70ce8264ec98aa3de411838c6aaa329b", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "68bd3725e087fac142979f9f5c1d0dc3", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "c69217389ecaf461af3b9a25a9ddb7c0", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "678f8cbc0a31cf59f86211804f3d18f3", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "658a1267cf8454e74dd7a43d4921a862", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "678f8cbc0a31cf59f86211804f3d18f3", @@ -4127,14 +4131,14 @@ "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "c54e70ec873ecab76c655c20e13f595e", "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "4e5e0cac71feae718dfcccdeaa03eba1", "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "c54e70ec873ecab76c655c20e13f595e", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "131825eb39eb85e5231d1507cb03eee5", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "90f0217980b38b9068477208eff91a64", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "c7604ca233b96f41ee3d48e4d9841774", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "a8f0f4570ec807c71aa0aff1e9d02d40", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "9fb98011f0afe0231bbee6357be07d11", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "85cba33219b47db164d78d50b8b2edf5", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "7e72e3c500358123aae35a73a4060171", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "2476d7c95ae08ec0fb1662241fe27655", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "07b2fb0516fce4cce2bd1be0ec4a72ba", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "af473b4892a9e38c0e7a377534002639", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "0197ca506582361947be75ee7d3872cd", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "bf721fa759cc404b78b12467ece5158c", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "469d1e980701c71ff59e027ed3bf194e", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "616ac71908f70c7073007cc6be0097bf", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "587ce43506de3fb122481b9fba5a29e8", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "e733a9814771f96448c055071fefec20", "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 4962cd5a..cea15b11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22125, api 9, 2024-12-06) +### 1.7.37 (build 22130, api 9, 2024-12-06) - 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/.asset_manifest_private.json b/src/assets/.asset_manifest_private.json index 7495f8c7..c404d695 100644 --- a/src/assets/.asset_manifest_private.json +++ b/src/assets/.asset_manifest_private.json @@ -1361,6 +1361,10 @@ "ba_data/textures/buttonSquare.dds", "ba_data/textures/buttonSquare.ktx", "ba_data/textures/buttonSquare.pvr", + "ba_data/textures/buttonSquareWide.dds", + "ba_data/textures/buttonSquareWide.ktx", + "ba_data/textures/buttonSquareWide.pvr", + "ba_data/textures/buttonSquareWide_preview.png", "ba_data/textures/buttonSquare_preview.png", "ba_data/textures/chTitleChar1.dds", "ba_data/textures/chTitleChar1.ktx", diff --git a/src/assets/Makefile b/src/assets/Makefile index 32ffe5ee..5bed78cc 100644 --- a/src/assets/Makefile +++ b/src/assets/Makefile @@ -5713,6 +5713,7 @@ TEX2D_DDS_TARGETS = \ $(BUILD_DIR)/ba_data/textures/buttonPickUp.dds \ $(BUILD_DIR)/ba_data/textures/buttonPunch.dds \ $(BUILD_DIR)/ba_data/textures/buttonSquare.dds \ + $(BUILD_DIR)/ba_data/textures/buttonSquareWide.dds \ $(BUILD_DIR)/ba_data/textures/chTitleChar1.dds \ $(BUILD_DIR)/ba_data/textures/chTitleChar2.dds \ $(BUILD_DIR)/ba_data/textures/chTitleChar3.dds \ @@ -6124,6 +6125,7 @@ TEX2D_PVR_TARGETS = \ $(BUILD_DIR)/ba_data/textures/buttonPickUp.pvr \ $(BUILD_DIR)/ba_data/textures/buttonPunch.pvr \ $(BUILD_DIR)/ba_data/textures/buttonSquare.pvr \ + $(BUILD_DIR)/ba_data/textures/buttonSquareWide.pvr \ $(BUILD_DIR)/ba_data/textures/chTitleChar1.pvr \ $(BUILD_DIR)/ba_data/textures/chTitleChar2.pvr \ $(BUILD_DIR)/ba_data/textures/chTitleChar3.pvr \ @@ -6535,6 +6537,7 @@ TEX2D_KTX_TARGETS = \ $(BUILD_DIR)/ba_data/textures/buttonPickUp.ktx \ $(BUILD_DIR)/ba_data/textures/buttonPunch.ktx \ $(BUILD_DIR)/ba_data/textures/buttonSquare.ktx \ + $(BUILD_DIR)/ba_data/textures/buttonSquareWide.ktx \ $(BUILD_DIR)/ba_data/textures/chTitleChar1.ktx \ $(BUILD_DIR)/ba_data/textures/chTitleChar2.ktx \ $(BUILD_DIR)/ba_data/textures/chTitleChar3.ktx \ @@ -6945,6 +6948,7 @@ TEX2D_PREVIEW_PNG_TARGETS = \ $(BUILD_DIR)/ba_data/textures/buttonJump_preview.png \ $(BUILD_DIR)/ba_data/textures/buttonPickUp_preview.png \ $(BUILD_DIR)/ba_data/textures/buttonPunch_preview.png \ + $(BUILD_DIR)/ba_data/textures/buttonSquareWide_preview.png \ $(BUILD_DIR)/ba_data/textures/buttonSquare_preview.png \ $(BUILD_DIR)/ba_data/textures/chTitleChar1_preview.png \ $(BUILD_DIR)/ba_data/textures/chTitleChar2_preview.png \ diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 75bef8a5..fc0ebad6 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 = 22125 +TARGET_BALLISTICA_BUILD = 22130 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 35399ae6..79533b02 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 = 22125; +const int kEngineBuildNumber = 22130; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9;