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 2025-01-15 07:40:57 -08:00
parent d1aad2bbde
commit 37aa658215
No known key found for this signature in database
6 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.efrocachemap generated
View File

@ -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": "c303bdf2bdf6e791eb868ebcdd4aa856",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "73aa001b9f357bced88a71c0eee3b18d",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "9d375baafe0cafdef9c65305bdf199fe",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "457e335910c0cf4ddbc2812e588ab368",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "09ff10f18fd1a11dc6e88b6433fd41d5",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "b28ae54d392027eb067164c959f053c6",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "75c4c58d9ba193d1d08a9a162bbd4e26",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "184163f241440de55fc054a845235dd0",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "862909706233b2aeb32f10ad1a12ad3a",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "367f56bea35b31b5a3c735df2838f90f",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "e74ef2c48341e00031246283ae9b2029",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "f9d87871c64ff4e41c8d823dae336915",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "d4d7823950d5f36f5d26bb0330dff002",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "5f0c0e81cbfa5e5ba77c5d00e3e3fc2f",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "7df1ef6774fde146e50975dc64939f2a",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "d4f1011dc938bd4c1f11d308174a853c",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "e3a5178f4a9c07f5626866340fcd6761",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "520e3cdae54bcbe4a553d2a35b827256",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "ed0efbd3e89b971e6967a282d87fb60f",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c36431562e626820a1ecf2c419e46742",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "47e36c7c7f90d109de13b0b507d8ec05",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "78aaaabbe1f3fd97b0857e5a46e0002b",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "b00a7ba07f20b51f021e362c9b9916a0",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "5482f7a7986f7724ccfb60c9d6a289f5",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "baeabc492c8cb31dac07a320bf4094ce",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "4d6ec640e77368dc9223c6c5d41a9244",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "9a0bd08b9a11d80a393258b2627e4161",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "8b60b06de182bd187561a0c1ea1bdf1c",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "186c9c33567737c015deac3689123448",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "c71a751f92d398685a9a3b9834d3a03c",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "0a1f5d06fe2a506898eaa7438eb1e934",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "ca72c9f8a170c5a1a9346df611680abc",
"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",
@ -4154,14 +4154,14 @@
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "36bb6f32ab12e2a46b82155a93b2e527",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "51884d81e2d7bdeb6b59a72f0247c8e1",
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "36bb6f32ab12e2a46b82155a93b2e527",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "3f099257c64339fc33ed4ce76caf0632",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "0bd94da070a0865b1c4fdb9fe6359de2",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "f0030f259a17ee8e355d6d9e7a8d0785",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "11f52862b337e1ea424ccc1cd3a619cb",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "68f8395f083bdcdee5a97e44a532f25f",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "932c69024d166b37d70cd1f0ce9d27b0",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "43fc198b8bdfae4040e0e841e37c5067",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "df1d3d4fac93534b980a72817ecab32d",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "88fc6cf69e715b4025bf960138094c67",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "869b621cc4e19e401d773ec304791c6d",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "ceb6642a0796ce20b8028c340d7c25d0",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "3e2e0def5503d7551f8dbae46fa9df47",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "41e14d98470df303de936d6fbe8ed892",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "9b53f17503f13cc248b900eea61bdfae",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "830ba578408a13c1cd0f1d2b767ec8b4",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "ddf1ca6a19c481c8da177ed4cbf7ff4f",
"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
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.37 (build 22192, api 9, 2025-01-14)
### 1.7.37 (build 22194, api 9, 2025-01-15)
- 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 = 22192
TARGET_BALLISTICA_BUILD = 22194
TARGET_BALLISTICA_VERSION = '1.7.37'

7
src/assets/ba_data/python/bauiv1lib/coop/tournamentbutton.py
View File

@ -628,9 +628,6 @@ class TournamentButton:
self.tournament_id
]['maxPlayers']
print('GOT GAME', game)
print('GOT ID', self.tournament_id)
print('GOT PLAYERS', max_players)
txt = bui.Lstr(
value='${A} ${B}',
subs=[
@ -705,8 +702,8 @@ class TournamentButton:
]['freeTriesRemaining']
assert isinstance(free_tries_remaining, int | None)
# Now, if this fee allows ads and we support video ads, show
# the 'or ad' version.
# Now, if this fee allows ads and we support video ads, show the
# 'or ad' version.
if USE_ENTRY_FEES:
if allow_ads and plus.has_video_ads():
ads_enabled = plus.have_incentivized_ad()

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

@ -84,7 +84,7 @@ class _TextSection(_Section):
color=self.color,
scale=self.text_scale,
flatness=1.0,
shadow=0.0,
shadow=1.0,
text=self.textbaked,
size=(0, 0),
h_align='center',

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