Latest public/internal sync.

CHANGELOG.md

@@ -1,4 +1,4 @@
-### 1.7.35 (build 21824, api 8, 2024-04-26)
+### 1.7.35 (build 21826, api 8, 2024-04-28)
 
 ### 1.7.34 (build 21823, api 8, 2024-04-26)
 - Bumped Python version from 3.11 to 3.12 for all builds and project tools. One

src/assets/ba_data/python/babase/_app.py

@@ -46,8 +46,6 @@
 
 T = TypeVar('T')
 
-Tsub = TypeVar('Tsub', bound='AppSubsystem')
-
 
 class App:
     """A class for high level app functionality and state.
@@ -236,10 +234,9 @@ def postinit(self) -> None:
         must go here instead of __init__.
         """
 
-        # Hack for docs-generation:
-        #
-        # We can be imported with dummy modules
-        # instead of our actual binary ones, but we don't function.
+        # Hack for docs-generation: We can be imported with dummy
+        # modules instead of our actual binary ones, but we don't
+        # function.
         if os.environ.get('BA_RUNNING_WITH_DUMMY_MODULES') == '1':
             return
 
@@ -345,12 +342,12 @@ def _get_subsystem_property(
         self, ssname: str, create_call: Callable[[], AppSubsystem | None]
     ) -> AppSubsystem | None:
 
-        # Quick-out: if a subsystem object is present, just return it;
-        # no locking necessary.
+        # Quick-out: if a subsystem is present, just return it; no
+        # locking necessary.
         val = self._subsystem_property_data.get(ssname)
         if val is not None:
             if val is False:
-                # False means subsystem is confirmed as not present.
+                # False means subsystem is confirmed as unavailable.
                 return None
             if val is not True:
                 # A subsystem has been set. Return it.
@@ -364,18 +361,20 @@ def _get_subsystem_property(
                     # False means confirmed as not present.
                     return None
                 if val is True:
-                    # True means this property is already being loaded;
-                    # not good.
+                    # True means this property is already being loaded,
+                    # and the fact that we're holding the lock means
+                    # we're doing the loading, so this is a dependency
+                    # loop. Not good.
                     raise RuntimeError(
-                        f'Recursive subsystem load detected for {ssname}'
+                        f'Subsystem dependency loop detected for {ssname}'
                     )
                 # Must be an instantiated subsystem. Noice.
                 return val
 
             # Ok, there's nothing here for it. Instantiate and set it
             # while we hold the lock. Set a placeholder value of True
-            # first so we know if something tries to recursively
-            # instantiate us while we're instantiating.
+            # while we load so we can error if something we're loading
+            # tries to recursively load us.
             self._subsystem_property_data[ssname] = True
 
             # Do our one attempt to create the singleton.

src/assets/ba_data/python/baenv.py

@@ -52,7 +52,7 @@
 
 # Build number and version of the ballistica binary we expect to be
 # using.
-TARGET_BALLISTICA_BUILD = 21824
+TARGET_BALLISTICA_BUILD = 21826
 TARGET_BALLISTICA_VERSION = '1.7.35'
 
 

src/assets/ba_data/python/bauiv1lib/settings/remoteapp.py

@@ -85,9 +85,6 @@ def __init__(self) -> None:
         )
         v -= 90
 
-        # hmm the itms:// version doesnt bounce through safari but is kinda
-        # apple-specific-ish
-
         # Update: now we just show link to the remote webpage.
         bui.textwidget(
             parent=self._root_widget,

src/ballistica/shared/ballistica.cc

@@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
 namespace ballistica {
 
 // These are set automatically via script; don't modify them here.
-const int kEngineBuildNumber = 21824;
+const int kEngineBuildNumber = 21826;
 const char* kEngineVersion = "1.7.35";
 const int kEngineApiVersion = 8;