diff --git a/.efrocachemap b/.efrocachemap index 2af90bfc..2622af6f 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4072,26 +4072,26 @@ "build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/c5/09/4f10b8a21ba87aa5509cff7a164b", "build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/ff/0a/a354984f9c074dab0676ac7e4877", "build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/2a/1c/9ee5db6d1bceca7fa6638fb8abde", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/10/81/5ce0f34e5dd912b1723be7a3837f", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/dd/98/0a4278a6e151c46d85f77f5dc1f3", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b1/aa/878bc2dd638701e23dfd37ee74d4", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/cc/66/5160a13fd2cd09249185103cc55e", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/20/86/4c9b6163841f70235f77629e7edf", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/7b/0e/e36fd6fbae51a93e566f973579ce", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/9e/4d/06cf117900a7a5ae62904b9398ca", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/30/44/10a34ef72dc0be595da941ce6664", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/e2/fc/791875e4337f4af0fd66f845a663", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/22/a0/e1ac325e680b8abb928de15d1670", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/a9/f3/35c29a941dd6e9705080e88fb834", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/87/9d/30db60e4c81d0f58c26f36147877", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/14/cb/b6e92b56f3e003dce5ac17e96053", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/b3/89/ed20b4771df1879c90d8c0245c2d", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/35/e8/b2435234bfe8b1415787d09e838a", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/05/6d/60621df973e3365a6553396da791", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/57/e1/3a3bcd55e97d1f71522c4d31975a", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/ad/d0/8b278c4e5563ddb22cb2722ea55c", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/41/92/d1092525fe6fc6530e6d3ee97db7", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/4d/9e/81bb20769e0056826f54999e4a9f", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/58/ee/1ae7013ce43f284e1037e4d6d919", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/ab/c7/667fbfbddf1633be04f3216e0643", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/26/27/837e81d734fd600e258c02b9dccf", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/6a/b5/0f025731ba6077489aeb2fd177d0", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/27/38/e8add26cb151502314c1b63f17a9", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/85/49/10aa68593cab2a1e8157d08f01b7", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/86/3a/497b582b67614ee0dbca984ec355", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/32/a6/dbd29464c7b8a0939db43f50f05f", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/7a/39/e06e47cbe35b9191a8d01d634690", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/dc/03/292c24cc1576db602d5abef25021", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7f/d1/ac412a5e2c13c1ff65ba745fe71a", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b4/ad/78a018863d2aa19c2c75bbc0507a", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/d4/b4/6e407209943bfcbe595bb646d0ec", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/33/56/7ba169a200619cbd84c7f0ce2d05", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d2/02/4e009574cce072d6a20a2ab29a70", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/af/71/1979797270010b09d88fcb4cbf38", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/bd/ed/1c0eccb11e438a2b1e9106464187", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/81/0c/1f834b3e710f788748bdeb0f7e21", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/43/c1/fb11c149f9a8b34cdaad76eec2c3", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/30/f5/3964913ed145b96629055623e1f1", "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/d4/6a/dd303a200b98a56ba3b100277057", "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/fc/2c/2996c558fb408a548fdd37398c9a", "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ed/28/b7a72be7ae1bd2b58dda4b6902a0", diff --git a/CHANGELOG.md b/CHANGELOG.md index 337d1b82..39b085f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.20 (build 21039, api 8, 2023-06-02) +### 1.7.20 (build 21040, api 8, 2023-06-02) - This seems like a good time for a `refactoring` release in anticipation of changes coming in 1.8. Basically this means that a lot of things will be diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 66e6e7f7..09c08d6d 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -30,7 +30,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21039 +TARGET_BALLISTICA_BUILD = 21040 TARGET_BALLISTICA_VERSION = '1.7.20' _g_env_config: EnvConfig | None = None diff --git a/src/ballistica/base/logic/logic.cc b/src/ballistica/base/logic/logic.cc index 0c50eb6a..18b0878f 100644 --- a/src/ballistica/base/logic/logic.cc +++ b/src/ballistica/base/logic/logic.cc @@ -143,7 +143,7 @@ void Logic::OnAppShutdown() { void Logic::ApplyAppConfig() { assert(g_base->InLogicThread()); - g_core->LifecycleLog("apply-app-config begin"); + g_core->LifecycleLog("apply-app-config"); // Give all our other subsystems a chance. // Note: keep these in the same order as OnAppStart. @@ -164,7 +164,6 @@ void Logic::ApplyAppConfig() { g_base->app->LogicThreadApplyAppConfig(); applied_app_config_ = true; - g_core->LifecycleLog("apply-app-config end"); } void Logic::OnInitialScreenCreated() { diff --git a/src/ballistica/core/core.cc b/src/ballistica/core/core.cc index 563fd7fc..ec6cf889 100644 --- a/src/ballistica/core/core.cc +++ b/src/ballistica/core/core.cc @@ -82,7 +82,9 @@ void CoreFeatureSet::PostInit() { || static_type_name_constexpr() == "class ballistica::core::CoreFeatureSet*" || static_type_name_constexpr() - == "CoreFeatureSet*"); + == "CoreFeatureSet*" + || static_type_name_constexpr() + == "core::CoreFeatureSet*"); Object::Ref testrunnable{}; static_assert( static_type_name_constexpr() @@ -100,6 +102,10 @@ void CoreFeatureSet::PostInit() { // it was parsed from. Use this to adjust the filtering as necessary so // the resulting type name matches what is expected. if (explicit_bool(false)) { + Log(LogLevel::kError, "static_type_name check; name is '" + + static_type_name() + + "' debug_full is '" + + static_type_name(true) + "'"); Log(LogLevel::kError, "static_type_name check; name is '" + static_type_name() + "' debug_full is '" diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 372b1ba3..c30e1fb3 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 = 21039; +const int kEngineBuildNumber = 21040; const char* kEngineVersion = "1.7.20"; auto MonolithicMain(const core::CoreConfig& core_config) -> int {