From 23bee357875e2cbdda32b1accefc836938ba4380 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 5 Jan 2024 14:13:04 -0800 Subject: [PATCH] tidying --- .efrocachemap | 40 ++++++++++++++--------------- CHANGELOG.md | 16 ++++++------ src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/shared/ballistica.cc | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index c9466523..59195f61 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4060,26 +4060,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": "8d62386f109621ee08bf6bc699e560b4", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "1ae0c73018caf6d563f7a2beed5630df", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "cec12563653f88526ab0cdd56c35a659", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c406758148e6a19a8ba776de09c9cf31", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "ec6b2f954c73f0a44d25eb12b76ae3df", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "190572e9a537ab1cce44a3a307cfb65f", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "d1dd35ec23c4e42d7bcd05406375b3f3", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "790f5c6df9bc038b9b0c1561e30cc17f", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "946739e98d88bbcdb615a97f66a3a9f5", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "e625d8908634593ca1917ae7a42846ea", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "48b463fbb8ad28f4c9487feb5383a1a7", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "a8fd4ed9a9db5878d21eee6d4d8035ce", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "a40f333afd411df2323b236f7931c72f", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "8c1b885d6bcae9c43b8ca45c3538d9f7", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "10e25021c620ae9df514e952d6f7a14c", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "5fdbf8e2c9619f093e4c0505619178f2", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "74527ceb879d581e162eea3052b74b48", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "4cbf3fa8efd3ac8051fdf7776684e80c", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "0dc81a9db0d827fd803ba3eac90c4453", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "bbd66efc658747530ec46af2620066c2", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "1190edb8a3b760875460e6628831df27", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "7c4d6030a71080233ed662dacb49af8d", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "dcd3de304861dd0f85a7a0c6f819b042", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c3ac5db2032201a91da94f8794b4411f", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "a269ff4bb4f1ae7a11d03053384595bc", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "e2c7d7d143f41908dc0f048002f8cfc0", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "d3a354cbf54de689a80366a606e60519", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "821274222493f7d5ff6e85ad4550075d", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "1952387cb81df95f5552210eecab5535", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "4cb35d606af38c69ae1d6da3b098c022", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "d65d67896cec8d9865ee8c85a1499379", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "7dd0abfeeae0b52733d039e352aa08b1", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "0157869c686240f6b11943a1708e84ec", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "2e4cbab38f5b83fb0f7bb651bdb15fab", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "2dc40cd1177009929a9b87bc06c54013", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "a1976d5d3afcb4bc0b522c39ff2bba3b", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "e811ccf9db0ae385f93ecbde127ce068", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "c364f181207ec23533b58fc611ce957e", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "833f2039517a2f7f87462fa799801a36", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "a0506d52bc0ec8c41744aef0886dc204", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "db535f0ca1e01af825f75f204fbc8928", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "97d51afca996ae15b61fd9f409a00459", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "db535f0ca1e01af825f75f204fbc8928", diff --git a/CHANGELOG.md b/CHANGELOG.md index eb74ef8a..ba15ac98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.33 (build 21751, api 8, 2024-01-05) +### 1.7.33 (build 21753, api 8, 2024-01-05) - Stress test input-devices are now a bit smarter; they won't press any buttons while UIs are up (this could cause lots of chaos if it happened). - Added a 'Show Demos When Idle' option in advanced settings. If enabled, the @@ -483,7 +483,7 @@ you run into any problems because of this and we can make an option to use the old behavior where Ballistica's app and site paths get placed at the end. - It is now possible to manually run the app loop even on monolithic builds; - just do `PYTHONPATH=ba_data/python ./ballisticacore -c "import baenv; + just do `PYTHONPATH=ba_data/python ./ballisticakit -c "import baenv; baenv.configure(); import babase; babase.app.run()"`. This is basically the same thing modular builds are doing except that they use a regular Python interpreter instead of the ballisticakit binary. @@ -814,7 +814,7 @@ future, the default BallisticaKit app may be expanded with editing functionality and I feel the name 'Kit' fits better for something used that way than 'Core' does. -- The `ballisticakit_internal` precompiled library has been renamed to +- The `ballisticacore_internal` precompiled library has been renamed to `ballistica_plus`. This name better describes what it actually is (basically precompiled native portion of the `plus` feature set). Also by removing the 'kit' from the end it will no longer be renamed in spinoff projects, meaning @@ -1566,7 +1566,7 @@ `prefab-gui-debug` (more consistent with the existing `prefab-server-debug` targets). - Windows builds now go to build/windows instead of - `ballisticakit_windows/build`. + `ballisticacore_windows/build`. - Lots of project reorganization to allow things such as documentation or the dummy `_ba.py` module to be rebuilt from the public repo. - Added network flood attack mitigation. @@ -2222,7 +2222,7 @@ ### 1.4.111 (14286) -- BallisticaKit Pro now unlocks 2 additional characters +- BombSquad Pro now unlocks 2 additional characters - multi-line chat messages are now clamped down to 1 line; should prevent annoying multi-line fullscreen message spam @@ -2299,7 +2299,7 @@ ### 1.4.95 (14236) - added a port option to the config, so it's now possible to host multiple - parties on one machine (note that ballisticakit 1.4.95+ is required to connect + parties on one machine (note that bombsquad 1.4.95+ is required to connect ports aside from 43210) ### 1.4.95 (14234) @@ -2309,14 +2309,14 @@ ### 1.4.95 (14233) -- ballisticakit (both `bs_headless` and regular) now reads commands from +- bombsquad (both `bs_headless` and regular) now reads commands from standard input, making it easier to run commands via scripts or the terminal - server now runs using a 'server' account-type instead of the local 'device' account. (avoids daily-ticket-reward messages and other stuff that's not relevant to servers) - the server script now passes args to the game as a json file instead of individual args; this should keep things cleaner and more expandable -- the `ballisticakit_server` script also now reads commands from stdin, allowing +- the `bombsquad_server` script also now reads commands from stdin, allowing reconfiguring server settings on the fly - added more options such as the ability to set game series lengths and to host a non-public party diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 75a544b8..330bd2ff 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 = 21751 +TARGET_BALLISTICA_BUILD = 21753 TARGET_BALLISTICA_VERSION = '1.7.33' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 7cd26182..b15b7809 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 = 21751; +const int kEngineBuildNumber = 21753; const char* kEngineVersion = "1.7.33"; const int kEngineApiVersion = 8;