Latest public/internal sync.

This commit is contained in:
Eric 2023-09-27 17:18:44 -07:00
parent 37d265d355
commit 1d54e322ca
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
4 changed files with 14 additions and 12 deletions

View File

@ -80,6 +80,14 @@
and pop the transform stack based on C++ scoping instead of the old and pop the transform stack based on C++ scoping instead of the old
PushTransform/PopTransform. This should make it harder to accidentally break PushTransform/PopTransform. This should make it harder to accidentally break
the transform stack with unbalanced components. the transform stack with unbalanced components.
- Fixes an issue related to incorrect die-message handling by hockey pucks (fix
#617). Thanks EraOSBeta!
- Fixes an issue where clamped player-name would display incorrectly if extra
spaces are present (fix #618). Thanks vishal332008!
- Fixes an issue where King of the Hill scoreboard did not display immediately
(fix #614). Thanks heLlow-step-sis!
- Fixes an issue where CTF flag return counters could get stuck (fix #584).
Thanks SoK05 and Dliwk!
### 1.7.27 (build 21282, api 8, 2023-08-30) ### 1.7.27 (build 21282, api 8, 2023-08-30)

View File

@ -445,9 +445,7 @@ class Spaz(bs.Actor):
Called to 'press punch' on this spaz; Called to 'press punch' on this spaz;
used for player or AI connections. used for player or AI connections.
""" """
if (not self.node if not self.node or self.frozen or self.node.knockout > 0.0:
or self.frozen
or self.node.knockout > 0.0):
return return
t_ms = int(bs.time() * 1000.0) t_ms = int(bs.time() * 1000.0)
assert isinstance(t_ms, int) assert isinstance(t_ms, int)
@ -487,10 +485,12 @@ class Spaz(bs.Actor):
Called to 'press bomb' on this spaz; Called to 'press bomb' on this spaz;
used for player or AI connections. used for player or AI connections.
""" """
if (not self.node if (
not self.node
or self._dead or self._dead
or self.frozen or self.frozen
or self.node.knockout > 0.0): or self.node.knockout > 0.0
):
return return
t_ms = int(bs.time() * 1000.0) t_ms = int(bs.time() * 1000.0)
assert isinstance(t_ms, int) assert isinstance(t_ms, int)

View File

@ -483,9 +483,6 @@ class CaptureTheFlagGame(bs.TeamGameActivity[Player, Team]):
except bs.NotFoundError: except bs.NotFoundError:
return return
if not spaz.is_alive():
return
player = spaz.getplayer(Player, True) player = spaz.getplayer(Player, True)
if player: if player:

View File

@ -719,10 +719,7 @@ class EditProfileWindow(bui.Window):
) )
if len(name) > 10 and not (self._global or self._is_account_profile): if len(name) > 10 and not (self._global or self._is_account_profile):
name = name.strip() name = name.strip()
display_name = ((name[:10] + '...') display_name = (name[:10] + '...') if len(name) > 10 else name
if len(name) > 10
else name
)
bui.textwidget( bui.textwidget(
edit=self._clipped_name_text, edit=self._clipped_name_text,
text=bui.Lstr( text=bui.Lstr(