From d251aee0459bd2495460f2007fa478e17efc8d01 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Mon, 1 Mar 2021 13:26:47 -0600 Subject: [PATCH] Language updates --- .efrocachemap | 64 +++++++++---------- docs/ba_module.md | 2 +- src/ballistica/app/app.cc | 4 -- src/ballistica/app/app.h | 1 - src/ballistica/ballistica.cc | 2 +- src/ballistica/game/game.cc | 2 +- src/ballistica/platform/platform.cc | 6 +- .../python/methods/python_methods_system.cc | 2 +- 8 files changed, 40 insertions(+), 43 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 828fdacf..d9d547a3 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -420,7 +420,7 @@ "assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/a9/71/9286d55c45c37877f3267850f90b", "assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/2f/09/36e691de67eb8f155449a7170861", "assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/fd/a8/ad50785ce206e8dc3dcc7358b173", - "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/61/60/aa648c6eae00d4d85cd297683dfb", + "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/29/af/04afc95d95a712c79207291083ba", "assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/ac/3e/c50dc4e98df47f858c3a73ac4272", "assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/44/ed/5b972fa848cffb73723533c2ccb7", "assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/9d/63/d360eeff63bc64e098427498880d", @@ -437,19 +437,19 @@ "assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/51/31/64479524c0ee990b3e97ffdca068", "assets/build/ba_data/data/languages/hindi.json": "https://files.ballistica.net/cache/ba1/ed/98/37d9457755f7e86e2f2875e3b055", "assets/build/ba_data/data/languages/hungarian.json": "https://files.ballistica.net/cache/ba1/87/2d/027aa239eb66ea8f496562f4fd83", - "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/2e/ed/5a9aeb588a89432ded31c657c1e9", + "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/69/cf/4a1e297b73613fd1b87fed8d2565", "assets/build/ba_data/data/languages/italian.json": "https://files.ballistica.net/cache/ba1/fb/2b/4c875a40e176079dedaacf1362c7", "assets/build/ba_data/data/languages/korean.json": "https://files.ballistica.net/cache/ba1/0a/84/bbb6ed2abf66509406f534cbbb52", "assets/build/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/16/83/5a815f0e73dbac1d8cce337bff1b", "assets/build/ba_data/data/languages/polish.json": "https://files.ballistica.net/cache/ba1/cd/c1/82bf70c3ee4894791506f4da1a15", "assets/build/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/98/45/ddeb7e797c02fb967e0c8b0dff7d", "assets/build/ba_data/data/languages/romanian.json": "https://files.ballistica.net/cache/ba1/44/3c/7cc06ca8d5475e1687d0ed05bdbf", - "assets/build/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/a2/cc/b6ca6a841ec0e63562eb8b2fb83a", + "assets/build/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/ab/44/3d8b939f0c177cc46e8b0e4cae74", "assets/build/ba_data/data/languages/serbian.json": "https://files.ballistica.net/cache/ba1/e1/22/5471375791f8825a63e06371df29", "assets/build/ba_data/data/languages/slovak.json": "https://files.ballistica.net/cache/ba1/b7/0a/fab820b96e7aa587ee56427ecdc2", "assets/build/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/72/6a/55e4f8ce819d0c39ee6d86e8c6a0", "assets/build/ba_data/data/languages/swedish.json": "https://files.ballistica.net/cache/ba1/50/9f/be006ba19be6a69a57837eb6dca0", - "assets/build/ba_data/data/languages/turkish.json": "https://files.ballistica.net/cache/ba1/49/3e/6387412abc266c5c0d922bb81d02", + "assets/build/ba_data/data/languages/turkish.json": "https://files.ballistica.net/cache/ba1/5b/c4/2173bc10edea17ed3734f08a8c94", "assets/build/ba_data/data/languages/ukrainian.json": "https://files.ballistica.net/cache/ba1/3e/f3/4e9003c88e959d0d75a225c7a87e", "assets/build/ba_data/data/languages/venetian.json": "https://files.ballistica.net/cache/ba1/e4/3e/243eaa0237361b984fc6c56042be", "assets/build/ba_data/data/languages/vietnamese.json": "https://files.ballistica.net/cache/ba1/04/52/683a27aaf9aa7c63e7e595f80d08", @@ -3932,26 +3932,26 @@ "assets/build/windows/Win32/ucrtbased.dll": "https://files.ballistica.net/cache/ba1/b5/85/f8b6d0558ddb87267f34254b1450", "assets/build/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/1c/e1/4a1a2eddda2f4aebd5f8b64ab08e", "assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f", - "build/prefab/full/linux_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/f5/30/1c8c0d84ac72c90da573721cfe1f", - "build/prefab/full/linux_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/0c/29/b7b0f593eb1c85f13bf42e3472ce", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cb/d5/ba200a48c09fc908a389e640bfdb", - "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c5/ef/7e04882c10e3f759352e4edcec18", - "build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/ef/e7/552c82b0e1ac43f1d51173dd9519", - "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ec/45/b9b9b93279affd8c3b2908522280", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c8/be/fa926ff5b5b55c1947c5b53f817b", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ae/56/5494051ee690ef0c65a6a46f40c6", - "build/prefab/full/mac_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/85/1f/de45cf6f22452d798267d0daad2e", - "build/prefab/full/mac_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/56/75/4f22abbb61f13ea186df6b32b3af", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/6e/bb/1118b250ff27b34674ed478ecaf0", - "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/0a/d6/4c6dc7cc2e3a82967e6ae7861708", - "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/85/9e/627d4b02ae3acd6163a59f91fb3f", - "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/6b/54/63cbd9d3ef2c96a10454ee397002", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fb/94/a0090beb3a351319adfc35176f36", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d5/39/ac587f2dc1463cc8f9ecc8a69d28", - "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/e7/f6/76272159711251015d6200af98c7", - "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/bf/ff/9c9b4fafa3982c80b089f5a05984", - "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/00/94/c717d9d4e7ad92c7ad30d6e0477e", - "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/ac/f3/02758239ee9ce8bd691dba363025", + "build/prefab/full/linux_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/cf/82/719777140fd1fcde30bb1a1740bc", + "build/prefab/full/linux_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a3/64/87629d2373f5976ccbd8ab042e17", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f6/97/e2ceb20fbf9b383c6b6b7f9fad2b", + "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/22/b8/b74e35979b737971b408d2220e01", + "build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/fc/17/c93a61a777af2812ed4894d01371", + "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/5c/67/630bddbe7f8979a6856da80b4fbf", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a4/2e/4b65335326e2a08ede747767f28d", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/77/35/f1999ee15f81aea7eb3d4ee86430", + "build/prefab/full/mac_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/4d/97/62d0a5435d78e86ee1fa8f937e78", + "build/prefab/full/mac_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/36/18/7697e223720102efba3a64b4a9ef", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e4/41/5a26cffb3cbde32bf02bc891a581", + "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/76/9f/05fc591f4f7b2dd0dff70f464c68", + "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b2/3e/0b66052f122e3e562914ce07b8ff", + "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/cd/eb/6d9a103b9daca628dc9c1e2e6534", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/70/ec/7fe66dd2a1889f8134e986074c5c", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ab/a2/d7987bd4b498bb0ffe727687ec5d", + "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/c0/64/d1ff2ffc99457024ae4c9bd8ae27", + "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/09/be/01f2b6d88c29f93628f5c4b3be26", + "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/09/e8/e1a06b2a39b101d0d454b2ef97f9", + "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/a6/5e/83d42bcace65e1850ff8ca642d40", "build/prefab/lib/linux_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/4c/bf/393694ea67f3d590dd2706c9955e", "build/prefab/lib/linux_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/78/cb/bb9ae4f896f862074057c8e36e1d", "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ae/bd/39d7b885f7f01e81d0e96f0f85ce", @@ -3960,12 +3960,12 @@ "build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/52/d9/563a6949d2c4db5a915c54460fbc", "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d0/6a/42fe8d2e34f95e1b3282e8422344", "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/50/cf/bad44b07a4022aee3001002086b5", - "build/prefab/lib/mac_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/11/75/d6b507b0bf2221276b57d1b6bb8c", - "build/prefab/lib/mac_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/3d/d6/77958051be0b2d6b9df07edae905", - "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/66/30/38d5ad2a015fc680e050d119ec23", - "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/02/c5/c3b7ad88c987df2bea8754567342", - "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/30/8a/bbeaa60c53b14490fad2deeb27da", - "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/5a/6d/c931947a01c3e7a9da9251363d42", - "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/02/a1/e8badf04ff761d8dfad22d98e38c", - "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/bf/d2/d5be0ff30844c11db4047eb84263" + "build/prefab/lib/mac_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/71/eb/ad72e09d291df9d9b4685cb54aa6", + "build/prefab/lib/mac_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/7a/1a/26323a70df1141ded2d5232e7fe3", + "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f5/3a/fde17851c9eac36180af05764fbe", + "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/50/d6/eb53c0ce021de0a38796cc4381ca", + "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/96/2f/1cc42deb9241d5e3e0bb2a625652", + "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/01/64/d0498f46418fab5529631124ac4f", + "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/4e/05/6cae06d531c021fb58dd8ca3429a", + "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/04/03/ed60867a5c24beb140180c252b90" } \ No newline at end of file diff --git a/docs/ba_module.md b/docs/ba_module.md index 5336c9bd..64847c11 100644 --- a/docs/ba_module.md +++ b/docs/ba_module.md @@ -1,5 +1,5 @@ -

last updated on 2021-02-25 for Ballistica version 1.6.0 build 20309

+

last updated on 2021-02-27 for Ballistica version 1.6.0 build 20312

This page documents the Python classes and functions in the 'ba' module, which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please let me know. Happy modding!

diff --git a/src/ballistica/app/app.cc b/src/ballistica/app/app.cc index 8e87aaa4..98fc3d1f 100644 --- a/src/ballistica/app/app.cc +++ b/src/ballistica/app/app.cc @@ -46,10 +46,6 @@ auto App::UsesEventLoop() const -> bool { return !g_platform->IsEventPushMode(); } -void App::PushInterruptSignalSetupCall() { - g_platform->SetupInterruptHandling(); -} - void App::RunRenderUpkeepCycle() { // This should only be used in cases where the OS is handling the event loop. assert(!UsesEventLoop()); diff --git a/src/ballistica/app/app.h b/src/ballistica/app/app.h index 32d03482..bb9946da 100644 --- a/src/ballistica/app/app.h +++ b/src/ballistica/app/app.h @@ -124,7 +124,6 @@ class App : public Module { auto PushNetworkSetupCall(int port, int telnet_port, bool enable_telnet, const std::string& telnet_password) -> void; auto PushShutdownCompleteCall() -> void; - auto PushInterruptSignalSetupCall() -> void; private: auto UpdatePauseResume() -> void; diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc index fc681145..e7a98d77 100644 --- a/src/ballistica/ballistica.cc +++ b/src/ballistica/ballistica.cc @@ -21,7 +21,7 @@ namespace ballistica { // These are set automatically via script; don't change here. -const int kAppBuildNumber = 20312; +const int kAppBuildNumber = 20313; const char* kAppVersion = "1.6.0"; // Our standalone globals. diff --git a/src/ballistica/game/game.cc b/src/ballistica/game/game.cc index b3db38e6..ff245ac6 100644 --- a/src/ballistica/game/game.cc +++ b/src/ballistica/game/game.cc @@ -973,7 +973,7 @@ void Game::PushInterruptSignalCall() { } // Just go through _ba.quit() - // FIXME: Shouldn't need to go out to the python layer here... + // FIXME: Shouldn't need to go out to the Python layer here... g_python->obj(Python::ObjID::kQuitCall).Call(); }); } diff --git a/src/ballistica/platform/platform.cc b/src/ballistica/platform/platform.cc index d90cdb0f..bf0c8448 100644 --- a/src/ballistica/platform/platform.cc +++ b/src/ballistica/platform/platform.cc @@ -1340,8 +1340,10 @@ static void HandleSIGINT(int s) { #endif void Platform::SetupInterruptHandling() { - // For non-windows platforms, set up a handler for Ctrl-C. -#if !BA_OSTYPE_WINDOWS + // For non-windows platforms, set up posix-y SIGINT handling. +#if BA_OSTYPE_WINDOWS + throw Exception(); +#else struct sigaction handler {}; handler.sa_handler = HandleSIGINT; sigemptyset(&handler.sa_mask); diff --git a/src/ballistica/python/methods/python_methods_system.cc b/src/ballistica/python/methods/python_methods_system.cc index b3608db4..df6c0423 100644 --- a/src/ballistica/python/methods/python_methods_system.cc +++ b/src/ballistica/python/methods/python_methods_system.cc @@ -83,7 +83,7 @@ auto PySetUpSigInt(PyObject* self) -> PyObject* { BA_PYTHON_TRY; Platform::SetLastPyCall("set_up_sig_int"); if (g_app) { - g_app->PushInterruptSignalSetupCall(); + g_platform->SetupInterruptHandling(); } else { Log("SigInt handler called before g_app exists."); }