From c198b20fa7ba80520843cc1da9ad774ce8d8a398 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 26 Jul 2024 10:34:49 -0700 Subject: [PATCH] v1.7.36 --- .efrocachemap | 50 ++++++++++++++--------------- CHANGELOG.md | 2 +- src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/shared/ballistica.cc | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 62e399618..425710ceb 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -421,10 +421,10 @@ "build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26", "build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8", "build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55", - "build/assets/ba_data/data/langdata.json": "7ff61ef00a1d673e0a303d09bd1d2bd6", - "build/assets/ba_data/data/languages/arabic.json": "c20d539d98b728bb7913c5dff68a5713", + "build/assets/ba_data/data/langdata.json": "a49e8187178effbd077426d31f7d92ff", + "build/assets/ba_data/data/languages/arabic.json": "dcb913b3d89fe665adbf35e697d2e5d0", "build/assets/ba_data/data/languages/belarussian.json": "3d5523d0004293aa2df02f3f6f3b84f8", - "build/assets/ba_data/data/languages/chinese.json": "2f67c6b127ae85492ac552af1a91e95a", + "build/assets/ba_data/data/languages/chinese.json": "2c0105deead2412543323564bbbca749", "build/assets/ba_data/data/languages/chinesetraditional.json": "319565f8a15667488f48dbce59278e39", "build/assets/ba_data/data/languages/croatian.json": "e671b9d0c012be1a30f9c15eb1b81860", "build/assets/ba_data/data/languages/czech.json": "74219f9b06ff098387b40f85a5b0124e", @@ -440,7 +440,7 @@ "build/assets/ba_data/data/languages/hindi.json": "e56f0ffb57321660aa415e97c2dacfc2", "build/assets/ba_data/data/languages/hungarian.json": "6b08fea24b72cc805ed0dc59e11c4cd6", "build/assets/ba_data/data/languages/indonesian.json": "ed9038bf4b9216f93eb73e753e162706", - "build/assets/ba_data/data/languages/italian.json": "e1d69eb1eec31442bf981121c7cfaf17", + "build/assets/ba_data/data/languages/italian.json": "017f2b20584838d9f5ad88822a4caf62", "build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597", "build/assets/ba_data/data/languages/malay.json": "f6ce0426d03a62612e3e436ed5d1be1f", "build/assets/ba_data/data/languages/persian.json": "8e3a88cbb729570ffc8e0b06b3337a8f", @@ -450,7 +450,7 @@ "build/assets/ba_data/data/languages/russian.json": "64f0b7347af86f8c4bec8ba8e781378d", "build/assets/ba_data/data/languages/serbian.json": "d7452dd72ac0e51680cb39b5ebaa1c69", "build/assets/ba_data/data/languages/slovak.json": "3c08c748c96c71bd9e1d7291fb8817b6", - "build/assets/ba_data/data/languages/spanish.json": "ebb1552a3baabc9ce2588914a8e8563b", + "build/assets/ba_data/data/languages/spanish.json": "63f80b2c37a1d8092304db1a10ecf789", "build/assets/ba_data/data/languages/swedish.json": "5142a96597d17d8344be96a603da64ac", "build/assets/ba_data/data/languages/tamil.json": "b9fcc523639f55e05c7f4e7914f3321a", "build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945", @@ -4062,26 +4062,26 @@ "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "85d4c2662e2abce652fde0d3b11f5f31", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "abdedd2ff24f241cb693c3f734f35679", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "8ec0707c0a05ca3d012363633ff96365", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "5d74f146e115277f321a95ff0d193d2f", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "91e60840bb7a51b5ea7f1c9336c10d6c", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "563235f95a31f507cc4db271235b5e1b", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "f111c46d242d2370896a45b15028382b", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "08dcacd0cb57cd06745729891d188396", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "5ac16dd97c9b0949908549d49d257cfc", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "0d95c3f63599a7ddee8c5d7169854fb7", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "b3bf7e899ceeb8cb913a4d51ec8119f5", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "7a3ffc7cb1f32e0bfd8b2dc06fa7a8e7", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "d3688f215340a3b933c95ed36ee58371", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "658d41499889fd722d12ed73c4555c8a", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "7998e1e1fd5d04c0063777562f1b6ef7", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "50e350ef3a319da5b7bcfc56c3cf8ab4", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "c67af67be98445f628b6583e65423cc7", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "9f2798ba964619e40ca102bdf0b662a9", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "c9aa454ec8ce2d7620b21b9c88a16fcf", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "181d05597ca4fb1e256e80f92c4cf812", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "4fbb07f4a446dda5889eaadaef0bab33", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "09ff692fa13ed5d37f8612b1e29fecc0", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "e17b655eddcb9a1a59d4f8c40452afd5", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "8b6e5314e8a2a9e32d97056070a75ffc", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "57145298f1d7d0bf8ef6e340af27e068", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "f7cd1aa8fcf0e8abb31e7d4870a3a786", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "e0228109023607d571b0753ef5f69937", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "9d6839be37bf0c186c81e8bab05779b1", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "5efc9bf8cdc30859315ecb3ae484ab8a", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "5a6e2df5ce6c71ed397ef6a73a0cdce9", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "6c1a86ba3b27545f619dacc7065a77e9", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "d216c4ab0544e601ace3858d2f887a9d", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "c760b465402cc4dc55d88fec1d2cb5de", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "402529644aba2d85c475f76c7cca307c", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "4ef10f001f77542a6bc4147c75b2e6a8", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "f0af11602982ee0c62196a84c8bb624f", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "e9caa2dc63f30b4119dcb8cfa44213b3", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "edf5589088702aa5970ab2b5f66d5cf2", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "f6eb176dd73831585e6309279c6bf719", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "d40f45d8e307fc1037489622855692d4", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "ffe8631c0ccc03751b4346fcf52d70ca", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "4241e93e1ea18414ee900046d1a62517", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "ffe8631c0ccc03751b4346fcf52d70ca", diff --git a/CHANGELOG.md b/CHANGELOG.md index 3393f44f7..b5e7018e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.36 (build 21942, api 8, 2024-07-25) +### 1.7.36 (build 21944, api 8, 2024-07-26) - Wired up Tokens, BombSquad's new purchasable currency. The first thing these can be used for is storage packs on ballistica.net, but this will expand to other places in the game soon. For a full explanation on why these were added, diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 1f4a41160..8003b02ef 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21942 +TARGET_BALLISTICA_BUILD = 21944 TARGET_BALLISTICA_VERSION = '1.7.36' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 969ebd748..2ebe14587 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 = 21942; +const int kEngineBuildNumber = 21944; const char* kEngineVersion = "1.7.36"; const int kEngineApiVersion = 8;