RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-29 18:53:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Eric 2024-07-03 06:06:06 -07:00
parent bd5b7b5a21
commit 04b4382e77
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
5 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
.efrocachemap generated
View File

@ -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": "c23492bd300919d79039f2294b0b2b96",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "1220df4e2f1c30a081600d5966e11ba9",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "1e17e08b7b0afc087853426e54473204",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "0744710d8c77a89ce7aa9e4cd1c91a10",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "aa40e107e5743c4ec1f59e480e0341f4",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "d90cf4082d1ea71c8d9248d4722f97e2",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "2c790ef5608e89c401abc0b34bcfbd1b",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "ce80a14162abc545be2f47b40745cf66",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "a00e0d193c8d1c85552038eef0449aa2",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "070268d237140e8a0ae20673c1364c1c",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "0bee20c9c3e0281ddd9123433c5b1963",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "5b98c6dff8d810278fc652bd4eaf837a",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "77e8c57a0539546bdf4701973dd45403",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "4af2d88098a91eee8ea7eddebcf89821",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "bce5ce779d30476276ffbbfb4eec9fec",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "9005b6210b66e0bb89d8be17410c5b1c",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "1ff12e04bd894104ea4a5a5a16dbbe15",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "5e504cad6f1140e1b9eb1068889af808",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "f016ca258adbace89ac23a4dcc2e5609",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "64455571d8ea90833df23d255092b779",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "7ea21b956aa0575649262988b7049f37",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "c996dca7ac3ac8cb9102f59b4edd559a",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "fa6c0d0529bb81ecc1599bef9e1b7a4f",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "82bc337931e1b8a62e21fadbb35d5e20",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "5eb9c4cde16d5c712565e783f0d950dd",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "b28d53c77d3ecdf4c4d65b3ee33939f6",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "ceff0920782392b99b5aff053840f52e",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "912c9556a8f8c3c8427111c3612a780a",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "5a3166f85284af6376b0124f6a2f85ae",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "049b04cd9fb7c589a8a3503c183f32ca",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "8df5a16883aea84e673bbbffeb996ee2",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ed75be48842f35723b46d65ce3ff0309",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "f5c512b0117e4140e3d4b2b01935400c",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "ddb52b163d7967c453872118367522c5",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "ff335ddc0573a11794aaf7a7267edf28",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "aae50a433b92b072cd9c9fadef788332",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "a6a3e6502365e88117ebfa7a2fcca4ef",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "236223ba897a0ad01726adff2b5ca990",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "71819003709db16323b7220d5f7c78d6",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "55fc8b3223fd69fae8a2c790e7241bef",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "f231b10895bdcb542de87b887ca181fd",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "ae936a119668ede7b36f38c8672f4bf8",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "f231b10895bdcb542de87b887ca181fd",
@ -4074,14 +4074,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "efffc4f330e77530accd9a9f82840a6c",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "c20363fe2af3d54e666b1c8ee67f6b76",
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "efffc4f330e77530accd9a9f82840a6c",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "30611985d939ca8757f9ae2e1663c953",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "389dcc02b8b856aff7a737d42d693bbb",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "26c0a3c1865c9a41f0f85b1f0caa1c28",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "5ff8ca7bcae0ecf6dea50ac5e026fe52",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "afeb8a7f6a0adafbffd40e2ef606ddf4",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "e9267b4d56a2893626c4a868f3527c4b",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "dfaeb5ff8741dcd12581c5986364274c",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a6a94aa6c8eeecda9628d3e4bd756b92",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "af8b790f9f8d96740b09ef1a2d84aac8",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "d65d2cbf7f882756fa35fecbe89fe961",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "51e89466567087a660c4e8fbf0590868",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "d31d8d10b9dfe1408eff4f7ef638a855",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "3b594417a6d6b8b26dc7d1f8934c00b0",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "c5f1b0f3cafad705d946195f387d56d4",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "63e3c96246155705e270f0b71ba58210",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a3cc059c0057ef9f6d70c39c660ce0d7",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "5548f407d97e380069f6c596c4e36cd7",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.36 (build 21905, api 8, 2024-07-02)
### 1.7.36 (build 21907, api 8, 2024-07-03)
- Wired up initial support for using asset-packages for bundled assets.
- bacloud workspace commands are now a bit smarter; you can now do things like
`bacloud workspace put .` or even just `bacloud workspace put` and it will

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 = 21905
TARGET_BALLISTICA_BUILD = 21907
TARGET_BALLISTICA_VERSION = '1.7.36'

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 = 21905;
const int kEngineBuildNumber = 21907;
const char* kEngineVersion = "1.7.36";
const int kEngineApiVersion = 8;

3
tools/batools/staging.py
View File

@ -556,7 +556,8 @@ class AssetStager:
# Just going with raw json here instead of dataclassio to
# maximize speed; we'll be going over lots of files here.
with open(
f'.cache/assetmanifests/{self.asset_package_flavor}',
f'{self.projroot}/.cache/assetmanifests/'
f'{self.asset_package_flavor}',
encoding='utf-8',
) as infile:
manifest = json.loads(infile.read())