From c93d3f935992381eb3148766d8ba89d769a930bc Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 3 Aug 2023 12:55:16 -0700 Subject: [PATCH] version bump --- .efrocachemap | 56 ++++++++++++++--------------- CHANGELOG.md | 2 ++ src/assets/ba_data/python/baenv.py | 4 +-- src/ballistica/shared/ballistica.cc | 4 +-- 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index e5fe3c92..1652fc4d 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4068,26 +4068,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": "5c33841bddb06db422bc7b610d54e850", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "7c68be74dc87cc8bea603351d4edc19e", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "4aee26e9c9399db7036d63c05b415146", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "0c863960576179584121bfa00b0c0176", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "5c7ce41451ea6fd44f3106ad4d333def", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "189837b829a2ea704fad9fb163e50490", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "ddc816b66933c7e5b811c9c7c2dd16b8", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "98e206e6e92514f7be59096a135bed3c", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f29ba9eeddf9a55febff06fca7db52a9", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c63f95f2f7e813351dfe18f51e6deeb4", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "c303ae3176d11b2b134068878e786833", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "123098bb0bb01419fa2acdad01be34a0", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "0d416da46426a9969ed3b7a91f5497b5", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "9e924485487aaabbc137c02f895247f2", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "61af0496d9b62e671fc55a38df776d99", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "62d2eaf952658ef8fe0d9910c9f8d964", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "6e35a1c8093de8886134d2f1dab4a56a", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "803800bebf963742fd26cae8e793245b", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "6bb44a0e36fa87f384aa4a29f56c9dcc", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "f72615c3eeea0a5f8789faa20d053f85", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "1f6d9028dd5007bdb1ea940f3b1f9ffb", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "64da0286b58456e4e1dbac45e7ba77e7", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "0e2e107d97f6256e971ef5f5391c7641", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "06c59df009b3f8ef7a6bc7f3dd02fa27", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "12612fae133533d2155f5094b44b8876", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "1ff6dee3bcdeccea98c43cefe38dbd59", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "c761e7132d753091db6f7621a4d82507", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "fa79d2d5fe20dde12d8631b681b8bc02", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "c72c33127aa954b826864e8a0a06e88f", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "0c0b3c9951c97b85aa6ee4e0874b5131", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "0fb483aaa39af8d584b387cc99e057d7", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "522750cf436f7f7dd004af239d3e5c9c", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "7545639f4559c64f538ed71abf8f19b1", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "bd8f13259ea0de5831f94bfabd6662fc", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "3092f4610127e1ddedddee7b1ffe4dcb", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "23e005d825c4899b04e1df8275e63366", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "b4df036a30f092881386ef0aa1140c68", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "d1e2d35e82a8eb50cfac3e685d9016d4", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "1b92e2482b679b86cb3c12da4f1004a1", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "3957970cf3ac0a82cbcb5a445662009f", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "85ba4e81a1f7ae2cff4b1355eb49904f", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "498921f7eb2afd327d4b900cb70e31f9", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "85ba4e81a1f7ae2cff4b1355eb49904f", @@ -4104,14 +4104,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "0ab638b6602610bdaf432e3cc2464080", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "92394eb19387c363471ce134ac9e6a1b", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "0ab638b6602610bdaf432e3cc2464080", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "ae1fcb25dead5a8b306d1a3c8d02887e", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "56b419764d2ea9811fbca8bef99d032e", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "787b4c6337d367c2ad0cdf1cdc980b5e", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "7d4b36b9cc305832430210d7db55f13a", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "ae9083ecbbcf81f54ab3aafbf5a58273", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "1220228d0a0036c898483ef73b41056c", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "14d5968a2cb52b1eb9c33704f90a3e4d", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a85e95a06c5a3f696334c3da807c0ada", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "411bb5f7f0b5c1924e5053e7c13a92cf", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "cbe2ff5e994ebc9fbf8c5f7f659ec330", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "23294191ecf06a5102f0347977fe3ce3", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "a23d782458dacc3f0254c39c58bd1c84", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "bbcbc5c0520dc9ff63160251dcc0d563", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "6accc63aabe88719d29e56951ee9389b", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "4699dfc0ed55e8873ac449c80921e847", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "9302772607883c8cf5c62d1761936c84", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "f8cd3af311ac63147882590123b78318", "src/ballistica/base/mgen/pyembed/binding_base.inc": "eeddad968b176000e31c65be6206a2bc", diff --git a/CHANGELOG.md b/CHANGELOG.md index 7521401c..ad05d731 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### 1.7.26 (build 21212, api 8, 2023-08-03) + ### 1.7.25 (build 21211, api 8, 2023-08-03) - Fixed an issue where the main thread was holding the Python GIL by default in diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 6460f821..b4602cc8 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,8 +52,8 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21211 -TARGET_BALLISTICA_VERSION = '1.7.25' +TARGET_BALLISTICA_BUILD = 21212 +TARGET_BALLISTICA_VERSION = '1.7.26' @dataclass diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 9ccfb191..49a33570 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,8 +39,8 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 21211; -const char* kEngineVersion = "1.7.25"; +const int kEngineBuildNumber = 21212; +const char* kEngineVersion = "1.7.26"; #if BA_MONOLITHIC_BUILD