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

bug fixes and tidying

Browse Source
This commit is contained in:
Eric Froemling 2025-01-11 18:48:50 -08:00
parent 2190568baf
commit 82ae1930d2
No known key found for this signature in database
7 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.efrocachemap generated
View File

@ -1962,10 +1962,10 @@
"build/assets/ba_data/textures/ninjaIconColorMask.pvr": "15a9d7c922affee6041871791a96dc98",
"build/assets/ba_data/textures/ninjaIconColorMask_preview.png": "b21a775abb3c4e4dd9a04192ab1e717b",
"build/assets/ba_data/textures/ninjaIcon_preview.png": "e88731a4ac740f6613c7da2aad57d64d",
"build/assets/ba_data/textures/nub.dds": "5b0be108fd46563219d34615fd49d91a",
"build/assets/ba_data/textures/nub.ktx": "5828f3706ca74ed49283d6e4695dfb9c",
"build/assets/ba_data/textures/nub.pvr": "8e60de9e7efa512d18a60ef61042dc38",
"build/assets/ba_data/textures/nub_preview.png": "69000c707e26e171b6ecbb104acd319d",
"build/assets/ba_data/textures/nub.dds": "b0de2808476a2fa7db11a895fa6d2b38",
"build/assets/ba_data/textures/nub.ktx": "b24cbef47d8ac5f87557789dab50d401",
"build/assets/ba_data/textures/nub.pvr": "f99208d88cfb93e323234eacd74482dd",
"build/assets/ba_data/textures/nub_preview.png": "1f1dffc38817559cfff57994d8bb282d",
"build/assets/ba_data/textures/null.dds": "12f8bd2be70d800719e8bff8cf17c642",
"build/assets/ba_data/textures/null.ktx": "a948a0fcadd2c7ff5ade346dc0856b92",
"build/assets/ba_data/textures/null.pvr": "d76c281253b3c791b76db8a7bbe03d35",
@ -4126,22 +4126,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": "2444899f2f36667dc27fcf5537fc76b6",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "efebe5318abe421031108d9908b4cb84",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "9b4928361ff7e3aa85ea6cca5f3903d8",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "9fad073f6fd49702ceb1ee5057c4f9de",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "ac52ed0994f33ea4997da21d0a7f6877",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "43f429f37c145fc2bf80c01dfd095a7e",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "ea87a5838b465c40b60ff911cccbe189",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "3cafa3287637bba5e56b363bb4fc8f9a",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "1fbe4ab96f25d20b421c8206c9230948",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "0a4dbc635f8e9b3f42e89dd2027bd9d3",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "6114856f2ab42ef6b20a1affdf53032d",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "bfa75071d993efc3853fa350c1de2bcb",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "3971d8deb2c33cfd18c4e3b338d48ec3",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "bd0c352337d72f020b431feca7974c3a",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "073b3690cfb03847ac3b3fe9c017e520",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "c7f0d9c4db7a67b4d72f3c406c585897",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "ec6a692435085ca5125fe2b92a689773",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "96ef4effdc8935ec6430ef40b7cf8df5",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "0f926426969841db0c0de9f2400c379a",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c44d3ce395e1e2ae66c0e6f7edeb5162",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "c3e94110b6b78f048fe851b9237eb318",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "7f8a6aaebc005da7fed6938c490583ad",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "befbdbdb24743dac71890d13fd91c9c9",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "b9eeb04d059008274ba3b8a8d43bee43",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "e259caf3538d721a6d98e75eea52232f",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "0301ee44945fdbe37f562b105bcfa637",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "0842805a2b7a22bd6611d675a3d5bc8b",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "455e8270255e204ff666d308729d8394",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "be8bdd483cf4076d82187893bcfba98c",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "9fb98b1315ddb8bc3ba0ca44c345deb8",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "4d1b42d4f49f40e3c476c9eed6a67d03",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "a03c4646e60092bb4c1b3554d878c067",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "1c375e8003442dd3d059bc0baa260e61",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "40daac4bbc8990d5140f97e792bc4fb1",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "1c375e8003442dd3d059bc0baa260e61",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.37 (build 22178, api 9, 2025-01-11)
### 1.7.37 (build 22180, api 9, 2025-01-11)
- 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 = 22178
TARGET_BALLISTICA_BUILD = 22180
TARGET_BALLISTICA_VERSION = '1.7.37'

5
src/assets/ba_data/python/bauiv1lib/coop/browser.py
View File

@ -77,7 +77,7 @@ class CoopBrowserWindow(bui.MainWindow):
self._width = 1520 if uiscale is bui.UIScale.SMALL else 1120
self._x_inset = x_inset = 200 if uiscale is bui.UIScale.SMALL else 0
self._height = (
600
585
if uiscale is bui.UIScale.SMALL
else 730 if uiscale is bui.UIScale.MEDIUM else 800
)
@ -114,7 +114,7 @@ class CoopBrowserWindow(bui.MainWindow):
else (0, 0) if uiscale is bui.UIScale.MEDIUM else (0, 0)
),
scale=(
1.28
1.31
if uiscale is bui.UIScale.SMALL
else 0.8 if uiscale is bui.UIScale.MEDIUM else 0.75
),
@ -271,6 +271,7 @@ class CoopBrowserWindow(bui.MainWindow):
simple_culling_v=10.0,
claims_left_right=True,
selection_loops_to_parent=True,
border_opacity=0.3 if uiscale is bui.UIScale.SMALL else 1.0,
)
self._subcontainer: bui.Widget | None = None

3
src/assets/ba_data/python/bauiv1lib/playlist/browser.py
View File

@ -75,7 +75,7 @@ class PlaylistBrowserWindow(bui.MainWindow):
else 'menu_full'
),
scale=(
1.83
1.85
if uiscale is bui.UIScale.SMALL
else 1.05 if uiscale is bui.UIScale.MEDIUM else 0.9
),
@ -144,6 +144,7 @@ class PlaylistBrowserWindow(bui.MainWindow):
(self._width - self._scroll_width) * 0.5,
65 + scroll_offs,
),
border_opacity=0.4 if uiscale is bui.UIScale.SMALL else 1.0,
)
bui.containerwidget(edit=self._scrollwidget, claims_left_right=True)
self._subcontainer: bui.Widget | None = None

6
src/ballistica/classic/support/classic_app_mode.h
View File

@ -315,9 +315,9 @@ class ClassicAppMode : public base::AppMode {
int public_party_max_size_{8};
int public_party_player_count_{0};
int public_party_max_player_count_{8};
int root_ui_tickets_meter_value_;
int root_ui_tokens_meter_value_;
int root_ui_league_rank_value_;
int root_ui_tickets_meter_value_{-1};
int root_ui_tokens_meter_value_{-1};
int root_ui_league_rank_value_{-1};
float debug_speed_mult_{1.0f};
float replay_speed_mult_{1.0f};
std::set<std::string> admin_public_ids_;

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