From 449fc296d573c07e29a462746c812b2fbee66c71 Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Mon, 7 Feb 2022 16:47:37 +0300 Subject: [PATCH 1/3] save state before join public server --- assets/src/ba_data/python/bastd/ui/gather/publictab.py | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/src/ba_data/python/bastd/ui/gather/publictab.py b/assets/src/ba_data/python/bastd/ui/gather/publictab.py index b2c1b647..2edb9954 100644 --- a/assets/src/ba_data/python/bastd/ui/gather/publictab.py +++ b/assets/src/ba_data/python/bastd/ui/gather/publictab.py @@ -1209,6 +1209,7 @@ class PublicGatherTab(GatherTab): def on_public_party_activate(self, party: PartyEntry) -> None: """Called when a party is clicked or otherwise activated.""" + self.save_state() if party.queue is not None: from bastd.ui.partyqueue import PartyQueueWindow ba.playsound(ba.getsound('swish')) From 708490c0b1b495d06f85a1f803fef6be2d4c973f Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Mon, 7 Feb 2022 16:47:58 +0300 Subject: [PATCH 2/3] quote SDL2_LIBRARIES --- ballisticacore-cmake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballisticacore-cmake/CMakeLists.txt b/ballisticacore-cmake/CMakeLists.txt index a07148f2..64d88864 100644 --- a/ballisticacore-cmake/CMakeLists.txt +++ b/ballisticacore-cmake/CMakeLists.txt @@ -45,7 +45,7 @@ if (HEADLESS) set(SDL2_LIBRARIES "SDL2::SDL2") endif () # Getting complaint about space at the end of this on ubuntu16. - string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES) + string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) else () message(FATAL_ERROR "SDL2 not found") endif () From 62bb69a4ef54b0032495636a5bcc73fdf250ea90 Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Mon, 7 Feb 2022 17:56:07 +0300 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ed83c21..7b237610 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ ### 1.6.6 (20394) - Beginning work on moving to new asset system. - Added Tamil language (Thanks Ryan!) -- Added methods for changing camera attributes to the _ba module. +- Added methods for changing camera attributes to the `_ba` module. ### 1.6.5 (20394) - Added co-op support to server builds (thanks Dliwk!) @@ -19,8 +19,8 @@ ### 1.6.4 (20382) - Some cleanups in the Favorites tab of the gather window. - Reorganized prefab target names; some targets such as `prefab-debug` are now `prefab-gui-debug` (more consistent with the existing `prefab-server-debug` targets). -- Windows builds now go to build/windows instead of ballisticacore_windows/build. -- Lots of project reorganization to allow things such as documentation or the dummy _ba.py module to be rebuilt from the public repo. +- Windows builds now go to build/windows instead of `ballisticacore_windows/build`. +- Lots of project reorganization to allow things such as documentation or the dummy `_ba.py` module to be rebuilt from the public repo. - Added network flood attack mitigation. ### 1.6.3 (20366)