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

fixed newlines on in-game console and telnet server

Browse Source
This commit is contained in:
Eric 2022-09-14 22:45:13 -07:00
parent 0b3d7cf050
commit bc59182f80
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
5 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.efrocachemap
View File

@ -3995,26 +3995,26 @@
"assets/src/ba_data/python/ba/_generated/__init__.py": "https://files.ballistica.net/cache/ba1/ee/e8/cad05aa531c7faf7ff7b96db7f6e",
"assets/src/ba_data/python/ba/_generated/enums.py": "https://files.ballistica.net/cache/ba1/b2/e5/0ee0561e16257a32830645239f34",
"ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a",
"build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/34/36/b7e573a9a6b965704b446edaf270",
"build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/89/e0/aa1132c8838e258b6fe7160901e6",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ee/dc/3e11cdd2e2582df97a9abe964e6e",
"build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/28/54/05136c2cb44815be5d467092b159",
"build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/34/c2/95a381f9e57a0dc4a4db34b26737",
"build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/7a/ee/a17e66b1d6255b6f539fd4a1794d",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/14/ca/622aa9e27be7f2d236fae7773091",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/01/c1/7b43251bd79bdd8309c07e64aea9",
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/13/54/d43d5724319f11fad667d898f862",
"build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/11/79/6e131fb779bdf84778ba389a60f2",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/24/b6/376347babaea50ecd1186c080242",
"build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/bf/e7/ef1bc6bde1d21020c04468843da7",
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/7d/82/fced4505052ba865c054d5656f48",
"build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/51/39/5cefbde594790b158b91dea2fa44",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/87/97/d9c0ef694aa785456c3a9a2b0136",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/33/17/13cf59c8b62af438aea026bf95af",
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/84/c3/406dc31fc5f083d0bafec4d49143",
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/85/5d/cb2f03fe912763ea021be6962c1e",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/ff/d1/aca4359f0dfafaf47c41a7444a72",
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/e1/31/ef46f2a9b3883ef32742579ff893",
"build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a5/a8/9d3491007df68a350cbde1416c19",
"build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/cf/46/edc440b82d790bfaf6442655fb00",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/19/54/871a764ff37f2403394b64f6c67c",
"build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/5c/29/aa06b7aab528b711d6f36df7e7fe",
"build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/c0/24/d15917e364ed6d828c365146bd77",
"build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/78/0c/3f455338341af8e01f386064f46a",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/07/a5/18ea8943f2cd24956003a966459f",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/db/09/ab3381c7f3379ce1236863bdd59d",
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b1/8c/fd9dc45ba9d875f7831d071a0caf",
"build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/16/b7/c3dc3b169eac2f903ef30ed1cad5",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/19/0a/0cc50f509eee00a19976d3729290",
"build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d8/37/4e73e8e866c6152a0dfcb0f71ec8",
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/c4/3d/612c9aa69aab61b0a8422fe3b5e2",
"build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/6c/ff/e6e882a7675d7e4466d0ba429180",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/1e/d8/c29cb8b89ea52683859e72c98786",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a6/e7/02ef6d8e0a808c9f69544c25db09",
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/d3/44/210d37b4577a1fd4fc4ca63913ca",
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/29/d7/6cb90c1c86b2a466020e8c11d3fc",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/25/22/d3ceba9f8502a410c25665f7b0ae",
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/17/4e/3c1b5f065732a4aa8d6f4bc71589",
"build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d5/f6/d62e6e6d5e7fe1945f08ccbb9a8f",
"build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/02/c5/44d0082442b06153a7d7dce4c8ce",
"build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d0/00/61378fb26ddcbf023fd3c40e4ffb",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.7 (build 20853, api 7, 2022-09-14)
### 1.7.7 (build 20855, api 7, 2022-09-14)
- Added `ba.app.meta.load_exported_classes()` for loading classes discovered by the meta subsystem cleanly in a background thread.
- Improved logging of missing playlist game types.
- Some ba.Lstr functionality can now be used in background threads.

2
assets/src/ba_data/python/ba/_bootstrap.py
View File

@ -43,7 +43,7 @@ def bootstrap() -> None:
# Give a soft warning if we're being used with a different binary
# version than we expect.
expected_build = 20853
expected_build = 20855
running_build: int = env['build_number']
if running_build != expected_build:
print(

2
src/ballistica/ballistica.cc
View File

@ -32,7 +32,7 @@
namespace ballistica {
// These are set automatically via script; don't modify them here.
const int kAppBuildNumber = 20853;
const int kAppBuildNumber = 20855;
const char* kAppVersion = "1.7.7";
// Our standalone globals.

6
src/ballistica/core/logging.cc
View File

@ -34,10 +34,12 @@ auto Logging::Log(LogLevel level, const std::string& msg) -> void {
auto Logging::DisplayLog(const std::string& name, LogLevel level,
const std::string& msg) -> void {
auto msgnewline{msg + "\n"};
// Print to in-game console.
{
if (g_logic != nullptr) {
g_logic->PushConsolePrintCall(msg);
g_logic->PushConsolePrintCall(msgnewline);
} else {
if (g_platform != nullptr) {
g_platform->DisplayLog("root", LogLevel::kWarning,
@ -49,7 +51,7 @@ auto Logging::DisplayLog(const std::string& name, LogLevel level,
// Print to any telnet clients.
if (g_app && g_app->telnet_server) {
g_app->telnet_server->PushPrint(msg);
g_app->telnet_server->PushPrint(msgnewline);
}
// Ship to platform-specific display mechanisms (android log, etc).