diff --git a/.efrocachemap b/.efrocachemap index e6a15f1f..6c2169fa 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4038,26 +4038,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": "c653e9575eab2f467702bb426771280b", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "519a2b4b38179aa715b10d34f473dded", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "60b696d0dbc17349ae6daf696eddd6a1", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "1aee3b95c765746a9360d7d2ce79b206", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "f8dfef071f3d2ce65a9a2122cebc43d4", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "450aca234f32c26801a099153961a4e6", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "f668372d4a26a59be7ce6cd650881f0a", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "655eb1c11d066c1c988608724e80b6b3", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "ed14b93f34a1b9806b931accdfe0ef12", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "167808a4dc1f9642589fd88e8b7d8351", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "2315ba71f7235345420dd6669fce5fc3", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "4e24f70d03faf5656847f6aaea9565cd", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "c9ab8c01bb8c58dcb18bcaf4b171a0f9", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "01548c4de666b30aefd597aa12ce34c0", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "cc7588a2b850dd4e2cc85430c198061a", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "4dd2d178bc0d1180d4b55fd339bc3d1d", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "98ed95827b489c88e269c61fdd9dc4ab", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "f6ceadc1c7ef9f982ed1244287c00d95", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "4f1075cdbb1ecebef79c95dddd1fda80", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "359582bdd5044c4253d8c900ce3be8db", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "bfd58a687b408c5c6ed5bc63d97095d9", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "f73ecc7f635b3988851021b2bf7c87d7", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "5921b09e1ea841986fd0e8c348f1ba96", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "d2d5506c256a6374c9ad3ef403948849", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "84dc1f1bf91f985f3814752e305073cf", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "1697df9c8b40249705d6e597f3f38385", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "37fa3c5cf296f4751cd4fd48b5090288", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "f2bf600abed20a7bb626ba11c672af4e", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "241cb5e70f31a1bf4b837d1372dc78e1", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "8d1e211c491ae485cd5e00c27fa01e03", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "804a6819db1e8107f4e757903cdbf273", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "634597ba33aa0c29625fa81bcb50c608", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "60c7782d742f24a67352cc49e4080efa", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "5d2abee6403963b60b6b422d84d58738", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "fce8370bb7ea6b1b3208dc4efa4b20df", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "6979de360c31b792f53572182438f5b0", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "c8161cd1a54a17a4cc4e17c0b2ea0fe4", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "4982637e226891d5afa48400f7ee619b", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "ca12bee3cb430eccfa0235719a5d1048", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "94d1c2579f2fbc99f4725975f08bb150", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "55c07828ad7fccc584dd96d1ffebd760", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "7ca8b0b5c34766ce9df9babb6ec8311f", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "55c07828ad7fccc584dd96d1ffebd760", @@ -4074,14 +4074,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "ab81671e4e3be14b17ce721eb835b426", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "6a26caeb1dd4d4871d52e8e2fb2c11ef", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "ab81671e4e3be14b17ce721eb835b426", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "fe4925f4720ee9e68eadf3d651b4442c", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "8a04272fb2077163c387c4674d8801f1", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "6bce4106018c41285b7f6bfe46bfd7a7", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "e98e275039b98a85f6ec01a643c7f224", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "0523a823ef503ee9fe3aab057bae7f42", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "2c661f8b506637b660f646df0ff28553", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "01c589abb3b1d737dec30bdb93e114ab", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "554332d71f9a0fddfc1ecca041542923", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "d3626b90791c87180f16ae80b05b088e", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "05bd119dcb343f201f2030eff9216eef", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "e1c3d622bbbd66770ba019fc92abba85", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "79cbceebbbfa08cef06358cf4ca07634", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "c66603084bf3da24a796655a84c8dd44", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "d4a2fce87510ef0a47997e04b5508c4b", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "e2df70a204ac392d5afd6ef14f656687", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "431d30bd06bbb3568a8a219c19c5817a", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d", "src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f", diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ccbb1e0..804f3b3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.35 (build 21826, api 8, 2024-04-28) +### 1.7.35 (build 21827, api 8, 2024-04-30) ### 1.7.34 (build 21823, api 8, 2024-04-26) - Bumped Python version from 3.11 to 3.12 for all builds and project tools. One diff --git a/config/requirements.txt b/config/requirements.txt index 6f8b5a7a..6338fe45 100644 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -1,14 +1,14 @@ cpplint==1.6.1 dmgbuild==1.6.1 -filelock==3.13.4 -furo==2024.1.29 +filelock==3.14.0 +furo==2024.4.27 mypy==1.10.0 pbxproj==4.1.0 pdoc==14.4.0 pur==7.3.1 pylint==3.1.0 pylsp-mypy==0.6.8 -pytest==8.1.1 +pytest==8.2.0 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 94759736..0aaf66c4 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21826 +TARGET_BALLISTICA_BUILD = 21827 TARGET_BALLISTICA_VERSION = '1.7.35' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 7cf7e6a9..938deca4 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 = 21826; +const int kEngineBuildNumber = 21827; const char* kEngineVersion = "1.7.35"; const int kEngineApiVersion = 8; diff --git a/tools/batools/build.py b/tools/batools/build.py index f0422e3c..24a22dcc 100644 --- a/tools/batools/build.py +++ b/tools/batools/build.py @@ -469,8 +469,10 @@ def _get_server_config_template_toml(projroot: str) -> str: lines_in = _get_server_config_raw_contents(projroot).splitlines() # Convert to double quotes only (we'll convert back at the end). - assert all(('"' not in l) for l in lines_in) - lines_in = [l.replace("'", '"') for l in lines_in] + # UPDATE: No longer doing this. Turns out single quotes in toml have + # special meaning (no escapes applied). So we'll stick with doubles. + # assert all(('"' not in l) for l in lines_in) + # lines_in = [l.replace("'", '"') for l in lines_in] lines_out: list[str] = [] ignore_vars = {'stress_test_players'} @@ -512,8 +514,9 @@ def _get_server_config_template_toml(projroot: str) -> str: out = '\n'.join(lines_out) # Convert back to single quotes only. - assert "'" not in out - out = out.replace('"', "'") + # UPDATE: Not doing this. See above note. + # assert "'" not in out + # out = out.replace('"', "'") return out