RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-26 08:53:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

version bump

Browse Source
This commit is contained in:
Eric 2023-06-22 16:00:31 -07:00
parent 5c1e7bdc03
commit 6f2ca8f8ff
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
7 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
.efrocachemap generated
View File

@ -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/07/55/10ea9a1adcfdb4c4ebd25f0987d2",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/21/c2/82a2534874952d02414c27da464d",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/3c/09/f02df7f6e14b4e279c5c15ce9e8f",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/5c/b8/7d9df91aced54177609952318fd1",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/fc/3f/5132bbde29bb067351e4b8ad3bd5",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/38/ea/e533314846e72b209c30e9c192dd",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/37/14/85b6a8634db761b8ec4f0415957e",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/cf/75/af0fdc5bb36f1e706f7764bbd447",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/8a/9e/26dbd737539be3f0e0595381dbfa",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/d5/df/a004541a0131d0d78f6825b44197",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/0a/71/f74f2f75e09e023dd79f8cceb78a",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/8e/00/75e15e754dfc0b53eec641ace81c",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/c5/3b/853370380a475df73bd4207c5117",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/28/18/0cc73904084e39de4557889f1182",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d2/00/3dfc67ddcaaa89e16ba4a369d917",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/da/ba/91635c3b2073e8465476a15e3f8b",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/3d/8e/fc1b272b6ad99e58a6a61db0bcbd",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/56/b7/e187bb10ec58754f732f3fa560ab",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/67/75/2a64557434715817a864237bc818",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/de/94/8d0d3ce7475dc140fad8aa2ca0a2",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/15/20/31664425072022ef253e0fc14651",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/c3/dc/06e1e925e2b2a43d20726acb6e3b",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/55/ba/15239525d648b88116c37fc70f88",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b7/b0/7be0f13aab3876b9211e0c964578",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/da/12/5a5129d364b0573bc627a993b5c0",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/fe/c9/cabea855ec8b0f9f18d1dab967b1",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/9a/9c/af408e9bb4c4338ad0732e86837f",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d1/9f/c4c832b0a8b824f6a48053b3b1c0",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/17/4f/c9f7c5fd352a8e74abacdf7ef183",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/75/d8/abe4a3a72e614ec80636c5e964e0",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/cf/4e/6095eb0ed566722a722c294dd6f6",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c9/ea/6723577d4ca9a4844ba0285cffc6",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ae/5a/2ac7f505f045e43de9a3d4701436",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/2b/88/c0bbfb1ac4689d627ad3cc73aa42",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d8/a3/d58ba87f8e00c3ab9ba83b911a59",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/17/2b/cf4430973934e7f46e2c9300fe0e",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/0a/73/253d1cf5334ee6883628653ce7f3",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/77/dc/c26814120100564b2bb609dbadf7",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/2e/6c/de54449b3ac5e757937e046b74ae",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/1f/0a/04a9e5d38eab527f73d800a22f7b",
"build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/be/19/b5458933dfc7371d91ecfcd2e06f",
"build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/4e/48/123b806cbe6ddb3d9a8368bbb4f8",
"build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/be/19/b5458933dfc7371d91ecfcd2e06f",
@ -4108,14 +4108,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/7e/fa/291fd7e935502ced7e99b8c8f7f0",
"build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/e1/cb/7e8440699e59e8646da25aa5782b",
"build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/7e/fa/291fd7e935502ced7e99b8c8f7f0",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/a7/f1/c086f496db5f53c54419af0ee050",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/07/fb/1028bc12960010933a8a978503e2",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/a5/7a/711872172a8a0b1e3e6b083d3382",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/83/f5/7cee29a6bb1b9402d75acd30734a",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/07/fe/f479b46b26c7bc8442ea44b18268",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/98/41/8d38cd8ed2f92e4622ef97f59826",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/e3/44/9d3b76b4e903b333356d0ea793b3",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/56/39/81063f4c5beef8929ea4e1ebaab8",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/1d/8d/d01ccda454ea16adbb262f23e90e",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/2d/73/46264206f210eeda9e94249316c4",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/d6/67/412ded16ff0ef1b2fc0ee7b4f211",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/bd/4f/b80edc03236420b4f8b32ed50d40",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/f9/e7/3ffb70fa73036ed695b71e2e1d2e",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/d7/e2/2d88e9d5d5d6f487ce1e0a69e64d",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/2d/5b/c0af89d8398542765a084c5bb258",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/99/a7/09d5b2990db22d1c8874c7bb1883",
"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",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.20 (build 21140, api 8, 2023-06-22)
### 1.7.21 (build 21142, api 8, 2023-06-22)
- 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

4
src/assets/ba_data/python/baenv.py
View File

@ -28,8 +28,8 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be
# using.
TARGET_BALLISTICA_BUILD = 21140
TARGET_BALLISTICA_VERSION = '1.7.20'
TARGET_BALLISTICA_BUILD = 21142
TARGET_BALLISTICA_VERSION = '1.7.21'
_g_env_config: EnvConfig | None = None
g_paths_set_failed = False # pylint: disable=invalid-name

1
src/ballistica/base/base.cc
View File

@ -193,6 +193,7 @@ void BaseFeatureSet::StartApp() {
python->OnMainThreadStartApp();
g_core->LifecycleLog("will call logic on-main-thread");
logic->OnMainThreadStartApp();
g_core->LifecycleLog("will call graphics-server on-main-thread");
graphics_server->OnMainThreadStartApp();
if (bg_dynamics_server) {
bg_dynamics_server->OnMainThreadStartApp();

2
src/ballistica/base/logic/logic.cc
View File

@ -25,6 +25,8 @@ Logic::Logic() : display_timers_(new TimerList()) {
}
void Logic::OnMainThreadStartApp() {
g_core->LifecycleLog("will create logic loop");
event_loop_ = new EventLoop(EventLoopID::kLogic);
g_core->pausable_event_loops.push_back(event_loop_);

4
src/ballistica/shared/ballistica.cc
View File

@ -39,8 +39,8 @@ auto main(int argc, char** argv) -> int {
namespace ballistica {
// These are set automatically via script; don't modify them here.
const int kEngineBuildNumber = 21140;
const char* kEngineVersion = "1.7.20";
const int kEngineBuildNumber = 21142;
const char* kEngineVersion = "1.7.21";
auto MonolithicMain(const core::CoreConfig& core_config) -> int {
// This code is meant to be run standalone so won't inherit any

7
src/ballistica/shared/foundation/event_loop.cc
View File

@ -76,9 +76,16 @@ EventLoop::EventLoop(EventLoopID identifier_in, ThreadSource source)
// Block until the thread is bootstrapped.
// (maybe not necessary, but let's be cautious in case we'd
// try to use things like thread_id before they're known).
if (identifier_ == EventLoopID::kLogic) {
g_core->LifecycleLog("logic thread bootstrap wait begin");
}
std::unique_lock lock(client_listener_mutex_);
client_listener_cv_.wait(lock, [this] { return bootstrapped_; });
if (identifier_ == EventLoopID::kLogic) {
g_core->LifecycleLog("logic thread bootstrap wait end");
}
break;
}
case ThreadSource::kWrapMain: {