diff --git a/.efrocachemap b/.efrocachemap index a99a085a..826275eb 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4096,26 +4096,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": "b20c6e3a2287f1c6a9a898e78fcab105", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "0f1eff142f1e5796be2e0340dcbb4c8f", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "f40171c1c943c10e2d2120a586a711f7", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "ea494bdeb942cbab86c0371bb0558f3b", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "fba8474fd758e8d76bc6d7e90dfb7795", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "4b1a35c2e6d7c2d9a01c6e2750716c24", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "9ac4ee8aab0243a233ba8650cd0d0b73", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "c804d14d91dab05f644079ae47e61728", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "1f7011d1c77548e48b7f6d3ac09a29da", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c50790a9a2e3001dd079a6bbd753c36f", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "52528037523bf268e2c59a19626e7f2d", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "a920948fcc94c397495ef8dd674d325b", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "d0f7ad9287edd649d97844ada500a11d", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "1073804b2d2549f9eb992666fc3640c3", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "73e6ca5aee9af5a87960b7ae174f0a71", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "c09c4fac16134d5071a88ec8d3e1e950", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "e78b8bd1cb5aa452f536c57e855bcc27", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "0f08643a492ac7bf8fd3f13460003bce", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "48e684f7db6d88a62009d773ab51b065", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "69a301acc9adfacdb8b3d200390bbfdd", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "d093b9f05a59887053f21547896f1621", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "5f123741224e935dae9aeefa3a9bcffa", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "9e014a6518548780154b06bb58e2060a", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "8b352bf2b6ebc96a57839eb3677c626a", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "9a46895715c29e8db47dff128028dfe9", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "cc9a9a3841b427a802435eb721a4f43e", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "575a91b0164e3b59e9f1b80859d26dac", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "c317c30a8d4b2076134f5d693f919eb3", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "a0e3a4500fbcd8294c4bfdcad9e413c4", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c72084535f38e9119be7893537be8d99", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "dc474557f10afc022eaf5da9a774ed5b", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "b73ddabd4535a670f59e0bd946213e1e", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "fa63c94c2a66cba0b54bc152198f999c", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "7f37b43b6bdbd288ad0fb2e6157ceb25", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "d6d40b00ca4e2cf4b93f05e6c06ed766", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "0bd0e8701cfef0e5cee51d88e3f3c8ed", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "ace9120f32aafd8599b47deebea06a28", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "bcc2ad7ce1c217ca4f60ed769cbc6d7d", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "99c04035b38773827f4e0bc8bd29adce", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "d16cc9cfdf548499f34854a67f4a7225", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "653df60722ed096b8cc3ac3a4196e5a5", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "f82c1e575e8f23c1e278db61a740a4d5", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "653df60722ed096b8cc3ac3a4196e5a5", @@ -4132,14 +4132,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "ea327f45634a8e42259c5ecadf219e36", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "547362a74979fa82b854a475dffeae90", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "ea327f45634a8e42259c5ecadf219e36", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "828f4682e3bbdc0da5b45a0050aeb5d8", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "cf4b13af9f0846a466204afbe74b9e86", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "b43fa205beae83e030ec777d4974736b", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "aef585a4d739765b59f9a85dc27ff67f", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "559b65282ab2bfff034aa64963a7af52", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "5916245826eb4d3b68944006f82de6d9", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "6844834b7fc1030c234bee21a376a017", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "c9b29530b90bb59e8570d991072efd77", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "c46bc2da33b300077f51c11846966504", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "49706dad7a84cafb139902b95d7ecaf4", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "32b5765d12873b610ade2cc35c115eab", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "f4d32707b72f248407be7cdcd4ad67d0", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "49a7cd802409e0ed6dfd44004ad03aee", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "100590b2b6f554d7763b18122ba9e04d", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "8f0fe1c1173afc5c6c8efdb23e941b73", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "6cfb3a5dd5eefca669e3389e847562dc", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad", "src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d", diff --git a/CHANGELOG.md b/CHANGELOG.md index e3e66659..b086ec71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22040, api 9, 2024-10-19) +### 1.7.37 (build 22044, api 9, 2024-10-19) - Bumping api version to 9. As you'll see below, there's some UI changes that will require a bit of work for any UI mods to adapt to. If your mods don't touch UI stuff at all you can simply bump your api version and call it a day. @@ -16,9 +16,11 @@ app startup behavior this way. Previously this sort of thing would generally require setting cryptic environment variables which was not feasable on all platforms, but this new system should work everywhere. -- Logs printed to both the command line and the in-app console now include - timestamps and logger names, and are color coded for severity (DEBUG=blue, - INFO=default, WARNING=orange/yellow, ERROR=red, CRITICAL=purple). +- Log messages printed to both the command line and the in-app console now + include timestamps and logger names, and are color coded for severity + (DEBUG=blue, INFO=default, WARNING=orange/yellow, ERROR=red, CRITICAL=purple). +- `efro.log` is now `efro.logging` which better lines up with other logging + module names. It was originally named `log` to work around a mypy bug. - Went ahead and fully removed `efro.call.tpartial` (since we're breaking compatibility anyway by bumping api version). If you are using `efro.call.tpartial` anywhere, simply replace it with `functools.partial`. @@ -176,8 +178,6 @@ version and then upgrading to later builds of the same version containing incompatibilities with the older sys scripts. This should help with that problem. -- `efro.log` is now `efro.logging` which better lines up with other logging - module names. It was originally named `log` to work around a mypy bug. ### 1.7.35 (build 21889, api 8, 2024-06-20) - Fixed an issue where the engine would block at exit on some version of Linux diff --git a/src/assets/ba_data/python/babase/_app.py b/src/assets/ba_data/python/babase/_app.py index 7c520e39..f7cbb99e 100644 --- a/src/assets/ba_data/python/babase/_app.py +++ b/src/assets/ba_data/python/babase/_app.py @@ -229,7 +229,6 @@ class App: self._asyncio_loop: asyncio.AbstractEventLoop | None = None self._asyncio_tasks: set[asyncio.Task] = set() self._asyncio_timer: babase.AppTimer | None = None - # self._config: babase.AppConfig | None = None self._pending_intent: AppIntent | None = None self._intent: AppIntent | None = None self._mode_selector: babase.AppModeSelector | None = None @@ -336,13 +335,6 @@ class App: self._asyncio_tasks.remove(task) - # @property - # def config(self) -> babase.AppConfig: - # """The babase.AppConfig instance - # representing the app's config state.""" - # assert self._config is not None - # return self._config - @property def mode_selector(self) -> babase.AppModeSelector: """Controls which app-modes are used for handling given intents. @@ -960,6 +952,7 @@ class App: if not self._called_on_running: self._called_on_running = True self._on_running() + # Entering or returning to loading state: elif self._init_completed: if self.state is not self.State.LOADING: diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 32ba280f..b3296cc8 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -53,7 +53,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 22040 +TARGET_BALLISTICA_BUILD = 22044 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/ballistica/base/base.cc b/src/ballistica/base/base.cc index cf9cbc56..f4d2e111 100644 --- a/src/ballistica/base/base.cc +++ b/src/ballistica/base/base.cc @@ -213,10 +213,6 @@ void BaseFeatureSet::StartApp() { // We'll explicitly grab it if/when we need it. Python::ScopedInterpreterLockRelease gil_release; - // Read in ba.app.config for anyone who wants to start looking at it - // (though we don't explicitly ask anyone to apply it until later). - // python->ReadConfig(); - // Allow our subsystems to start doing work in their own threads and // communicating with other subsystems. Note that we may still want to run // some things serially here and ordering may be important (for instance @@ -666,7 +662,6 @@ void BaseFeatureSet::DoV1CloudLog(const std::string& msg) { static bool warned = false; if (!warned) { warned = true; - printf("MSG %s\n", msg.c_str()); printf( "WARNING: V1CloudLog called before babase fully imported; " "ignoring.\n"); diff --git a/src/ballistica/base/python/base_python.h b/src/ballistica/base/python/base_python.h index e334e5c2..81e9083e 100644 --- a/src/ballistica/base/python/base_python.h +++ b/src/ballistica/base/python/base_python.h @@ -124,7 +124,6 @@ class BasePython { void ImportPythonObjs(); void ImportPythonAppObjs(); void SetConfig(PyObject* config); - // void ReadConfig(); const auto& objs() { return objs_; } diff --git a/src/ballistica/base/python/methods/python_methods_base_3.cc b/src/ballistica/base/python/methods/python_methods_base_3.cc index 462c80d7..43e5749f 100644 --- a/src/ballistica/base/python/methods/python_methods_base_3.cc +++ b/src/ballistica/base/python/methods/python_methods_base_3.cc @@ -110,7 +110,6 @@ static auto PySetUIScale(PyObject* self, PyObject* args, PyObject* keywds) const char* scalestr; static const char* kwlist[] = {"scale", nullptr}; - // PyObject* input_device_id_obj = Py_None; if (!PyArg_ParseTupleAndKeywords(args, keywds, "s", const_cast(kwlist), &scalestr)) { return nullptr; diff --git a/src/ballistica/scene_v1/support/host_session.cc b/src/ballistica/scene_v1/support/host_session.cc index bb61ae4c..61b73c3f 100644 --- a/src/ballistica/scene_v1/support/host_session.cc +++ b/src/ballistica/scene_v1/support/host_session.cc @@ -517,8 +517,6 @@ void HostSession::Update(int time_advance_millisecs, double time_advance) { time_advance_millisecs, time_advance); } - // printf("ADV %d %f\n", time_advance_millisecs, time_advance); - // We can be killed at any time, so let's keep an eye out for that. WeakRef test_ref(this); assert(test_ref.Exists()); diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 63d9f092..360aff89 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -40,7 +40,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 22040; +const int kEngineBuildNumber = 22044; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9; diff --git a/src/ballistica/ui_v1/widget/root_widget.cc b/src/ballistica/ui_v1/widget/root_widget.cc index 8e960a33..896dca75 100644 --- a/src/ballistica/ui_v1/widget/root_widget.cc +++ b/src/ballistica/ui_v1/widget/root_widget.cc @@ -611,7 +611,6 @@ void RootWidget::Setup() { b.h_align = 0.0f; b.v_align = VAlign::kBottom; b.width = b.height = 60.0f; - // b.x = bx; b.y = b.height * 0.5f + 2.0f; b.color_r = BOT_LEFT_COLOR_R; b.color_g = BOT_LEFT_COLOR_G; @@ -629,8 +628,6 @@ void RootWidget::Setup() { auto centerx = -1.5f; auto centery = 8.0f; - // auto offsx = 5.5f; - // auto offsy = 5.5f; { TextDef td; td.button = achievements_button_; @@ -984,10 +981,6 @@ void RootWidget::StepPositions_(float dt) { if (!b.allow_in_main_menu) { enable_button = false; } - // Disallow menu button in the main menu. - // if (&b == menu_button_) { - // enable_button = false; - // } } else { if (!b.allow_in_game) { enable_button = false;