diff --git a/.efrocachemap b/.efrocachemap index eaf9329f..44b879bb 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4038,50 +4038,50 @@ "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "d74d998608b2be90551db0c1d96fe9bb", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "a98a74989bea6f6020df62a1e9df0f79", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "36f14bbd6ae38e97ff423d9d767e31c2", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "28a717bce15f9fdf6fb99483beacc19a", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "fcca800df7adf35b34463e01077db1b6", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "5a595984e6e663e4ead1b17fc84146e5", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "3631577e0dfa072c0e9bb603a6b5edf0", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "e78b348e2b6709ef974630745d61f886", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f51357176081a05cab1f31141d3e3edc", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "f51d29b9ed8fecb4262c925a03f7f9cb", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "f10ecde53794acf04f1ff748fe44a317", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ae2d6b9b5648d03461564c4816d3152c", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "7545271b4990e75a372e05a6d732d244", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "bd8ccf40c3e6bdcf3cf5697b7078c5b0", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "8abba03f2364a3a5a76547f442cfc878", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "94a53e1f34519b22b3f37e53bc9f2aa9", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "6fb53a4580ba643e3e9e89f75a780fba", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "ec871cfb272bee1848c5a7be5149f8b1", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "a9df11c9d43cb96ab6a3ee642658bc2c", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "159fd444515da2af0cac7818f2ba1a54", - "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "e40234644df79316d71808a731ba14f0", - "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "8563857336ffcf40abfeac81fc3955eb", - "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "e40234644df79316d71808a731ba14f0", - "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "8563857336ffcf40abfeac81fc3955eb", - "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "07033318a9b2b299128906c61342f391", - "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "403c3f754e7d900b044a9f06658fffde", - "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "07033318a9b2b299128906c61342f391", - "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "403c3f754e7d900b044a9f06658fffde", - "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "5cbf318e235fc9218abd1df4bca567c4", - "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "4989c44cc8c9854a9a1dc6bf1b633796", - "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "5cbf318e235fc9218abd1df4bca567c4", - "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "4989c44cc8c9854a9a1dc6bf1b633796", - "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "c40665a3e7f727e0fb7350e21bfd64aa", - "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "9768548c6dfdff65fb25661540025ffe", - "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "1a0cc7e78dc66dec6ee85a8a0d68aefd", - "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "9768548c6dfdff65fb25661540025ffe", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "8f9d11a98898066b9c492a62cb539843", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "994f00aa1718157f2c3ecf252218afb7", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "4fbd801cc96d084a1c399f44de40c6e7", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "3c696fd17f85168472bb298eeeb23b58", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "cf6d352320bdaa081c8a8de122eac7ec", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "a02405ac7586f175ca2daf69d1965446", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "b8b98848ba5e0da6dee7336a6cd5284c", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "883cc779e54b299245d4e01ea061f2e8", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "c653e9575eab2f467702bb426771280b", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "519a2b4b38179aa715b10d34f473dded", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "60b696d0dbc17349ae6daf696eddd6a1", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "1aee3b95c765746a9360d7d2ce79b206", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "f8dfef071f3d2ce65a9a2122cebc43d4", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "450aca234f32c26801a099153961a4e6", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "f668372d4a26a59be7ce6cd650881f0a", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "655eb1c11d066c1c988608724e80b6b3", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "cf600ae749e4856005223c11e682b983", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "167808a4dc1f9642589fd88e8b7d8351", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "4679863b16f066d763fb9ee0356d0435", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "4e24f70d03faf5656847f6aaea9565cd", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "a7554aa7eea549d2c6b15e922207955c", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "01548c4de666b30aefd597aa12ce34c0", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "c21de374a6952a9bc091687d0a4bfe05", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "4dd2d178bc0d1180d4b55fd339bc3d1d", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "8f54aef4c807e02d99955375a9cc3656", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "a7f5d901dc0afe7d40df20eae296615f", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "535d8e9d4b3a7ce0e412c6f85fd264e8", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "32cdea1727c8c73dc5fa1da287a39d7b", + "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "55c07828ad7fccc584dd96d1ffebd760", + "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "7ca8b0b5c34766ce9df9babb6ec8311f", + "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "55c07828ad7fccc584dd96d1ffebd760", + "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "7ca8b0b5c34766ce9df9babb6ec8311f", + "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "6918f36d76061951f51c33d1a8dea572", + "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "e9e4da9ad759e92741ab10212c51270a", + "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "6918f36d76061951f51c33d1a8dea572", + "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "e9e4da9ad759e92741ab10212c51270a", + "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "17da2884d5ca518c84a93d3d2b0edd79", + "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "52f4b8d0b8908a5261d1160feba46327", + "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "17da2884d5ca518c84a93d3d2b0edd79", + "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "52f4b8d0b8908a5261d1160feba46327", + "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "0db136ec64c90a522e112acbbabfb11d", + "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "ab81671e4e3be14b17ce721eb835b426", + "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "6a26caeb1dd4d4871d52e8e2fb2c11ef", + "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "ab81671e4e3be14b17ce721eb835b426", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "5404a09db0c4b193ab70e7215d0309c0", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "741d9b28039cd4c60816b480dc4f4b87", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "8d387d291567f6cc9001f67a390809bd", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "3b285329e71baa6cff83217c0ea309f5", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "f99d6672092bdbbd62e53da5c5c08ce7", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "6e381db6e0bd163b7a8d5b1679c4e6ec", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "34eb3c5907b3291dac3c5ac6b636533c", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "cee987dcb355623d734af0552f42114e", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d", "src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f", diff --git a/CHANGELOG.md b/CHANGELOG.md index fc786072..3ccbb1e0 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/src/assets/ba_data/python/babase/_app.py b/src/assets/ba_data/python/babase/_app.py index 538b053e..bc2e5de6 100644 --- a/src/assets/ba_data/python/babase/_app.py +++ b/src/assets/ba_data/python/babase/_app.py @@ -46,8 +46,6 @@ if TYPE_CHECKING: T = TypeVar('T') -Tsub = TypeVar('Tsub', bound='AppSubsystem') - class App: """A class for high level app functionality and state. @@ -236,10 +234,9 @@ class App: 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 @@ class App: 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 @@ class App: # 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. diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 71c59fea..94759736 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ if TYPE_CHECKING: # 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' diff --git a/src/assets/ba_data/python/bauiv1lib/settings/remoteapp.py b/src/assets/ba_data/python/bauiv1lib/settings/remoteapp.py index c38b727a..80fc3c19 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/remoteapp.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/remoteapp.py @@ -85,9 +85,6 @@ class RemoteAppSettingsWindow(bui.Window): ) 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, diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 59d62f23..7cf7e6a9 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/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;