RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-19 13:25:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tidying

Browse Source
This commit is contained in:
Eric Froemling 2024-12-22 00:31:28 -08:00
parent 8791b134aa
commit 2a8f8e20b2
No known key found for this signature in database
5 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
.efrocachemap generated
View File

@ -946,45 +946,45 @@
"build/assets/ba_data/meshes/zoeTorso.bob": "26a1007e98902178d8c62fd7069d5da5",
"build/assets/ba_data/meshes/zoeUpperArm.bob": "a8a881010ac1ee9ec5ca872d5c5e853a",
"build/assets/ba_data/meshes/zoeUpperLeg.bob": "95b2502f74c70f934927f67cd505c3ad",
"build/assets/ba_data/python-site-packages/certifi/__init__.py": "611f53e8096b704efa4e0caa4c5dcd7c",
"build/assets/ba_data/python-site-packages/certifi/__init__.py": "65ea5397850ccdefb2106ab08f111715",
"build/assets/ba_data/python-site-packages/certifi/__main__.py": "ef02e73f8581609df189a9f61aca365b",
"build/assets/ba_data/python-site-packages/certifi/cacert.pem": "131628a15d2001d10cac7c73d001c3c2",
"build/assets/ba_data/python-site-packages/certifi/cacert.pem": "47b125f1425530fe29c575423e00a874",
"build/assets/ba_data/python-site-packages/certifi/core.py": "c1b8c102093ea26587619677c7ec6016",
"build/assets/ba_data/python-site-packages/typing_extensions.py": "1f6b4db70adb7ca05dff2b74f6cde8aa",
"build/assets/ba_data/python-site-packages/urllib3/__init__.py": "06cffcf88c8024218069f628c9938c50",
"build/assets/ba_data/python-site-packages/urllib3/_base_connection.py": "4404e529dbd3db128d9a2e60c6ed9243",
"build/assets/ba_data/python-site-packages/urllib3/_collections.py": "14963d7d43c0e51e777851c0e2868928",
"build/assets/ba_data/python-site-packages/urllib3/_request_methods.py": "ee22bc685aec965a9cbc8fd51097758b",
"build/assets/ba_data/python-site-packages/urllib3/_version.py": "eb50943fd218eb58da9cc08cdc3d97d9",
"build/assets/ba_data/python-site-packages/urllib3/connection.py": "4afbb583ae2aff33f1da0d0a27a5eb21",
"build/assets/ba_data/python-site-packages/urllib3/connectionpool.py": "e891fe6cdff0c03a3b670e225c0c4d88",
"build/assets/ba_data/python-site-packages/urllib3/_base_connection.py": "61b339fa1c4f8c1e8350e34fa5d531c8",
"build/assets/ba_data/python-site-packages/urllib3/_collections.py": "51bfd42b2ef6e25001da6c6a37c5530d",
"build/assets/ba_data/python-site-packages/urllib3/_request_methods.py": "58975e48cc5b350e147ea11b3191b97e",
"build/assets/ba_data/python-site-packages/urllib3/_version.py": "226158194d9926015be260ada1d68121",
"build/assets/ba_data/python-site-packages/urllib3/connection.py": "658ca138d7522f20f81cc08da97b5b0a",
"build/assets/ba_data/python-site-packages/urllib3/connectionpool.py": "a7b4d82cc860e2faaaa5d359d9f53150",
"build/assets/ba_data/python-site-packages/urllib3/contrib/__init__.py": "340c83beff7dcff8f5c7b87cd43cedaf",
"build/assets/ba_data/python-site-packages/urllib3/contrib/emscripten/__init__.py": "33531b60d1ff8b9073567240f2a1745f",
"build/assets/ba_data/python-site-packages/urllib3/contrib/emscripten/connection.py": "e9474e964b3feb3a523ccfab2b4b8f70",
"build/assets/ba_data/python-site-packages/urllib3/contrib/emscripten/fetch.py": "be8618e1c9a004108bf9f82f706503d7",
"build/assets/ba_data/python-site-packages/urllib3/contrib/emscripten/connection.py": "8147210b5572ad3d577e989ed7d81bb1",
"build/assets/ba_data/python-site-packages/urllib3/contrib/emscripten/fetch.py": "8b2fe986b0e25c15267157b8c95d362f",
"build/assets/ba_data/python-site-packages/urllib3/contrib/emscripten/request.py": "da01c66ef924f2a2875d46adb87d7507",
"build/assets/ba_data/python-site-packages/urllib3/contrib/emscripten/response.py": "11208e765d5e9a1d481ded597e58c7d3",
"build/assets/ba_data/python-site-packages/urllib3/contrib/pyopenssl.py": "fc0e3d0b92a7866fdd3dd242eee78713",
"build/assets/ba_data/python-site-packages/urllib3/contrib/emscripten/response.py": "183a338a9720d18bce5be9cb0723f7f3",
"build/assets/ba_data/python-site-packages/urllib3/contrib/pyopenssl.py": "b19d9a1d5e9325434e2e89889c981afd",
"build/assets/ba_data/python-site-packages/urllib3/contrib/socks.py": "bd5fed33c678f750ad9d1c754a26faf0",
"build/assets/ba_data/python-site-packages/urllib3/exceptions.py": "c346a13d762dcdff2f9cccc1d06c92d6",
"build/assets/ba_data/python-site-packages/urllib3/fields.py": "e24ef9e64962ca25322c0216cc4bc923",
"build/assets/ba_data/python-site-packages/urllib3/filepost.py": "d0a96fd7614fcaa368b26d8a769ff848",
"build/assets/ba_data/python-site-packages/urllib3/exceptions.py": "6d7342a2e68eea0d8cc719e7bb1a79e0",
"build/assets/ba_data/python-site-packages/urllib3/fields.py": "30507615278ef00276ce3bb9d7606421",
"build/assets/ba_data/python-site-packages/urllib3/filepost.py": "4996ced73a251a0a0156317fd976325f",
"build/assets/ba_data/python-site-packages/urllib3/http2/__init__.py": "e2b631c71eba41cadcbd71097df87d0b",
"build/assets/ba_data/python-site-packages/urllib3/http2/connection.py": "98ec5901ae0a7ab8d54cb298f3797ea7",
"build/assets/ba_data/python-site-packages/urllib3/http2/probe.py": "24a017e7e59ca2060a4b7af53c15723a",
"build/assets/ba_data/python-site-packages/urllib3/poolmanager.py": "6dd72a45419efb9a2ab4e58c527d84d5",
"build/assets/ba_data/python-site-packages/urllib3/response.py": "f9f74417b5c2b4e5812b473435e3f455",
"build/assets/ba_data/python-site-packages/urllib3/response.py": "cd8b4207c24826e9099e872b05adc813",
"build/assets/ba_data/python-site-packages/urllib3/util/__init__.py": "3ef2c56aa3ccfc25f466dc767f191b2c",
"build/assets/ba_data/python-site-packages/urllib3/util/connection.py": "373bae67383b8abf80d88c0d4e26d2fe",
"build/assets/ba_data/python-site-packages/urllib3/util/connection.py": "a206a7fe88a9bd4809f5c4231821826d",
"build/assets/ba_data/python-site-packages/urllib3/util/proxy.py": "2de685261596886eb8e2655e1af9ce7b",
"build/assets/ba_data/python-site-packages/urllib3/util/request.py": "72389227066178a97711ead0d25a0868",
"build/assets/ba_data/python-site-packages/urllib3/util/request.py": "518d30e0d5a1a39193ca9fae83abd9fd",
"build/assets/ba_data/python-site-packages/urllib3/util/response.py": "e6a942417aa97215e358ae97b53bafe6",
"build/assets/ba_data/python-site-packages/urllib3/util/retry.py": "4eeffe54c7d400c4af731f02ef3fb074",
"build/assets/ba_data/python-site-packages/urllib3/util/ssl_.py": "6105f661daa3e837e9ff8fdf06b2037a",
"build/assets/ba_data/python-site-packages/urllib3/util/ssl_.py": "a86e6e28e06d8f9cb25783a258b7fe30",
"build/assets/ba_data/python-site-packages/urllib3/util/ssl_match_hostname.py": "cbb28520c901282629d47375af2dd717",
"build/assets/ba_data/python-site-packages/urllib3/util/ssltransport.py": "77fa0b9225a7d6033f1413687f575a96",
"build/assets/ba_data/python-site-packages/urllib3/util/ssltransport.py": "18d68e95de8a8480067e60bdbdf14f81",
"build/assets/ba_data/python-site-packages/urllib3/util/timeout.py": "e3bc037067fd6aaed823955be6f1792d",
"build/assets/ba_data/python-site-packages/urllib3/util/url.py": "6a37bafe6598aecba9e034be2085f583",
"build/assets/ba_data/python-site-packages/urllib3/util/url.py": "aa22f125aa8ae4dbf6c5490b5b89c924",
"build/assets/ba_data/python-site-packages/urllib3/util/util.py": "95e6d2fa1b0f310a991612421f1a29a1",
"build/assets/ba_data/python-site-packages/urllib3/util/wait.py": "0fe73d2b5515a9c1ff2d43a83d5a419a",
"build/assets/ba_data/textures/achievementBoxer.dds": "5b5c461e67f3a92105b56fe264a7dd28",
@ -4111,14 +4111,14 @@
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "8d1654b2e246359a24d2675d108213ce",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "e4a5ff44ae13ab883b338e8d67ef4a4e",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "e0271f9b10935bda462768bdd741171f",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "05a02ca028c8d7d8a8591a333ad27f35",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "0e1d189b5770b5e3be4af2d774110b96",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "0a8dc7ec29d7b2d8adad0584bea36a77",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "34ddde7177538daca7ca4ee9015dcd9b",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "63107e2b4e759aa760840a4a6b25cf97",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "c44a8a9a4d39b7071bbb3699388e72d1",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "eb455b5630633349f445543cdfa5cd9a",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "83ec8f327b1a921346d28399f5cc0615",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "976821defc488982092c4dddf09ba595",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "ed572175e0b27c1d7d14cd369aaf8f1d",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "b300b1ac073743dd181f89ae2a6116a1",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "9c3c4c0890fcd2f911db4812b1feb64c",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "ad3861231c0d809f71380b6c1f0fae66",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "4cfa78ebc61d065974d4b92183f97b20",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "c8c1f174ed35992eb71bf1ff22787f4e",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "67e1e5286f3fe64c9935e0e22d3fe443",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "c8c1f174ed35992eb71bf1ff22787f4e",
@ -4131,14 +4131,14 @@
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "1c2d42d75e8f975514b2e30f5602516d",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "b39713b9f3a9102fefff1f6d62a9fd82",
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "1c2d42d75e8f975514b2e30f5602516d",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "16d68f7f33f7a917ae16889ea6b38ade",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "f2198c3422ee6aca76b847e4cc00bd66",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "5900536bbd1b7d3759e63763e537f679",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "96f98cccea24abf47c4467375969c3d5",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "c32b0b157acd5970e9dd4e252a735689",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "42f8083d2248def6a79f18a40f412066",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "b3287f1cccb32d07b158052fd6a3d053",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "3d448bbf222d66671ff41e234e7060be",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "d20558dc79b1f464b1f5da827bd78e79",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "5bca0252f3d7e608b9f541197d944baa",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "4702a62d35c9cd754246f34b421a8b67",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "222878dda88f0277c3a2c0f4cc53c3dd",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "8de8c0b23fc58cf5e2647ea3ce27d7e6",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "6a2e4a3c09ca4b5fad3025428cc96f3e",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "82eba4f4dcbe6d5fc135dd52b1ae0c65",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "b4f58ebad5e593c9f1000ea6e3408ec5",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "06042d31df0ff9af96b99477162e2a91",

2
config/requirements.txt
View File

@ -19,4 +19,4 @@ types-certifi==2021.10.8.3
types-filelock==3.2.7
types-requests==2.32.0.20241016
typing_extensions==4.12.2
urllib3==2.2.3
urllib3==2.3.0

12
src/assets/ba_data/python/bauiv1lib/account/settings.py
View File

@ -63,10 +63,10 @@ class AccountSettingsWindow(bui.MainWindow):
assert app.classic is not None
uiscale = app.ui_v1.uiscale
self._width = 850 if uiscale is bui.UIScale.SMALL else 660
self._width = 980 if uiscale is bui.UIScale.SMALL else 660
x_offs = 70 if uiscale is bui.UIScale.SMALL else 0
self._height = (
380
430
if uiscale is bui.UIScale.SMALL
else 430 if uiscale is bui.UIScale.MEDIUM else 490
)
@ -95,7 +95,7 @@ class AccountSettingsWindow(bui.MainWindow):
if bui.app.config.resolve('Show Deprecated Login Types'):
self._show_sign_in_buttons.append('Device')
top_extra = 15 if uiscale is bui.UIScale.SMALL else 0
top_extra = 26 if uiscale is bui.UIScale.SMALL else 0
super().__init__(
root_widget=bui.containerwidget(
size=(self._width, self._height + top_extra),
@ -105,7 +105,7 @@ class AccountSettingsWindow(bui.MainWindow):
else 'menu_full'
),
scale=(
2.07
1.72
if uiscale is bui.UIScale.SMALL
else 1.4 if uiscale is bui.UIScale.MEDIUM else 1.0
),
@ -146,8 +146,8 @@ class AccountSettingsWindow(bui.MainWindow):
label=bui.charstr(bui.SpecialChar.BACK),
)
titleyoffs = -12 if uiscale is bui.UIScale.SMALL else 0
titlescale = 0.6 if uiscale is bui.UIScale.SMALL else 1.0
titleyoffs = -9 if uiscale is bui.UIScale.SMALL else 0
titlescale = 0.7 if uiscale is bui.UIScale.SMALL else 1.0
bui.textwidget(
parent=self._root_widget,
position=(self._width * 0.5, self._height - 41 + titleyoffs),

21
src/assets/ba_data/python/bauiv1lib/chest.py
View File

@ -65,18 +65,17 @@ class ChestWindow(bui.MainWindow):
origin_widget=origin_widget,
)
self._core_widgets.append(
bui.textwidget(
parent=self._root_widget,
position=(0, self._height - 45 + self._yoffs),
size=(self._width, 25),
text=f'Chest #{self._index + 1}',
color=bui.app.ui_v1.title_color,
maxwidth=150.0,
h_align='center',
v_align='center',
)
self._title_text = bui.textwidget(
parent=self._root_widget,
position=(0, self._height - 45 + self._yoffs),
size=(self._width, 25),
text=f'Chest Slot {self._index + 1}',
color=bui.app.ui_v1.title_color,
maxwidth=150.0,
h_align='center',
v_align='center',
)
self._core_widgets.append(self._title_text)
if uiscale is bui.UIScale.SMALL:
bui.containerwidget(

4
src/assets/ba_data/python/bauiv1lib/inbox.py
View File

@ -49,11 +49,11 @@ class InboxWindow(bui.MainWindow):
self._width = 600 if uiscale is bui.UIScale.SMALL else 450
self._height = (
380
375
if uiscale is bui.UIScale.SMALL
else 370 if uiscale is bui.UIScale.MEDIUM else 450
)
yoffs = -45 if uiscale is bui.UIScale.SMALL else 0
yoffs = -47 if uiscale is bui.UIScale.SMALL else 0
super().__init__(
root_widget=bui.containerwidget(