Skip to content

Commit

Permalink
almost final mac app store update build
Browse files Browse the repository at this point in the history
  • Loading branch information
efroemling committed Nov 13, 2023
1 parent e6d3e7d commit f06ad6b
Show file tree
Hide file tree
Showing 49 changed files with 499 additions and 480 deletions.
100 changes: 50 additions & 50 deletions .efrocachemap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### 1.7.28 (build 21585, api 8, 2023-11-10)
### 1.7.28 (build 21588, api 8, 2023-11-13)

- Turning off ticket continues on all platforms. I'll be moving the game towards
a new monetization scheme mostly based on cosmetics and this has always felt a
Expand Down Expand Up @@ -209,6 +209,13 @@
- The V2 account id for the signed in account is now available at
`ba*.app.plus.accounts.primary.accountid` (alongside some other existing
account info).
- (build 21585) Fixed an issue where some navigation key presses were getting
incorrectly absorbed by text widgets. (Thanks for the heads-up Temp!)
- (build 21585) Fixed an issue where texture quality changes would not take
effect until next launch.
- Added a 'glow_type' arg to `bauiv1.textwidget()` to adjust the glow used when
the text is selected. The default is 'gradient' but there is now a 'uniform'
option which may look better in some circumstances.

### 1.7.27 (build 21282, api 8, 2023-08-30)

Expand Down
5 changes: 5 additions & 0 deletions src/assets/ba_data/python/babase/_cloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
class CloudSubsystem(AppSubsystem):
"""Manages communication with cloud components."""

@property
def connected(self) -> bool:
"""Property equivalent of CloudSubsystem.is_connected()."""
return self.is_connected()

def is_connected(self) -> bool:
"""Return whether a connection to the cloud is present.
Expand Down
4 changes: 2 additions & 2 deletions src/assets/ba_data/python/babase/modutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ def show_user_scripts() -> None:

_error.print_exception('error writing about_this_folder stuff')

# On a few platforms we try to open the dir in the UI.
if app.classic is not None and app.classic.platform in ['mac', 'windows']:
# On platforms that support it, open the dir in the UI.
if _babase.supports_open_dir_externally():
_babase.open_dir_externally(env.python_directory_user)

# Otherwise we just print a pretty version of it.
Expand Down
2 changes: 1 addition & 1 deletion src/assets/ba_data/python/baenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

# Build number and version of the ballistica binary we expect to be
# using.
TARGET_BALLISTICA_BUILD = 21585
TARGET_BALLISTICA_BUILD = 21588
TARGET_BALLISTICA_VERSION = '1.7.28'


Expand Down
21 changes: 16 additions & 5 deletions src/assets/ba_data/python/bauiv1lib/account/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -486,20 +486,21 @@ def _refresh(self) -> None:
self._account_name_what_is_text = bui.textwidget(
parent=self._subcontainer,
position=(0.0, self._account_name_what_is_y),
size=(200.0, 60),
size=(220.0, 60),
text=bui.Lstr(
value='${WHAT} -->',
subs=[('${WHAT}', bui.Lstr(resource='whatIsThisText'))],
),
scale=0.6,
color=(0.3, 0.7, 0.05),
maxwidth=200.0,
maxwidth=130.0,
h_align='right',
v_align='center',
autoselect=True,
selectable=True,
on_activate_call=show_what_is_v2_page,
click_activate=True,
glow_type='uniform',
)
if first_selectable is None:
first_selectable = self._account_name_what_is_text
Expand Down Expand Up @@ -1281,11 +1282,21 @@ def _on_what_is_v2_press(self) -> None:
show_what_is_v2_page()

def _on_manage_account_press(self) -> None:
bui.screenmessage(bui.Lstr(resource='oneMomentText'))

plus = bui.app.plus
assert plus is not None

# Preemptively fail if it looks like we won't be able to talk to
# the server anyway.
if not plus.cloud.connected:
bui.screenmessage(
bui.Lstr(resource='internal.unavailableNoConnectionText'),
color=(1, 0, 0),
)
bui.getsound('error').play()
return

bui.screenmessage(bui.Lstr(resource='oneMomentText'))

# We expect to have a v2 account signed in if we get here.
if plus.accounts.primary is None:
logging.exception(
Expand Down Expand Up @@ -1445,7 +1456,7 @@ def _refresh_account_name_text(self) -> None:
swidth = bui.get_string_width(name_str, suppress_warning=True)
# Eww; number-fudging. Need to recalibrate this if
# account name scaling changes.
x = self._sub_width * 0.5 - swidth * 0.75 - 170
x = self._sub_width * 0.5 - swidth * 0.75 - 190

bui.textwidget(
edit=self._account_name_what_is_text,
Expand Down
5 changes: 4 additions & 1 deletion src/assets/ba_data/python/bauiv1lib/gather/manualtab.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ def on_activate(
playsound=True,
),
text=bui.Lstr(resource='gatherWindow.manualJoinSectionText'),
glow_type='uniform',
)
self._favorites_text = bui.textwidget(
parent=self._container,
Expand All @@ -162,6 +163,7 @@ def on_activate(
playsound=True,
),
text=bui.Lstr(resource='gatherWindow.favoritesText'),
glow_type='uniform',
)
bui.widget(edit=self._join_by_address_text, up_widget=tab_button)
bui.widget(
Expand Down Expand Up @@ -316,7 +318,7 @@ def _build_join_by_address_tab(
self._check_button = bui.textwidget(
parent=self._container,
size=(250, 60),
text=bui.Lstr(resource='gatherWindow.' 'showMyAddressText'),
text=bui.Lstr(resource='gatherWindow.showMyAddressText'),
v_align='center',
h_align='center',
click_activate=True,
Expand All @@ -331,6 +333,7 @@ def _build_join_by_address_tab(
self._container,
c_width,
),
glow_type='uniform',
)
bui.widget(edit=self._check_button, up_widget=btn)

Expand Down
2 changes: 2 additions & 0 deletions src/assets/ba_data/python/bauiv1lib/gather/privatetab.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ def on_activate(
playsound=True,
),
text=bui.Lstr(resource='gatherWindow.privatePartyJoinText'),
glow_type='uniform',
)
self._host_sub_tab_text = bui.textwidget(
parent=self._container,
Expand All @@ -138,6 +139,7 @@ def on_activate(
playsound=True,
),
text=bui.Lstr(resource='gatherWindow.privatePartyHostText'),
glow_type='uniform',
)
bui.widget(edit=self._join_sub_tab_text, up_widget=tab_button)
bui.widget(
Expand Down
Loading

0 comments on commit f06ad6b

Please sign in to comment.