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

tidying

Browse Source
This commit is contained in:
Eric 2024-05-08 14:32:27 -07:00
parent 3b4352e089
commit af5b5c5f44
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
5 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
.efrocachemap generated
View File

@ -421,7 +421,7 @@
"build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26",
"build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8",
"build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55",
"build/assets/ba_data/data/langdata.json": "a8147a30aac3fd2c4bfbc60da738821e",
"build/assets/ba_data/data/langdata.json": "0c2ec8664b0b0898af12b2e0f6f612c7",
"build/assets/ba_data/data/languages/arabic.json": "5c27239be3d4f8daefd9f3bd7e99ff8d",
"build/assets/ba_data/data/languages/belarussian.json": "0a2b0ae82298cec42764558b5b49e4dd",
"build/assets/ba_data/data/languages/chinese.json": "fcd59e90c12e8106ce418b65b97b3db6",
@ -430,12 +430,12 @@
"build/assets/ba_data/data/languages/czech.json": "15be4fd59895135bad0265f79b362d5b",
"build/assets/ba_data/data/languages/danish.json": "8e57db30c5250df2abff14a822f83ea7",
"build/assets/ba_data/data/languages/dutch.json": "b0900d572c9141897d53d6574c471343",
"build/assets/ba_data/data/languages/english.json": "5bc58c53dddf71088f5cbe862c4a320b",
"build/assets/ba_data/data/languages/english.json": "14e00f19f17c647d0a994666d5fe2991",
"build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880",
"build/assets/ba_data/data/languages/filipino.json": "5d28e03d97a3626e790481401ee894a4",
"build/assets/ba_data/data/languages/french.json": "ee2a81129519d7030a617308da8c9195",
"build/assets/ba_data/data/languages/german.json": "eaf3f1bf633566de133c61f4f5377e62",
"build/assets/ba_data/data/languages/gibberish.json": "1b448b3a3cfdc30cef31dc3d899f8d21",
"build/assets/ba_data/data/languages/gibberish.json": "9c35571f89e6cf3bd6d40be4c5026f29",
"build/assets/ba_data/data/languages/greek.json": "ad3c0d38f34d809824892d6f22808dbf",
"build/assets/ba_data/data/languages/hindi.json": "bb3548531daf7bc7fee4a28d48228c32",
"build/assets/ba_data/data/languages/hungarian.json": "6b08fea24b72cc805ed0dc59e11c4cd6",
@ -444,13 +444,13 @@
"build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597",
"build/assets/ba_data/data/languages/malay.json": "f6ce0426d03a62612e3e436ed5d1be1f",
"build/assets/ba_data/data/languages/persian.json": "fbf51bb87c6f5fe63c6a3aee38713f31",
"build/assets/ba_data/data/languages/polish.json": "ac63e339b68819009300f839a9bbd3b2",
"build/assets/ba_data/data/languages/polish.json": "e850b757f3c34d1f77f89e8bb07ba94e",
"build/assets/ba_data/data/languages/portuguese.json": "ab295421a4449ae01aeed3633426ba2f",
"build/assets/ba_data/data/languages/romanian.json": "b3e46efd6f869dbd78014570e037c290",
"build/assets/ba_data/data/languages/russian.json": "cba5f250a272a4a4eea28ceece9fd549",
"build/assets/ba_data/data/languages/serbian.json": "d7452dd72ac0e51680cb39b5ebaa1c69",
"build/assets/ba_data/data/languages/slovak.json": "3c08c748c96c71bd9e1d7291fb8817b6",
"build/assets/ba_data/data/languages/spanish.json": "c380ea87d11cfb129b661dfd3781edc9",
"build/assets/ba_data/data/languages/spanish.json": "af4c3890520e6d574a6ccbb11427f8cb",
"build/assets/ba_data/data/languages/swedish.json": "5142a96597d17d8344be96a603da64ac",
"build/assets/ba_data/data/languages/tamil.json": "b9fcc523639f55e05c7f4e7914f3321a",
"build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945",
@ -4038,26 +4038,26 @@
"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": "8ed7212a80b4b9ae361c64b998510afb",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "68ec82ad9e95305bb59dbd21379dfd6d",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "eb221e55254713d9070a0a01841cb74c",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "2b2d22949d533e1b1a4aa963782d20e2",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "2a01f1c1b14f46c75f03635e42b46450",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "196d2b43faa5e50dfa0ab766f7d99fea",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "b5a01fbaad2d10e11c52a1a069f47460",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "80a1780477074a8078012ea5173d8457",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "fe7ad5af71566bc62a5a8f2ae153397c",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "3166e547f1d0183d556da1458c865aec",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "9ff1b3838395fce75149aed51394ffca",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "d1101b65c7a1b82cad4c4d2d3e1d546e",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "470666e6db2a64417b953af77bc6c174",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "48ec6f972e5e33a49a67fb26ca79c720",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "d6fe0e17ebeef966409ecb7e36f68de6",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "dbf54df43f705ab70b29e47cb8b3469a",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "e2b04c1467d449f9724b1df66967d75f",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "93f1b0628dd7a3531888c01dfac7c9b8",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "1fd89dd5fc2d34b42c5f62c9afe3a20d",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "b59e9d245688d77790f975600a51bfea",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "1e01a48ea73c61114540a327d36cd7a2",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "ec571b29d0135d663af0cadefb16a500",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "159d55cbae70c3eacd42cca935c1a586",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "a18694dc2bbb3120d2a7f4687bbe8fd6",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "63bb298945f95b04909cec06499113a9",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "43637522bf8727004851a69fbff4efb8",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "8fa9bc2af99fb88a39f70e55a4551cda",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "7409872c1c1930c18d08995314cb9348",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "aeb9b3d2af28cb666c30ee67eed88c4c",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "3d603cbde1ee7da072371bfb241af984",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "6e73ab056973cf2cda7ae73291de0139",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "8f358dcc42666726e2781f6afcb55624",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "d143e64d68afed9b7ddc4aefb063e1ec",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "a7de7b1db0cb1e959544d4ab87aa5afc",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "11fc44591493afb6558e439f0a6468fa",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "ff36664d18f25783928d175684a09751",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "a54abb3622ac5c6dbc76550a3bf9fb55",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "dca30c659dfaeab394780a49d368d987",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "450a861140f90ee75994001b58f13764",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "44a64c787c438902c50b9f475994b696",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "24c1641a1bef7c56d8b3805fbd01ac30",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "3da37afad8903a3c24c38fb698a19ce1",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "24c1641a1bef7c56d8b3805fbd01ac30",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.35 (build 21850, api 8, 2024-05-08)
### 1.7.35 (build 21851, api 8, 2024-05-08)
- Fixed an issue where the engine would block at exit on some version of Linux
until Ctrl-D was pressed in the calling terminal.
- V2 accounts have been around for a while now, so the old V1 device login

2
src/assets/ba_data/python/baenv.py
View File

@ -52,7 +52,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be
# using.
TARGET_BALLISTICA_BUILD = 21850
TARGET_BALLISTICA_BUILD = 21851
TARGET_BALLISTICA_VERSION = '1.7.35'

43
src/assets/ba_data/python/bauiv1lib/settings/devtools.py
View File

@ -91,12 +91,13 @@ class DevToolsWindow(bui.Window):
self._title_text = bui.textwidget(
parent=self._root_widget,
position=(0, self._height - 52),
size=(self._width, 25),
position=(self._width * 0.5, self._height - 48),
size=(0, 25),
maxwidth=self._width - 200,
text=bui.Lstr(resource='settingsWindowAdvanced.devToolsText'),
color=app.ui_v1.title_color,
h_align='center',
v_align='top',
v_align='center',
)
if self._back_button is not None:
@ -126,6 +127,24 @@ class DevToolsWindow(bui.Window):
v = self._sub_height - 35
this_button_width = 410
v -= self._spacing * 2.5
self._show_dev_console_button_check_box = ConfigCheckBox(
parent=self._subcontainer,
position=(90, v + 40),
size=(self._sub_width - 100, 30),
configkey='Show Dev Console Button',
displayname=bui.Lstr(
resource='settingsWindowAdvanced.showDevConsoleButtonText'
),
scale=1.0,
maxwidth=400,
)
if self._back_button is not None:
bui.widget(
edit=self._show_dev_console_button_check_box.widget,
up_widget=self._back_button,
)
v -= self._spacing * 1.2
self._create_user_system_scripts_button = bui.buttonwidget(
parent=self._subcontainer,
@ -155,10 +174,7 @@ class DevToolsWindow(bui.Window):
parent=self._subcontainer,
position=(170, v + 10),
size=(0, 0),
text=bui.Lstr(
value='$(S) :',
subs=[('$(S)', bui.Lstr(resource='uiScaleText'))],
),
text=bui.Lstr(resource='uiScaleText'),
color=app.ui_v1.title_color,
h_align='center',
v_align='center',
@ -185,19 +201,6 @@ class DevToolsWindow(bui.Window):
on_value_change_call=self._set_uiscale,
)
v -= self._spacing * 2.5
self._show_dev_console_button_check_box = ConfigCheckBox(
parent=self._subcontainer,
position=(50, v),
size=(self._sub_width - 100, 30),
configkey='Show Dev Console Button',
displayname=bui.Lstr(
resource='settingsWindowAdvanced.showDevConsoleButtonText'
),
scale=1.0,
maxwidth=430,
)
def _set_uiscale(self, val: str) -> None:
cfg = bui.app.config
cfg['UI Scale'] = val

2
src/ballistica/shared/ballistica.cc
View File

@ -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 = 21850;
const int kEngineBuildNumber = 21851;
const char* kEngineVersion = "1.7.35";
const int kEngineApiVersion = 8;