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

fix for chinese main menu

Browse Source
This commit is contained in:
Eric Froemling 2024-11-27 11:04:02 -08:00
parent 744f4d1c57
commit 399c0d640a
No known key found for this signature in database
6 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.efrocachemap generated
View File

@ -4099,22 +4099,22 @@
"build/assets/windows/Win32/ucrtbased.dll": "bfd1180c269d3950b76f35a63655e9e1",
"build/assets/windows/Win32/vc_redist.x86.exe": "15a5f1f876503885adbdf5b3989b3718",
"build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "24c6537904ce985dd7216ba6dfef8f6e",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "c15b16a984a3a8af8c116fb63444135e",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "e3811f382e8f8a22f26d298efb21fc06",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "b14eb7c44742718cd7f855e8b9688e75",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "525ae7fc03d49ba824bd4258d6790f67",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "229caf35b4055b42b1e76e022675e4eb",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "7476b2f3d1ab857822b7282ae4cebeb4",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "414330fe9e8ecb7b31965b819e6ebd4a",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "de5805b6595031a41dafed9253be801f",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "cbd5f88aea758ae25f605cf54fc5ad33",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "7bde0df040677f9c626b7a49bd659179",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "92ef148d99a09f82890ee4727f4225f0",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "8dcf15764f48f9cd172615532299f6da",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "f25a3f45bd83b54c3ee615a3da6f3745",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "f4baf3991bd4d57443bee54c6d36a44c",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "24ffd9de8672af2e614fe739eb96b605",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "33aa8f0257f8889ddaf3e082597abf9e",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "d41861dbe631c3f26e7075cd4c64f94c",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "4c06226db6899ac580ab369328a8312d",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c79fab4551849cce7f36d26b0fd3e79f",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "06537caa93a48aa799921815bd980b27",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "8602d264e0846fe45f1e2b3970d7894b",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "3f9d9133fdd508fda51606bc846c0226",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "5b7c17316266f2aee39783b22dd75dd4",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "6b3a18163e8cdd2eadf8e580f42b7b29",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "da0c31b8ca95cec2bcefcb866546875f",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "b418934d9075bd052538d91559c464f7",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "26e6d71fba6634c28d038a1249145bf5",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "5831ebc77ad9e14053697f4f7a16840a",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "7b298ce406161ecf3b0131e4bd94f6b9",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "3e40c128a7d0e33e09ee58b702e058e7",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "b24a2641600eb431260db6d10fdc6a41",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "6b5ba102e7c13652db95c30096f6bc25",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "cb8ab89546a0b0f1753de762055f64af",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "6b5ba102e7c13652db95c30096f6bc25",
@ -4127,14 +4127,14 @@
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "35edf150514277863503c69a3a04c3c6",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "0debb2bc242b680db4410353ef234659",
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "35edf150514277863503c69a3a04c3c6",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "e09835f55a587ae804925d97b6dcf72e",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "397e876e2e6e5d7ac4c997d3e3cbdc16",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "c4b2d10992e0d8e53b38b8b79cd4fd88",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "bbfec9d1f2e1d4063748e2a7fef41e72",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "a21eb53994c0365ad2b0be35cf6a2913",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "4f735a72e3b1c44b7d77975bb5372ea7",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "03543c396c2f5df8dad7b8f719c81c40",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "188f6eb9269cbc9adb4ce5f5620a8fdb",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "077b325b45832b61d88914831adef2b7",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "fd723434e5e0a18095dbe9220da8f83b",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "0e4f2710390f619ac23273c8bd91a825",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "a71ca1a123d96cd92d6f2b082dc0bde3",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "b2601eba3d0c9f97cae57d7713d26b48",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "00f22b71103a1d3927062d05e9915734",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "b4fdfe95bec8df6457ffed4195236e75",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a7dd16e737ceb208d2a8c04296d6d3dc",
"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": "3a583e7e03bd4907b21adc3bf5729d15",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.37 (build 22115, api 9, 2024-11-27)
### 1.7.37 (build 22116, api 9, 2024-11-27)
- Bumping api version to 9. As you'll see below, there's some UI changes that
will require a bit of work for any UI mods to adapt to. If your mods don't
touch UI stuff at all you can simply bump your api version and call it a day.

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

@ -53,7 +53,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be
# using.
TARGET_BALLISTICA_BUILD = 22115
TARGET_BALLISTICA_BUILD = 22116
TARGET_BALLISTICA_VERSION = '1.7.37'

33
src/assets/ba_data/python/bascenev1lib/mainmenu.py
View File

@ -581,25 +581,20 @@ class MainMenuActivity(bs.Activity[bs.Player, bs.Team]):
if custom_texture is not None
else bs.getmesh('logoTransparent')
)
logo = bs.NodeActor(
bs.newnode(
'image',
attrs={
'position': (x, y),
'texture': ltex,
'mesh_opaque': mopaque,
'mesh_transparent': mtrans,
'vr_depth': -10 + vr_depth_offset,
'rotate': rotate,
'attach': 'center',
'tilt_translate': 0.21,
'absolute_scale': True,
'scale': (
(2000.0, 2000.0) if custom_texture is None else None
),
},
)
)
logo_attrs = {
'position': (x, y),
'texture': ltex,
'mesh_opaque': mopaque,
'mesh_transparent': mtrans,
'vr_depth': -10 + vr_depth_offset,
'rotate': rotate,
'attach': 'center',
'tilt_translate': 0.21,
'absolute_scale': True,
}
if custom_texture is None:
logo_attrs['scale'] = (2000.0, 2000.0)
logo = bs.NodeActor(bs.newnode('image', attrs=logo_attrs))
self._logo_node = logo.node
self._word_actors.append(logo)

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 = 22115;
const int kEngineBuildNumber = 22116;
const char* kEngineVersion = "1.7.37";
const int kEngineApiVersion = 9;

2
src/ballistica/ui_v1/widget/root_widget.cc
View File

@ -648,7 +648,7 @@ void RootWidget::Setup() {
TextDef td;
td.button = achievements_button_;
td.width = 26.0f;
td.text = "34%";
td.text = "";
td.x = centerx;
td.y = centery;
td.scale = 0.6f;