diff --git a/.efrocachemap b/.efrocachemap index 704a6bfa9..fd4f8f74b 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": "9d65eab8b2e3de658fe8dd9e0400b59f", + "build/assets/ba_data/data/langdata.json": "faffc0854bc4c34f4ef427404ec75c4d", "build/assets/ba_data/data/languages/arabic.json": "5c27239be3d4f8daefd9f3bd7e99ff8d", "build/assets/ba_data/data/languages/belarussian.json": "260d190aae3282a726b4a27019972d58", - "build/assets/ba_data/data/languages/chinese.json": "fcd59e90c12e8106ce418b65b97b3db6", + "build/assets/ba_data/data/languages/chinese.json": "2f67c6b127ae85492ac552af1a91e95a", "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", @@ -434,7 +434,7 @@ "build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880", "build/assets/ba_data/data/languages/filipino.json": "920fc429ec9b587edc2c6294fffada71", "build/assets/ba_data/data/languages/french.json": "ee2a81129519d7030a617308da8c9195", - "build/assets/ba_data/data/languages/german.json": "eaf3f1bf633566de133c61f4f5377e62", + "build/assets/ba_data/data/languages/german.json": "198b9860c5b9df7b8e3e30b03d8755cb", "build/assets/ba_data/data/languages/gibberish.json": "3e68d809bd6ede3b9e2c57c147737e42", "build/assets/ba_data/data/languages/greek.json": "ad3c0d38f34d809824892d6f22808dbf", "build/assets/ba_data/data/languages/hindi.json": "bb3548531daf7bc7fee4a28d48228c32", @@ -444,10 +444,10 @@ "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": "8bd6251e46c8ca7fcd075d989e79f0d9", - "build/assets/ba_data/data/languages/polish.json": "fecaa70e2b8ec46dc78767ad1bba3602", + "build/assets/ba_data/data/languages/polish.json": "82ad9f88c7d0499a049d2008c85aa6f1", "build/assets/ba_data/data/languages/portuguese.json": "615a59bd03f84659158d9f2608a4ab21", "build/assets/ba_data/data/languages/romanian.json": "b3e46efd6f869dbd78014570e037c290", - "build/assets/ba_data/data/languages/russian.json": "a19ff3d240a3c8dc2508296c161bc59c", + "build/assets/ba_data/data/languages/russian.json": "41e06eda170fb5960393dd6b58d046e1", "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": "6d41c60539072d2dd9608579954403b0", @@ -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": "798f4beaf9bcedbbd838801fa21c59b8", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "e3d1446bbe3995bc656f977ce016de44", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "371bb531dc5a4cd178577622c485d5d0", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "37c9405732e84aaca188183c38896c9b", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "e266cb630a6aaff062ae8b805320d168", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "da731180827f74d0397ad8de3513d460", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "e265dcac18f1daccf9df488fcc1b6724", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "abc3bca14a09f7d72f00472ee69cbaa2", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "87fbcd34d0963ed1f54c213e1e9ce24b", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "33f20935cb1cf6ccaf409846f84b241f", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "c1769fbf49db6b630e801ace3ac1f55e", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "62682664253767b108dd4a90670f3d8e", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "8b9ff340043ffcec5f50e2bb2239056d", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "4ca5c155c8acdd4440e8cbaf85edc0ff", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "5986c75ff3e956e57e996c9e1ea0b654", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "cd7243e6a94a8c4d7e4cd9e2817677d9", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "5d7017e7a1f06dd178893d0742994937", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "742261cb35cc08e844170242b52eabb7", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "c51b78b85aa079894b746ff1bc6adcd4", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "6b36f587dbbe61faba5aaabe51acf5f1", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "9ac7439035bfc6e58c09fd333be7bf32", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "0a6c29a617a2a7f75b5ea74ae31c00ba", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "090c580f73c18253ad03fa7bdb5410c6", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "fb8aa86a244b28b683ea8148f63800e2", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "a6fb7f0164a400a8bce7c7cb2327f41b", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "c6e86f716993e4db6d40b387c1887bf9", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "fdb8c01b631d5475740f0101b301ff03", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "8c58b1dff5c711bf8dfe6bcc0c033e02", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "8d5e1c27b1040feedce50b4b4fd8497f", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "4bd338604cf6288636422ef3b62e5d44", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "7a129df9937117ace9e0e2473c2d73bd", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "316e826a593499760060c1c2c09fe278", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "a8d1b5a90491dc49396a053d6e797f0f", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "606f7ed5a63fad5acbdba62b8f2e953f", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "719a16d807335829265808821aedb732", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "f98f149307ee2096aa5c82fb666d96b2", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "addf57ff7e742a1d411601897441fa8f", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "cd2fee63bc2017caa866e52b57412484", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "5ff2d6b4ef8a60a5805debcde460b835", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "407f642cfebc38c14eae5526c2a27c68", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "9162b53189b80d4e5938cd142acd2a1a", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "2226d0e2d34051d962320c86464f3a2d", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "9162b53189b80d4e5938cd142acd2a1a", diff --git a/CHANGELOG.md b/CHANGELOG.md index bee382cb1..7069bc7eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.35 (build 21879, api 8, 2024-05-16) +### 1.7.35 (build 21880, api 8, 2024-05-19) - Fixed an issue where the engine would block at exit on some version of Linux until Ctrl-D was pressed in the calling terminal. - V2 accounts have been around for a while now, so the old V1 device login @@ -62,9 +62,13 @@ addresses when available and transparently use whichever is more performant. - Added `docker-build`, `docker-run`, `docker-clean` and `docker-save` targets to Makefile. -- Finally fixed the very old sticky bomb chaos bug in Assault game. +- Fixed an issue in Assault where being teleported back to base with a sticky + bomb stuck to you would do some crazy rubber-band-launching thing (Thanks + vishal332008!) +- The `windows-debug` and `windows-release` Makefile targets should properly run + the game again (these build the Windows version of the game from a WSL + environment). - ### 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 of the things this means is that we can use `typing.override` instead of the diff --git a/Makefile b/Makefile index 1e040aa30..17f3c7088 100644 --- a/Makefile +++ b/Makefile @@ -990,12 +990,12 @@ windows-staging: assets-windows resources meta # Build and run a debug windows build (from WSL). windows-debug: windows-debug-build @$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86 - build/windows/Debug_Win32/BallisticaKitGeneric.exe + cd build/windows/Debug_Win32 && ./BallisticaKitGeneric.exe # Build and run a release windows build (from WSL). windows-release: windows-release-build @$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86 - build/windows/Release_Win32/BallisticaKitGeneric.exe + cd build/windows/Release_Win32 && ./BallisticaKitGeneric.exe # Build a debug windows build (from WSL). windows-debug-build: env \ diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 17953a4e1..9acc46e57 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 = 21879 +TARGET_BALLISTICA_BUILD = 21880 TARGET_BALLISTICA_VERSION = '1.7.35' diff --git a/src/assets/ba_data/python/bascenev1lib/game/assault.py b/src/assets/ba_data/python/bascenev1lib/game/assault.py index c0d7c3db3..051cb7f00 100644 --- a/src/assets/ba_data/python/bascenev1lib/game/assault.py +++ b/src/assets/ba_data/python/bascenev1lib/game/assault.py @@ -245,9 +245,14 @@ def _handle_base_collide(self, team: Team) -> None: bs.animate(light, 'intensity', {0: 0, 0.1: 1.0, 0.5: 0}) if player.actor: random_num = random.uniform(0, 360) - # A simple hack to work around the chaos caused by - # any sticky bomb's sticky material, if present and - # is sticking to the players. + + # Slightly hacky workaround: normally, + # teleporting back to base with a sticky + # bomb stuck to you gives a crazy whiplash + # rubber-band effect. Running the teleport + # twice in a row seems to suppress that + # though. Would be better to fix this at a + # lower level, but this works for now. self._teleport(player, new_pos, random_num) bs.timer( 0.01, diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 6e0291a48..75acd734d 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 = 21879; +const int kEngineBuildNumber = 21880; const char* kEngineVersion = "1.7.35"; const int kEngineApiVersion = 8;