diff --git a/.efrocachemap b/.efrocachemap index 425710ce..4e2806bc 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -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": "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/full/linux_arm64_gui/debug/ballisticakit": "221f834ebd057ef663585d6ceef6806d", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "a2d8de14f13d4c3685fcaa317a7b27dc", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "39882077657944b36cf5491d43689329", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "7b0fd21a0cba86a1edfc41fa7f5b0336", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "e652b60f054852cf0dd7efcafea4998d", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "5deab4167830ac91daac9146c3768e04", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "53171f039acbcb69a64983bc78cc3af9", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "bc906b8824309daab45cfdd64f4f75cc", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "c9d66aa3f870b4820ccb00ad87edd30e", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "d99eeb561df547c8228110d66a90fbee", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "663c7ebd76302a57eeef8574f2244a70", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "e73ac0a48a7921d5407cbabaa005a03a", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "bf05c75c4991e13b9246d7638b6a276a", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "0edc9540a699d9b7af0916e0d8b286b3", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "15e24928603d9b31bfdabdcb1129535c", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "a15e467a1d7a9a080952ee02194a85f9", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "f09896f99981cd6af58257e4bfbffa73", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "deb4cdf43592b785f417d9e3992803ad", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "a46ba814582aef26306eb0811cd22d3f", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "2352638cf37627c0cf9d11f8686194b7", "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", @@ -4098,14 +4098,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "0f34f852bf368c787f41533230767b3a", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "1dcd03f0cfc75a53c3e682a3a46c96a0", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "0f34f852bf368c787f41533230767b3a", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "42fb91733cf64774f47a6467b9c8530b", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "98940f92d2aef3d1213a64b6d478c14a", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "38dc40ec06e9fb0c04968981b61f11c6", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "40852b9c75c5302a05d8326655b0995d", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "14f63850b2fcf82ca019b7faad57ef62", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "57932a35a8409e872bdfa2c8cc5cc434", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "8a1fd8ce769e187449ebb7360eb7bb4d", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "65705e64304484d3f5389442d84c8170", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "67f48c2af7ec20dc98e6423d3ff24d67", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "0b0319aa1bbf146e14fe8103abb23bd3", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "9102b512eaf6bcf21d1dbcb9c597dbe4", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "5dbc7599675f5cae378fcc24b8908e20", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "eab27e872b8c3950b6bf9044fa3a42a2", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "d9b13c6efc258a4dabf158df63673b22", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "27050ecb092d111cf013a561cfbb8c05", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a4d3c5812734e5780859e21c7398844a", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "cb299985623bbcc86015cb103a424ae6", "src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d", diff --git a/CHANGELOG.md b/CHANGELOG.md index b5e7018e..a597a279 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### 1.7.37 (build 21945, api 8, 2024-07-27) + ### 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 diff --git a/config/requirements.txt b/config/requirements.txt index bcf7c972..9ba3cea3 100644 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -4,11 +4,11 @@ filelock==3.15.4 furo==2024.7.18 mypy==1.11.0 pbxproj==4.2.0 -pdoc==14.5.1 +pdoc==14.6.0 pur==7.3.2 pylint==3.2.6 pylsp-mypy==0.6.8 -pytest==8.3.1 +pytest==8.3.2 python-daemon==3.0.1 python-lsp-black==2.0.0 python-lsp-server==1.11.0 diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 8003b02e..18086894 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 = 21944 -TARGET_BALLISTICA_VERSION = '1.7.36' +TARGET_BALLISTICA_BUILD = 21945 +TARGET_BALLISTICA_VERSION = '1.7.37' @dataclass diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 2ebe1458..2debbdf7 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 = 21944; -const char* kEngineVersion = "1.7.36"; +const int kEngineBuildNumber = 21945; +const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 8; #if BA_MONOLITHIC_BUILD