RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-04 22:43:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #361 from Dliwk/save-state-before-joining-public-party

Browse Source 
Save UI state before joining public party
This commit is contained in:
Eric Froemling 2022-02-09 18:12:12 -06:00 committed by GitHub
commit ca157384b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -11,7 +11,7 @@
### 1.6.6 (20394) ### 1.6.6 (20394)
- Beginning work on moving to new asset system. - Beginning work on moving to new asset system.
- Added Tamil language (Thanks Ryan!) - 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) ### 1.6.5 (20394)
- Added co-op support to server builds (thanks Dliwk!) - Added co-op support to server builds (thanks Dliwk!)
@ -22,8 +22,8 @@
### 1.6.4 (20382) ### 1.6.4 (20382)
- Some cleanups in the Favorites tab of the gather window. - 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). - 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. - 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. - 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. - Added network flood attack mitigation.
### 1.6.3 (20366) ### 1.6.3 (20366)

1
assets/src/ba_data/python/bastd/ui/gather/publictab.py
View File

@ -1209,6 +1209,7 @@ class PublicGatherTab(GatherTab):
def on_public_party_activate(self, party: PartyEntry) -> None: def on_public_party_activate(self, party: PartyEntry) -> None:
"""Called when a party is clicked or otherwise activated.""" """Called when a party is clicked or otherwise activated."""
self.save_state()
if party.queue is not None: if party.queue is not None:
from bastd.ui.partyqueue import PartyQueueWindow from bastd.ui.partyqueue import PartyQueueWindow
ba.playsound(ba.getsound('swish')) ba.playsound(ba.getsound('swish'))

2
ballisticacore-cmake/CMakeLists.txt
View File

@ -45,7 +45,7 @@ if (HEADLESS)
set(SDL2_LIBRARIES "SDL2::SDL2") set(SDL2_LIBRARIES "SDL2::SDL2")
endif () endif ()
# Getting complaint about space at the end of this on ubuntu16. # Getting complaint about space at the end of this on ubuntu16.
string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES) string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
else () else ()
message(FATAL_ERROR "SDL2 not found") message(FATAL_ERROR "SDL2 not found")
endif () endif ()