From bfe37d1789a542fc1c410364b172c6ea184d477e Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Fri, 22 Nov 2024 13:00:32 -0800 Subject: [PATCH] tidying --- .efrocachemap | 48 ++++++++++++++--------------- CHANGELOG.md | 2 +- src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/base/base.cc | 13 ++++---- src/ballistica/shared/ballistica.cc | 2 +- tools/batools/build.py | 2 +- tools/efro/logging.py | 2 +- 7 files changed, 36 insertions(+), 35 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 17968523..47faafcc 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4099,22 +4099,22 @@ "build/assets/windows/Win32/ucrtbased.dll": "bfd1180c269d3950b76f35a63655e9e1", "build/assets/windows/Win32/vc_redist.x86.exe": "15a5f1f876503885adbdf5b3989b3718", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "31d6ac3cce2b7d2a38555ad54e6f1b42", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "021d06fb3c8b2963306ebe0602b7c91b", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "41c85f9bdc2e042e502ce23c4faf082d", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "6b3e752d93ee5aa06a738c58f96e3e98", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "4928e07ec24903103f69cf25f1969dce", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "6a70b3e614c3fa0869af93c2620997b4", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "987153b6539715573fe87b8f6675366d", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "130bbcc6e253ea27d580bbec0da23ffb", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "d0ca3125ba2aa6933dc1ed74856e67e4", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "f582343e05c4316af68950f33d9189ea", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "cb8a142b86c07e3e19b27339f7760697", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "1e8480010c07972b2b97f8f0dd5a557e", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "a6201b97f6d36164843c12fb064e4e14", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "d999ef97283b39c844f848d6fa0f56ce", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "22aad71eb4295c6d9d0bf216014a78a7", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "b1f33f4492547b97b9f5f42b3be83524", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "a8fd259ae8c02279bccefa91d8fd6ac2", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "4619ac5fab8c69735cfaef25ea7c065d", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "fd511ea30c513dbc978d74e19e08b3e6", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "af18930837a84816ef1ebfd0039b9919", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "c804d217ad66edb7fd3a1ed04c41a1f3", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "3d7312a940aa00a568dd93b45184499d", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "d6b43f5a05e123ec2c72d2dd53b96960", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "7311c1fe4e092b3a9c92bcfba83a7c68", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "511c91b254492144c914f8bffdf1c460", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "fcd1e286bad46b9f31337303a5e4214c", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "145744ef2c59aea5a2a9f5f34e9e0cd9", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ad0bcff8515b525050b7ebe4b99dc6ab", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "6141ba22c8ed17d3fa4d57a442316060", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "5dfe81423ae63743ba04b1a4f2641f63", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "bfb48630550972e4a4d07d9379414eb9", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "6fcdaecfe23368a8305ffa80f3fec1d4", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "9d953b981a1ccf4623a6947ee9bafde7", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "b7d3fd701b31ec1b624606e1ca42e4bb", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "9d953b981a1ccf4623a6947ee9bafde7", @@ -4127,14 +4127,14 @@ "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "a2ebc84706ed89c1558f3171e985a959", "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "d0a989e1650ba8e19ac7f661355ca7cd", "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "a2ebc84706ed89c1558f3171e985a959", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "365ff249753d35076b02ae97b2aaa203", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "eb0ec0c8e8ea0f87a91980909252330f", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "b525d2fd7b406faf76846aae763c4c24", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "851b26948af977fc31285e5ebd443f6a", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "790cc46a5ad2478eb11148a3748db84a", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "7d70ea7fd9992b3f54372ce0126418c2", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "bdcedd07d700c15dda2f9cd616d50db3", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "4d79e3979dbe6c45eb7a2921a0a116bb", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "6c1f5c04ba6d0d8839575dc65e47f718", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "0a680dc69ece80160c3d945a63acf5bc", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "bcc195c916aa4dce47c99137c0bc257f", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "9baa944d32597cc3eae9fb8ba345ea73", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "0f9a3fb536ce1e1b486b9d0249e4efad", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "6c07f42a4e80471e904214490d6ec541", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "83eeefc24aad8efdfe9cbe6ed60edcc4", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "5ebc79bcce3728692b0a44066fe47f63", "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": "3a583e7e03bd4907b21adc3bf5729d15", diff --git a/CHANGELOG.md b/CHANGELOG.md index bd9c6b54..4342f325 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22106, api 9, 2024-11-22) +### 1.7.37 (build 22107, api 9, 2024-11-22) - 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. diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index bfb4a2d9..59102e33 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 = 22106 +TARGET_BALLISTICA_BUILD = 22107 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/ballistica/base/base.cc b/src/ballistica/base/base.cc index 7fa660e5..95fa14cf 100644 --- a/src/ballistica/base/base.cc +++ b/src/ballistica/base/base.cc @@ -206,11 +206,11 @@ void BaseFeatureSet::StartApp() { called_start_app_ = true; assert(!app_started_); // Shouldn't be possible. + LogVersionInfo_(); + g_core->Log(LogName::kBaLifecycle, LogLevel::kInfo, "start-app begin (main thread)"); - LogVersionInfo_(); - // The logic thread (or maybe other things) need to run Python as // we're bringing them up, so let it go for the duration of this call. // We'll explicitly grab it if/when we need it. @@ -424,13 +424,14 @@ void BaseFeatureSet::OnAppShutdownComplete() { void BaseFeatureSet::LogVersionInfo_() { char buffer[256]; if (g_buildconfig.headless_build()) { - snprintf(buffer, sizeof(buffer), "BallisticaKit Headless %s build %d.", - kEngineVersion, kEngineBuildNumber); + snprintf(buffer, sizeof(buffer), + "BallisticaKit Headless %s build %d starting...", kEngineVersion, + kEngineBuildNumber); } else { - snprintf(buffer, sizeof(buffer), "BallisticaKit %s build %d.", + snprintf(buffer, sizeof(buffer), "BallisticaKit %s build %d starting...", kEngineVersion, kEngineBuildNumber); } - g_core->Log(LogName::kBaLifecycle, LogLevel::kInfo, buffer); + g_core->Log(LogName::kBaApp, LogLevel::kInfo, buffer); } void BaseFeatureSet::set_app_mode(AppMode* mode) { diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index cdbead5b..5d8a4b0a 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 = 22106; +const int kEngineBuildNumber = 22107; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9; diff --git a/tools/batools/build.py b/tools/batools/build.py index a00b5642..a182da93 100644 --- a/tools/batools/build.py +++ b/tools/batools/build.py @@ -508,7 +508,7 @@ def _get_server_config_template_toml(projroot: str) -> str: cfg.team_colors = ((0.1, 0.25, 1.0), (1.0, 0.25, 0.2)) cfg.public_ipv4_address = '123.123.123.123' cfg.public_ipv6_address = '123A::A123:23A1:A312:12A3:A213:2A13' - cfg.log_levels = {'ba.lifecycle': 'DEBUG', 'ba.assets': 'INFO'} + cfg.log_levels = {'ba.lifecycle': 'INFO', 'ba.assets': 'INFO'} lines_in = _get_server_config_raw_contents(projroot).splitlines() diff --git a/tools/efro/logging.py b/tools/efro/logging.py index 189afa8b..1bd73e6c 100644 --- a/tools/efro/logging.py +++ b/tools/efro/logging.py @@ -380,7 +380,7 @@ class LogHandler(logging.Handler): ) preinfo = ( - f'{Clr.WHT}{timestamp} {record.name}{lvlnameex}:' + f'{Clr.WHT}{timestamp}{lvlnameex} {record.name}:' f'{Clr.RST} ' ) ends = LEVELNO_COLOR_CODES.get(record.levelno)