From f06a380758f255c33b4eb659d6f694e8c3cc5d02 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Sat, 4 Jun 2022 15:58:06 -0700 Subject: [PATCH] chatmessage fix and initial 1.7.2 stuff --- .efrocachemap | 40 +++++++++---------- .idea/dictionaries/ericf.xml | 2 + CHANGELOG.md | 7 +++- assets/src/ba_data/python/._ba_sources_hash | 2 +- .../.idea/dictionaries/ericf.xml | 2 + src/ballistica/ballistica.cc | 4 +- .../python/methods/python_methods_ui.cc | 3 +- 7 files changed, 35 insertions(+), 25 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 3241abda..424d5f0f 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3992,26 +3992,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/35/3a/7154f1d68cbbf6385a5bd30ee9c7", - "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/5e/de/942f9b29988507e7eed6560d1c36", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c8/eb/bd36b8642913a175e941d6fd677b", - "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c2/db/3ad5a5d3cf39c13070c7417c1ea8", - "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/26/d2/45de55656879d6076f44c658fbef", - "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d3/64/4207002a29c983786854acf6b3f6", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/5c/d4/792a3d1333fdcba06c98c29c38aa", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/46/96/569942db74df7015de7e1057c659", - "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/5e/aa/96a5631cb56588985b6292b14888", - "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/75/52/f82f426ab6a220e4e837996b27b0", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/90/d8/f530458f0fa28a9ada1bb41f9cc1", - "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/6f/35/34d6ae79b4e3f4e392886ea608e9", - "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/cf/d2/2f21aed70201c803dad373259820", - "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/f2/9e/60649024d1a108229328a24aa06a", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/5e/b0/b74f311577abc35e3f53c808ebe2", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/33/a5/29dc1fa65253e06e4bb12ef2d91b", - "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/0d/91/e3f975ebcfba3e905603efb9d42c", - "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/0d/1c/fd94d469dcaa490ed94d0100be31", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/69/45/9cb5dd1bd2f3789d1277de2e13fe", - "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/8a/f8/1d87b32ffc6b352d8a51a826e612", + "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/4c/b2/39ef64da4f7d8fc6d6596fb1e6dd", + "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/69/f1/997d1e46cf9980fb05feac2f65bb", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/78/bd/c4363c8c7c2d137d8c15cff3e5ce", + "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/69/54/8c36c9f32e980c4a3d6c80fda174", + "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/99/91/0d31e626b752c571f70ebc63e25b", + "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ff/f7/0facf2edf5ee9ab72c4e894b1447", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/de/0f/1b3a4005489b88691bd230a74fde", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/49/de/1e62f4ef48ec29137da3280af2a4", + "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/94/21/e4643feb7b1a48104f843a5e7854", + "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/78/05/4e0de3d43eeca0b28003eda577e5", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e3/8c/c7db00bae865aa1b10d84759c0eb", + "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/67/a8/fc2e5f4bea3a80c260eed10b6271", + "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/fb/b5/93d7341a88da72392aca672345f2", + "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/33/f8/6a9b956c05c6cd1ddcd67a0eb2ef", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/bc/57/a08863dd0e2bbacd83bf5a51440b", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a1/93/aa05d62af22a8977f9c1b77d4fbe", + "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/57/d8/3b58524fbfb11dd5becd588dae21", + "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/f6/42/2cd490281e940abfff7d96cbee53", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/7c/16/4a4f18656e5923e23cc5fb178be1", + "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/b5/ef/95c87dc189bbdf281934e8062394", "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/72/9d/7041244c1532e8739f4144a0dbdb", "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f9/d3/43568f3cfbf7b9e1f1c0a80d3cbb", "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/1d/d7/9508dda5f67d8120159fc27e5aa6", diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml index 89e77043..28df2c75 100644 --- a/.idea/dictionaries/ericf.xml +++ b/.idea/dictionaries/ericf.xml @@ -1146,6 +1146,7 @@ imagestacklayer imagewidget imaplib + imayushsaini imgdelay imgh imghdr @@ -1469,6 +1470,7 @@ megalint memfunctions menubar + meryu messagetype metallink metamakefile diff --git a/CHANGELOG.md b/CHANGELOG.md index 2406e0b6..0899a113 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ +### 1.7.2 (20600, 2022-06-04) +- Minor fixes in some minigames (Thanks Droopy!) +- Fixed a bug preventing 'clients' arg from working in _ba.chatmessage (Thanks imayushsaini!) +- Fixed a bug where ba.Player.getdelegate(doraise=True) could return None instead of raising a ba.DelegateNotFoundError (thanks Dliwk!) +- Lots of Romanian language improvements (Thanks Meryu!) + ### 1.7.1 (20597, 2022-06-04) - V2 account logic fixes - Polishing V2 web-based login flow -- Minor fixes in some minigames (Thanks Droopy!) ### 1.7.0 (20591, 2022-06-02) - V2 accounts are now available (woohoo!). These are called 'BombSquad Accounts' in the account section. V2 accounts communicate with a completely new server and will be the foundation for lots of new functionality in the future. However they also function as a V1 account so existing functionality should still work. Note that the new 'workspaces' feature for V2-accounts is not yet enabled in this build, but it will be in the next few builds. Also note that account types such as GameCenter and Google-Play will be 'upgraded' to V2 accounts in the future so there is no need to try this out if you use one of those. But if you use device-accounts you might want to create yourself a V2 account, since device-accounts will remain V1-only (though you can link an old device-account to a v2-enabled account if you want to keep your progress). Getting a V2 account now also gives you a chance to reserve a nice account-tag before all the good ones are taken. diff --git a/assets/src/ba_data/python/._ba_sources_hash b/assets/src/ba_data/python/._ba_sources_hash index 336728d7..3a4d43a3 100644 --- a/assets/src/ba_data/python/._ba_sources_hash +++ b/assets/src/ba_data/python/._ba_sources_hash @@ -1 +1 @@ -234583871401016050573124413381187163584 \ No newline at end of file +217115660358712006436605949517410465969 \ No newline at end of file diff --git a/ballisticacore-cmake/.idea/dictionaries/ericf.xml b/ballisticacore-cmake/.idea/dictionaries/ericf.xml index d646fe84..4da7fa62 100644 --- a/ballisticacore-cmake/.idea/dictionaries/ericf.xml +++ b/ballisticacore-cmake/.idea/dictionaries/ericf.xml @@ -582,6 +582,7 @@ illum ilock imagewidget + imayushsaini importlines incentivized indata @@ -734,6 +735,7 @@ memalign memchr memcpy + meryu meshdata messagebox messagetype diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc index 9a8f5181..def93ec6 100644 --- a/src/ballistica/ballistica.cc +++ b/src/ballistica/ballistica.cc @@ -21,8 +21,8 @@ namespace ballistica { // These are set automatically via script; don't modify them here. -const int kAppBuildNumber = 20597; -const char* kAppVersion = "1.7.1"; +const int kAppBuildNumber = 20600; +const char* kAppVersion = "1.7.2"; // Our standalone globals. // These are separated out for easy access. diff --git a/src/ballistica/python/methods/python_methods_ui.cc b/src/ballistica/python/methods/python_methods_ui.cc index f00343d2..7712a52b 100644 --- a/src/ballistica/python/methods/python_methods_ui.cc +++ b/src/ballistica/python/methods/python_methods_ui.cc @@ -2039,6 +2039,7 @@ auto PyChatMessage(PyObject* self, PyObject* args, PyObject* keywds) PyObject* sender_override_obj = Py_None; std::string sender_override; const std::string* sender_override_p{}; + std::vector clients; std::vector* clients_p{}; static const char* kwlist[] = {"message", "clients", "sender_override", @@ -2055,7 +2056,7 @@ auto PyChatMessage(PyObject* self, PyObject* args, PyObject* keywds) } if (clients_obj != Py_None) { - std::vector clients = Python::GetPyInts(clients_obj); + clients = Python::GetPyInts(clients_obj); clients_p = &clients; } g_game->connections()->SendChatMessage(message, clients_p, sender_override_p);