RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-05 23:13:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved public party list display when not signed in

Browse Source
This commit is contained in:
Eric Froemling 2020-11-08 14:17:57 -08:00
parent f322d26f1d
commit 62e473e7bc
6 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.efrocachemap
View File

@ -3932,24 +3932,24 @@
"assets/build/windows/Win32/ucrtbased.dll": "https://files.ballistica.net/cache/ba1/b5/85/f8b6d0558ddb87267f34254b1450", "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/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", "assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f",
"build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/29/b1/c308e875cd5b359663b18aec08fd", "build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/69/ba/e8830d9b8f8f168b74839e350218",
"build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/0f/bf/26ff4a6220cca315f56ea2662b54", "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/11/8c/8a2b2d5d50fa3a89680178639889",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b5/9e/a2d7b1d79901d26ddad8eec05b1e", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/1e/f8/e9812a6c731eb2be3693ab2f5bb6",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d0/1b/ce44415ac011c0e9b1e82859f819", "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/88/31/e41a319be49560b4bfe3610c79ce",
"build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/86/d9/f349c44c6e427286955c96476494", "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/93/42/7fe40fcab72bfea7502c8e692c1e",
"build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/dd/c8/dda21973e67ef783dc9cd0db50e9", "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/99/2c/03ee94c2b0b9cfb1b8c095ba007b",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/44/e0/59258f931c957c56f55e3decf4f3", "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/aa/c0/891963ac51cdcdeae54c24eb3760",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/72/af/a6aba7f9814a2275aaedd62db400", "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2e/6e/62e68b315e13789dde712f7569e6",
"build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/37/74/063905e73b0010955b2fece4a5c1", "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/f4/f2/4f3bfa11a24a15de1ea2813f4e6b",
"build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/1b/cb/d3014ee4022bb94bd812acaf523a", "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/b7/9f/a807ab1bc579bd9f4d0e21e1aa5d",
"build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/56/41/76207700c329e553fe4233561b56", "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/d8/2f/1e308b812e485215f88e2f27d22c",
"build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/f9/d4/874ce156c97006398f69659e6254", "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/27/66/91b54de2a3c9a00bc4b045a59fa4",
"build/prefab/lib/linux_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c3/d7/627d518a92951cf7fe9fc0b9b3a0", "build/prefab/lib/linux_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c3/d7/627d518a92951cf7fe9fc0b9b3a0",
"build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/de/49/2cfc34ac856737d903954db5571b", "build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/de/49/2cfc34ac856737d903954db5571b",
"build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e8/9a/67cf9ece361ca2f5d338009bdbfc", "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e8/9a/67cf9ece361ca2f5d338009bdbfc",
"build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/86/de/7d9c9a2b7bba34c630130ed759c9", "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/86/de/7d9c9a2b7bba34c630130ed759c9",
"build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/58/c1/9fda2c0e06885b6ff77c9b5ca41b", "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d1/c3/1556852cab467d5d57c471960caf",
"build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/30/be/e74823826245eb6431672cba814e", "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/68/32/7123695e4ee44aed16bd6adcb677",
"build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/3d/d0/b4519d65e4b69c337a814805e643", "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/cf/cd/577e1083c8076af177d660114bb6",
"build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/59/26/1aaa21a09e7a2f0eeea2fe92cd5f" "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/46/e2/f299370b002e227228d2df75fc73"
} }

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
### 1.5.28 (20239) ### 1.5.28 (20239)
- Simplified ba.enum_by_value() - Simplified ba.enum_by_value()
- Updated Google Play version to hopefully show friend high scores again on score screens. - Updated Google Play version to hopefully show friend high scores again on score screens.
- Public-party-list now properly shows an error instead of 'loading...' when not signed in.
### 1.5.27 (20238) ### 1.5.27 (20238)
- Language functionality has been consolidated into a LanguageSubsystem object at ba.app.lang - Language functionality has been consolidated into a LanguageSubsystem object at ba.app.lang

22
assets/src/ba_data/python/ba/_app.py
View File

@ -54,7 +54,6 @@ class App:
@property @property
def user_agent_string(self) -> str: def user_agent_string(self) -> str:
"""String containing various bits of info about OS/device/etc.""" """String containing various bits of info about OS/device/etc."""
# return self._user_agent_string
assert isinstance(self._env['user_agent_string'], str) assert isinstance(self._env['user_agent_string'], str)
return self._env['user_agent_string'] return self._env['user_agent_string']
@ -341,17 +340,20 @@ class App:
server_addr = _ba.get_master_server_address() server_addr = _ba.get_master_server_address()
if 'localhost' in server_addr: if 'localhost' in server_addr:
_ba.timer(2.0, _ba.timer(2.0,
lambda: _ba.screenmessage('Note: using local server', lambda: _ba.screenmessage(
(1, 1, 0), 'Note: using local server',
log=True), (1, 1, 0),
log=True,
),
timetype=TimeType.REAL) timetype=TimeType.REAL)
elif 'test' in server_addr: elif 'test' in server_addr:
_ba.timer( _ba.timer(2.0,
2.0, lambda: _ba.screenmessage(
lambda: _ba.screenmessage('Note: using test server-module', 'Note: using test server-module',
(1, 1, 0), (1, 1, 0),
log=True), log=True,
timetype=TimeType.REAL) ),
timetype=TimeType.REAL)
cfg['launchCount'] = launch_count cfg['launchCount'] = launch_count
cfg.commit() cfg.commit()

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

@ -364,6 +364,11 @@ class PublicGatherTab(GatherTab):
self._build_join_tab(region_width, region_height) self._build_join_tab(region_width, region_height)
self._server_list_dirty = True self._server_list_dirty = True
# If we're not currently signed in, ignore any list we
# consider any list we previously retrieved.
if _ba.get_account_state() != 'signed_in':
self._have_valid_server_list = False
# If we've not yet successfully fetched a server list, # If we've not yet successfully fetched a server list,
# force an attempt now and show the user a 'loading...' status. # force an attempt now and show the user a 'loading...' status.
if not self._have_valid_server_list: if not self._have_valid_server_list:
@ -892,14 +897,18 @@ class PublicGatherTab(GatherTab):
self._last_server_list_query_time = now self._last_server_list_query_time = now
if DEBUG_SERVER_COMMUNICATION: if DEBUG_SERVER_COMMUNICATION:
print('REQUESTING SERVER LIST') print('REQUESTING SERVER LIST')
_ba.add_transaction( if _ba.get_account_state() == 'signed_in':
{ _ba.add_transaction(
'type': 'PUBLIC_PARTY_QUERY', {
'proto': ba.app.protocol_version, 'type': 'PUBLIC_PARTY_QUERY',
'lang': ba.app.lang.language 'proto': ba.app.protocol_version,
}, 'lang': ba.app.lang.language
callback=ba.WeakCall(self._on_public_party_query_result)) },
_ba.run_transactions() callback=ba.WeakCall(self._on_public_party_query_result))
_ba.run_transactions()
else:
# This will kick us over to a 'not signed in' message.
self._on_public_party_query_result(None)
def _ping_parties_periodically(self) -> None: def _ping_parties_periodically(self) -> None:
now = ba.time(ba.TimeType.REAL) now = ba.time(ba.TimeType.REAL)

2
docs/ba_module.md
View File

@ -1,5 +1,5 @@
<!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND --> <!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND -->
<h4><em>last updated on 2020-11-07 for Ballistica version 1.5.28 build 20241</em></h4> <h4><em>last updated on 2020-11-08 for Ballistica version 1.5.28 build 20244</em></h4>
<p>This page documents the Python classes and functions in the 'ba' module, <p>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 <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p> 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 <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p>
<hr> <hr>

2
src/ballistica/ballistica.cc
View File

@ -21,7 +21,7 @@
namespace ballistica { namespace ballistica {
// These are set automatically via script; don't change here. // These are set automatically via script; don't change here.
const int kAppBuildNumber = 20243; const int kAppBuildNumber = 20244;
const char* kAppVersion = "1.5.28"; const char* kAppVersion = "1.5.28";
// Our standalone globals. // Our standalone globals.