diff --git a/.efrocachemap b/.efrocachemap index d1c85744..f43654bb 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4072,26 +4072,26 @@ "build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/7f/b0/d7426f678c1fee642855e391f1b9", "build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/21/26/7a4f7252ef70fdb86c734acacc42", "build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/53/0b/df2f7aaaf3cf4d9578c2bc5d4ad9", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/20/89/46c89da9adf1e1ec6928b8a68c1b", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/d9/a3/4cbb63acae25be6b7491f0f25cea", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/51/9e/ee206a64930f99d3ea524489fbec", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/4f/23/d629858f1883e04f2dcade7beddb", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/a9/44/470572d4e8feca17ae3b11138e83", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/7a/66/601d3687a215a1cdfa9295783039", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c9/96/90513f943a203befb42d6cb5d6ea", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/dc/ab/128bcd29709e63413bba49433294", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/25/0b/8d6e24a7765a39917dbd3dcaa2c4", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/fc/6c/20e1c02863da7156392b97d65cbb", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/8a/1b/8717e8d7e6a687d49a9a97432bba", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/cd/96/996309bf44df4bd8260d6ca6b38a", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/4a/a0/7b8b1fa55933cf842e3f26330ebd", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/fe/99/cbfe50067337a90266bbc7041ef5", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/eb/85/377c47f51a123d46a41d161f42f7", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ac/2e/6ef743fe72e01d45d5440af9a529", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/61/60/29ab0e2137b45322a1af2aa87e49", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/fe/4b/436bfaa5f5d43eb0d4ca0c58eccc", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/7e/0e/aef70e16a90c9669e8586dd8b13f", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/f5/72/b1a3d1858a74d844642483845325", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ea/15/797a4014928f1831fc754c4a731e", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/3f/c6/9e4f6e9c69e7db138991189390b0", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/30/93/5f2376a0f91828337a74092ba296", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e3/e3/4a8f6c0d814d9982759ac9b85b84", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/19/e6/d1bbf315e9f070fc7f5aab3cc408", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/1a/b6/9196bf7553c8380ddd37c8aba83f", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/24/56/34bbdafa6ed8d8505fa50b40e10a", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/0c/9b/6dbedf9c32a5591fbc0724a7b050", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/7f/5c/e76c46dbf6405298c04d5d76a254", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/16/3e/5a02a80c844ea71c3ce1f229ff25", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/37/05/bae4f69c549764238b06c9083214", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c3/d0/4fc44285b21e6b3dc4d9b3c30a28", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/37/4f/bc7e504838a5691e928977c3479f", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/a5/5f/1c69d9dab37d811da0cdde48d09f", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/30/f5/82ec511ed3a2f96fb91b89e73464", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b8/3b/b2f787a50ed7a2271b0c65f0ab3e", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/49/5b/14ecf8ecd2bcfe789da5c70d0535", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/c7/8b/6c8d8d2af28adb80192f266fe682", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/08/8b/129ca92c135796fd8abfd7353953", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/39/9b/f81ca02ace3dcbc5c3838c859a4c", "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/8a/39/82acd22444cdde966df4838b3235", "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/82/23/3da9e812f6d9d83e9c4678645792", "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/8a/39/82acd22444cdde966df4838b3235", @@ -4108,14 +4108,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/2b/1d/067ca5d1bc54339f2b8682ef1aed", "build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/65/49/cdbaca8ea343d79992618514438c", "build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/2b/1d/067ca5d1bc54339f2b8682ef1aed", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/73/9f/50466e17d044b4cd6da6e0dd610f", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/46/63/085d9d8496290a996721b0185a1e", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/37/bd/0df0e27deb695a1a6af2841ab18e", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/67/90/92c58874800469b14cdb8514b423", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/97/73/a5aef2dba917b34b6b2bc82733e9", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/df/d2/6950b10723420d9e2f1c512a0e07", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/a6/5a/b123237539e57c9e68f5b36a22bd", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/3b/81/cbf61791b0fab0ec541b4a7df703", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/cb/95/775c7f0e22358331958cb78d8314", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/69/37/3d76aa863c941f419af93ad1829e", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/82/ef/41673a5c02236cc11c1f4f8350fb", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/99/a5/348f2f2a413be98ee368a0561708", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/ad/9b/a895e163036f1ee37259c131afcd", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/6e/4b/e14ae214177713878fc34879220f", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/91/ee/e4663ce72ae13a695b57a9ad38c9", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/34/ad/150df6dca4b7277b9817e954ecd8", "src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/f8/85/fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/48/4b/e6974f0a4d14be8213dc00d971c3", "src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/3e/7a/203e2a5d2b5bb42cfe3fd2fe16c2", diff --git a/CHANGELOG.md b/CHANGELOG.md index d2ce180f..a546a761 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.20 (build 21129, api 8, 2023-06-19) +### 1.7.20 (build 21130, api 8, 2023-06-19) - 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 @@ -368,6 +368,9 @@ build/spinofftest/base`, you should be able to do `make cmake` from that spinoff project and get a running app (though it will be just a blank window). But the app at that point *is* 100% open source; woohoo! +- (build 20129) Fixed an issue where server builds would not build font assets + (though it would install them if any recent gui builds had built them) which + could lead to obscure crashing. ### 1.7.19 (build 20997, api 7, 2023-01-19) diff --git a/src/assets/Makefile b/src/assets/Makefile index 78752b33..89b69043 100644 --- a/src/assets/Makefile +++ b/src/assets/Makefile @@ -95,6 +95,7 @@ endif # FontData. ifeq ($(MAKE_FONTS),1) ASSET_TARGETS_COMMON_GUI += $(FONT_TARGETS) +ASSET_TARGETS_COMMON_SERVER += $(FONT_TARGETS) endif # Data. diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 19e579e4..9e14e355 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -28,7 +28,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21129 +TARGET_BALLISTICA_BUILD = 21130 TARGET_BALLISTICA_VERSION = '1.7.20' _g_env_config: EnvConfig | None = None diff --git a/src/ballistica/base/base.cc b/src/ballistica/base/base.cc index d51e9549..fdb60d27 100644 --- a/src/ballistica/base/base.cc +++ b/src/ballistica/base/base.cc @@ -147,15 +147,19 @@ auto BaseFeatureSet::IsBaseCompletelyImported() -> bool { return base_import_completed_ && base_native_import_completed_; } -void BaseFeatureSet::OnScreenAndAssetsReady() { +void BaseFeatureSet::OnAssetsAvailable() { assert(InLogicThread()); assert(console_ == nullptr); - console_ = new Console(); - // Print any messages that have built up. - if (!console_startup_messages_.empty()) { - console_->Print(console_startup_messages_); - console_startup_messages_.clear(); + // Spin up the in-app console. + if (!g_core->HeadlessMode()) { + console_ = new Console(); + + // Print any messages that have built up. + if (!console_startup_messages_.empty()) { + console_->Print(console_startup_messages_); + console_startup_messages_.clear(); + } } } diff --git a/src/ballistica/base/base.h b/src/ballistica/base/base.h index 1036c9f0..b9f61095 100644 --- a/src/ballistica/base/base.h +++ b/src/ballistica/base/base.h @@ -689,7 +689,7 @@ class BaseFeatureSet : public FeatureSetNativeComponent, void OnReachedEndOfBaBaseImport(); /// Called in the logic thread once our screen is up and assets are loading. - void OnScreenAndAssetsReady(); + void OnAssetsAvailable(); // Const subsystems. App* const app; diff --git a/src/ballistica/base/logic/logic.cc b/src/ballistica/base/logic/logic.cc index aea5efad..66d43ac0 100644 --- a/src/ballistica/base/logic/logic.cc +++ b/src/ballistica/base/logic/logic.cc @@ -206,7 +206,7 @@ void Logic::CompleteAppBootstrapping() { g_base->assets->StartLoading(); // Let base know it can create the console or other asset-dependent things. - g_base->OnScreenAndAssetsReady(); + g_base->OnAssetsAvailable(); // Set up our timers. process_pending_work_timer_ = event_loop()->NewTimer( diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 1be24656..ba10934e 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 = 21129; +const int kEngineBuildNumber = 21130; const char* kEngineVersion = "1.7.20"; auto MonolithicMain(const core::CoreConfig& core_config) -> int {