diff --git a/.efrocachemap b/.efrocachemap index c2e23e35..b104632d 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3995,50 +3995,50 @@ "assets/src/ba_data/python/ba/_generated/__init__.py": "https://files.ballistica.net/cache/ba1/ee/e8/cad05aa531c7faf7ff7b96db7f6e", "assets/src/ba_data/python/ba/_generated/enums.py": "https://files.ballistica.net/cache/ba1/b2/e5/0ee0561e16257a32830645239f34", "ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a", - "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/97/dc/9c7d758e679b205469f2fe2e2612", - "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/fa/6e/64c83ecddad8d46d477ff0c2cf58", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/31/2f/31720bf2039c7b4b4d938e7548d0", - "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/40/bd/2469cbe3be72f7a7db516493d154", - "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/17/66/1c9c58d593f1ab399bdb430c8645", - "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d3/00/d8f53fa1d499d5b13c9d198def52", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b4/14/4387242b502e4989f14d0b9cf104", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a4/46/99b38c12fd49a60e40cd2b5d3f4b", - "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/cf/d7/4ba5e8af4a617cc13ed1d0ff6bc7", - "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/92/0e/81cc0495b6b5689150ce19cc3401", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/94/3c/4b1781f7c4a42e8f42784fc59961", - "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2b/be/a16c9b08d65f3314ab7a4b0977b2", - "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/7a/ee/d77ffd6bb0ba45d3e50184d40ab7", - "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/be/24/7a9d66f282beedbd264c67ad3ba7", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/47/6d/ee1ad35240825d8ace2ee771c596", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cb/f8/a82f8f16eec3b6e1545c1d683e4d", - "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/4d/d4/5a3b3a49acc3b9f5f6680eda69d3", - "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/64/f5/16f96592846a6a74f40012ffb658", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/a6/54/3698ab8f19f0539b8e83e7af0b47", - "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/ac/99/aac7b774c374dae31b01cd688e59", - "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/41/b3/5a5813294b9281ca6bbb1f5caebe", - "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/28/05/b6cc01e7b6762a3c8d47851cd30c", - "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f7/8c/36acf6d02d7c322aed086cc4ec3f", - "build/prefab/lib/linux_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ca/65/de52706de6aa624f01c5907e5367", - "build/prefab/lib/linux_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/2d/3d/3e3e65846f42810c032cb5efd997", - "build/prefab/lib/linux_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/da/bf/c4a1f6e6d2495723acbd93e1b22c", - "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ac/34/6605f152207515d50174eca420e7", - "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/8c/b6/770c3d26d70edec763335c38de73", - "build/prefab/lib/mac_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/33/10/a753a671240f243b2351b5730917", - "build/prefab/lib/mac_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/1c/e4/05dc037f8669fc5ddc993dc8defc", - "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/7c/c9/879778a21f2403346adf8db17318", - "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/86/36/6d77a933a8126df4fde064fe881f", - "build/prefab/lib/mac_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/80/e8/1c9c69d9fd5e47d0fd6e3c9b1134", - "build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ac/e2/4208f2fc902ed0526bf4cb5bbc54", - "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e2/95/5fd6cede6b0e88753bb50b437110", - "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/87/0b/442839bc7a21c12ed6e173abf7ca", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/b6/aa/0666c00d1751f934cc1b0907fa40", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/aa/22/3afc115395a7909eac78d98cf856", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/9f/e6/5097b01991ce22e1d3fd594808b2", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/d9/4f/7f2a34294f53378990487655f4ab", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/18/d3/50bbe34de1862d8224dafa8792e7", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/82/93/f80194878bfed43f58809a7e9823", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/73/54/88f193633990884b61719a481dec", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/f4/23/2a4e21dc99e6135c1cb102f6ca37", + "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/16/a6/54bb8da2e650577b2c6e3aa93f3c", + "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/2d/7c/82b7f3955044130662dce657fdc0", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c5/69/18b1c31fbb91400d1baeb4611b41", + "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/8b/56/e2691aa74c7ec494d72dcd1ba852", + "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/ed/f3/1acaa469e1fa090c9e43e31d9945", + "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/73/dc/5c476575823018c7c59b03af193b", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a2/15/96a493187df45cff95fd3ff2efc1", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/1f/9d/93b908ccc3ed41f47b20b3a8c8c8", + "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/62/08/ee49847e133846b5c9f990a18370", + "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/83/2f/3f25a6cb763a7893ceee5a566699", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cc/57/e3594cc2dc9472d5b7ca05d531b6", + "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ee/63/0e5810f505396c8f36202a595c7b", + "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a5/4d/9cb1bebf149a0a1ee1f6c455a4a8", + "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a4/8f/648da2b9fbd868491bd4193e1b9d", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/0f/1f/ac05aa78d6ddf4fbfa3c6caedf43", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/78/36/d58e0b3618a69dc9b7bbc8319252", + "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/f1/76/145b59261c6a3788c5b302f6b470", + "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/07/63/35640d1b49afb1f9bcadf1fdf3b4", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/ae/43/fc1660d9020dd11068fb4dd4a16b", + "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/f9/14/ea72a347a593056fb38b84dcbfd7", + "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b1/b1/c86e3a93f7473a08f28cdd8dfd56", + "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/8a/00/ec5e39879efb172bec2d1113c94d", + "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/19/67/174ecfc902bb0a34b8b4fbf4a693", + "build/prefab/lib/linux_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b1/b6/891d160416feecce4ffe1dee58c1", + "build/prefab/lib/linux_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/8e/1d/641fab4e2fd494da583759623f9e", + "build/prefab/lib/linux_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b6/3f/ee9b794daba0e7476b92fb835600", + "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a1/24/a6c2b7e7c1832f95a67166a87d0b", + "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/dc/b2/aac5c4fa05db030bd311d34bfc09", + "build/prefab/lib/mac_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/72/28/02d44b92e8011b40eb513e4187ee", + "build/prefab/lib/mac_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/62/89/c100c65c5d4773f1431646ed5fa0", + "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ba/8c/ffe4707f45bc17a0bb090ae5904f", + "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/15/e7/c307e3a03602f5acec82537845f2", + "build/prefab/lib/mac_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/0d/f3/ad4f030b5a97b0c1587f6ae713ec", + "build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/5b/1a/718567215b064475499a93730001", + "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/57/fd/2f5f9f58f8a92da107f38e7cce49", + "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b6/f0/97eebe800a5009f5b1b0ab642d96", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/c6/cf/0c4264dfe13f7c7cf4c2d544119c", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/b5/eb/5e7d1ab5fd611956a0fc53d188e3", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/9f/5f/24929572964bd6af4123cb997ede", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/cb/e8/f491b7f29d7fdb00a62e5cae318d", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/fe/eb/2b13ca7f05b069957485c2cb6748", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/a9/78/95c1be570a88a6b244758ad62aee", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/98/d9/a546eaa18d76ec99fffb10ff36f6", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/96/3f/cf091233db374170caa1378e01fe", "src/ballistica/generated/python_embedded/binding.inc": "https://files.ballistica.net/cache/ba1/c0/32/b7907e3859a5c5013a3d97b6b523", "src/ballistica/generated/python_embedded/bootstrap.inc": "https://files.ballistica.net/cache/ba1/2d/4f/f4fe67827f36cd59cd5193333a02", "src/ballistica/generated/python_embedded/bootstrap_monolithic.inc": "https://files.ballistica.net/cache/ba1/ef/c1/aa5f1aa10af89f5c0b1e616355fd" diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml index de2b9cc5..c52bc957 100644 --- a/.idea/dictionaries/ericf.xml +++ b/.idea/dictionaries/ericf.xml @@ -827,6 +827,7 @@ f'final f'fixme factoryclass + fairydust fakemodule fakeshake fallbacks diff --git a/CHANGELOG.md b/CHANGELOG.md index 58741d12..7db2d37c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ -### 1.7.9 (build 20878, api 7, 2022-09-22) +### 1.7.9 (build 20880, api 7, 2022-09-24) - Cleaned up the efro.message system to isolate response types that are used purely internally (via a new SysResponse type). - Fixed bug with 'Disable Camera Shake' option. (GitHub #511) (thanks Dliwk!) - Fixed an issue where Co-op football would play no music. - Accept "fairydust" as an emit type in `ba.emitfx()` (thanks ritiek!). - Added epic mode option to Easter Egg Hunt (thanks itsre3!). +- The game no longer auto-signs-in to a device account when first run since we want to start encouraging people to use V2 accounts. +- Removed support for GameCircle in Amazon builds (which has been discontinued for years at this point). ### 1.7.8 (build 20871, api 7, 2022-09-21) - Fixed tournament scores submits which were broken in 1.7.7 (oops). diff --git a/assets/src/ba_data/python/ba/_bootstrap.py b/assets/src/ba_data/python/ba/_bootstrap.py index 2898d390..3f7d06c9 100644 --- a/assets/src/ba_data/python/ba/_bootstrap.py +++ b/assets/src/ba_data/python/ba/_bootstrap.py @@ -45,7 +45,7 @@ def bootstrap() -> None: # Give a soft warning if we're being used with a different binary # version than we expect. - expected_build = 20878 + expected_build = 20880 running_build: int = env['build_number'] if running_build != expected_build: print( diff --git a/assets/src/ba_data/python/bastd/ui/account/settings.py b/assets/src/ba_data/python/bastd/ui/account/settings.py index eab2379c..a75eb0f1 100644 --- a/assets/src/ba_data/python/bastd/ui/account/settings.py +++ b/assets/src/ba_data/python/bastd/ui/account/settings.py @@ -25,7 +25,6 @@ class AccountSettingsWindow(ba.Window): close_once_signed_in: bool = False): # pylint: disable=too-many-statements - self._sign_in_game_circle_button: ba.Widget | None = None self._sign_in_v2_button: ba.Widget | None = None self._sign_in_device_button: ba.Widget | None = None @@ -84,9 +83,6 @@ class AccountSettingsWindow(ba.Window): if app.platform == 'android' and app.subplatform == 'google': self._show_sign_in_buttons.append('Google Play') - elif app.platform == 'android' and app.subplatform == 'amazon': - self._show_sign_in_buttons.append('Game Circle') - # Local accounts are generally always available with a few key # exceptions. self._show_sign_in_buttons.append('Local') @@ -213,17 +209,14 @@ class AccountSettingsWindow(ba.Window): show_google_play_sign_in_button = (account_state == 'signed_out' and 'Google Play' in self._show_sign_in_buttons) - show_game_circle_sign_in_button = (account_state == 'signed_out' - and 'Game Circle' - in self._show_sign_in_buttons) show_device_sign_in_button = (account_state == 'signed_out' and 'Local' in self._show_sign_in_buttons) show_v2_sign_in_button = (account_state == 'signed_out' and 'V2' in self._show_sign_in_buttons) sign_in_button_space = 70.0 - show_game_service_button = (self._signed_in and account_type - in ['Game Center', 'Game Circle']) + show_game_service_button = (self._signed_in + and account_type in ['Game Center']) game_service_button_space = 60.0 show_linked_accounts_text = (self._signed_in and @@ -289,8 +282,6 @@ class AccountSettingsWindow(ba.Window): self._sub_height += signing_in_text_space if show_google_play_sign_in_button: self._sub_height += sign_in_button_space - if show_game_circle_sign_in_button: - self._sub_height += sign_in_button_space if show_device_sign_in_button: self._sub_height += sign_in_button_space if show_v2_sign_in_button: @@ -460,32 +451,6 @@ class AccountSettingsWindow(ba.Window): ba.widget(edit=btn, show_buffer_bottom=40, show_buffer_top=100) self._sign_in_text = None - if show_game_circle_sign_in_button: - button_width = 350 - v -= sign_in_button_space - self._sign_in_game_circle_button = btn = ba.buttonwidget( - parent=self._subcontainer, - position=((self._sub_width - button_width) * 0.5, v - 20), - autoselect=True, - size=(button_width, 60), - label=ba.Lstr(value='${A}${B}', - subs=[('${A}', - ba.charstr( - ba.SpecialChar.GAME_CIRCLE_LOGO)), - ('${B}', - ba.Lstr(resource=self._r + - '.signInWithGameCircleText'))]), - on_activate_call=lambda: self._sign_in_press('Game Circle')) - if first_selectable is None: - first_selectable = btn - if ba.app.ui.use_toolbars: - ba.widget(edit=btn, - right_widget=ba.internal.get_special_widget( - 'party_button')) - ba.widget(edit=btn, left_widget=bbtn) - ba.widget(edit=btn, show_buffer_bottom=40, show_buffer_top=100) - self._sign_in_text = None - if show_v2_sign_in_button: button_width = 350 v -= sign_in_button_space @@ -629,8 +594,6 @@ class AccountSettingsWindow(ba.Window): account_type = ba.internal.get_v1_account_type() if account_type == 'Game Center': account_type_name = ba.Lstr(resource='gameCenterText') - elif account_type == 'Game Circle': - account_type_name = ba.Lstr(resource='gameCircleText') else: raise ValueError("unknown account type: '" + str(account_type) + "'") diff --git a/ballisticacore-cmake/.idea/dictionaries/ericf.xml b/ballisticacore-cmake/.idea/dictionaries/ericf.xml index 21c6ae55..5c81f7d7 100644 --- a/ballisticacore-cmake/.idea/dictionaries/ericf.xml +++ b/ballisticacore-cmake/.idea/dictionaries/ericf.xml @@ -433,6 +433,7 @@ extrascale exts facepts + fairydust fakeshake farval fastdot diff --git a/src/ballistica/app/app.h b/src/ballistica/app/app.h index 754d42e1..4cfaacaf 100644 --- a/src/ballistica/app/app.h +++ b/src/ballistica/app/app.h @@ -39,7 +39,7 @@ class App { int master_server_source{0}; int session_count{}; bool shutting_down{}; - bool have_incentivized_ad{true}; + bool have_incentivized_ad{false}; bool should_pause{}; TelnetServer* telnet_server{}; Console* console{}; diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc index 46c40cd8..8b7177a7 100644 --- a/src/ballistica/ballistica.cc +++ b/src/ballistica/ballistica.cc @@ -32,7 +32,7 @@ namespace ballistica { // These are set automatically via script; don't modify them here. -const int kAppBuildNumber = 20878; +const int kAppBuildNumber = 20880; const char* kAppVersion = "1.7.9"; // Our standalone globals. diff --git a/tools/batools/pcommand.py b/tools/batools/pcommand.py index 4271f054..1924798e 100644 --- a/tools/batools/pcommand.py +++ b/tools/batools/pcommand.py @@ -690,6 +690,29 @@ def lazybuild() -> None: raise CleanError(exc) from exc +def logcat() -> None: + """Get logcat command for filtering.""" + import subprocess + from efro.terminal import Clr + from efro.error import CleanError + if len(sys.argv) != 4: + raise CleanError('Expected 2 args') + adb = sys.argv[2] + plat = sys.argv[3] + print('plat is', plat) + + # My amazon tablet chokes on the color format. + if plat == 'amazon': + format_args = '' + else: + format_args = '-v color ' + cmd = (f'{adb} logcat {format_args}SDL:V BallisticaCore:V VrLib:V' + ' VrApi:V VrApp:V TimeWarp:V EyeBuf:V GlUtils:V DirectRender:V' + ' HmdInfo:V IabHelper:V CrashAnrDetector:V DEBUG:V \'*:S\'') + print(f'{Clr.BLU}Running logcat command: {Clr.BLD}{cmd}{Clr.RST}') + subprocess.run(cmd, shell=True, check=True) + + def android_archive_unstripped_libs() -> None: """Copy libs to a build archive.""" import subprocess diff --git a/tools/pcommand b/tools/pcommand index eb9737e1..f50297df 100755 --- a/tools/pcommand +++ b/tools/pcommand @@ -40,7 +40,7 @@ from batools.pcommand import ( efro_gradle, stage_assets, update_assets_makefile, update_project, update_cmake_prefab_lib, cmake_prep_dir, gen_binding_code, gen_flat_data_code, wsl_path_to_win, wsl_build_check_win_drive, - win_ci_binary_build, genchangelog, android_sdk_utils, + win_ci_binary_build, genchangelog, android_sdk_utils, logcat, update_resources_makefile, update_meta_makefile, gen_python_enums_module, gen_python_init_module, update_dummy_modules, win_ci_install_prereqs, version)