RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-04 22:43:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'efroemling:master' into master

Browse Source
This commit is contained in:
Loup 2024-03-28 01:38:06 +05:30 committed by GitHub
commit 0fd5d9012d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
.efrocachemap generated
View File

@ -4065,26 +4065,26 @@
"build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1",
"build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae",
"build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "68988eb045930433a6ac6397ca156bad", "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "088595496eb98a04878bbe73946b7183",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "8924197d7363ddfb4a923a1d51db7ddc", "build/prefab/full/linux_arm64_gui/release/ballisticakit": "c71ab153668ac6e7a3c86928d710b3dc",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "2cc0143361f00a3ea59de1b9054d9ce5", "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "047852a837e1998fe4244fc9d0f42bf4",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "13796a31af7e8aaa9a1a518d4e5c175b", "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "ab587bae74ec414fb61923bea711caee",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "b56ba2f46d6d088d75cee8872cf3c7df", "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "26557cd14dd30a17c84f8fb4abfd46d2",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "5b9f684a79d67ec2c4ea14d5386c8de7", "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "cb0885abc1eec8519b61fb8c385c2cda",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "80f13200a26eda3456eae5992f218393", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "e23061489f67b8f07dce2c4b5f114d8e",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "d67459c3f44e6e0ea178023b8e82cfb4", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "6c9570104d3313f91a36931acafd1090",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "4a3a8545010c12f898af4795d15c86d3", "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "4a222cf12c0aedc1849a4cda65888bd6",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "9f57177cc7db82e93b048cbdad0f3c61", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "4d2b3597d0ea7378e4152c90526cc001",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "f1514e03d3fc753bf4df52d4901868e1", "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "600f4dbd16e018c595787cc67dc492c8",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ee375ea49a35ee7c3c284b63a3ff755c", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "456eb5053a70ce81098f3a9e8c7b8d78",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "d6d6762cdb7598cb3436ef61271a7815", "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "25a4969b483dae90698bfafdb9044567",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "eb1dada933a1e744db4455992fd4f154", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "80c62e2c9d1af776395558d667884959",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "e27aebbd341333b198066992db46a6eb", "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "265be70294eb9450795233e5ef3ce047",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "8a3bee929c484351a55a6f482054cec1", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "7c9d660f3c7e98f37dc5be7a33e96f13",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "c66cea7467a1cbcea2d6ff4a6e743e8c", "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "cb468d2c627656ec3c2e171037f5b441",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "29d2805ecef443e43cc95b76c2e7c090", "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "07576bd78acb5677f165f3a670d1310e",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "1b8b679bb2a2bd54a7002c66bdb889bc", "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "d3e9aefb90569f613e20882ef83bc1f2",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "14ce63b78fe3041fac1b26085f9eee38", "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "2323982b6c4db2350db00c90f06ed4cb",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "56d6440f62c271c4ce9ef520400395a3", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "56d6440f62c271c4ce9ef520400395a3",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
@ -4101,14 +4101,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316", "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "fbdc80e41c5883b4a893d2f0786e377f", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "fbdc80e41c5883b4a893d2f0786e377f",
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "43edc64f4c732a421664dc15b1b8b493", "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "5d8cce09bb4d34d5ad9cca10d5e86a7d",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "5221111391ba00ac9c06c3c1fadfc0ad", "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "17c879a37a4938b41b17abf83400c4ee",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "6830b06a75a0f5154e050374ffd83fcd", "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "61f19ec01a97eddcae5f7f9f5d91fbcb",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "2c60620d9c6585243439216c07f3d8c8", "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "ad33e025f2152edac9525ed509083752",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "2d480a032a9ddbbadcfec70485214560", "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "5bf65de8110b375aac82366eed736514",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "561f5cfc561139c59d4cf8a811d89c83", "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "ac0a5895a757b956199914e00307c93b",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "eda67fbf1f31b25edc4e4f8b40925497", "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "34253c7a153f2f6d405761ce4e15b388",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "0110ae9500ae4d5f77a24c1a34bc3cf8", "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "bc347fde61c8a74299ac7a3b493178bc",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d", "src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f", "src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f",

2
CHANGELOG.md
View File

@ -1,3 +1,5 @@
### 1.7.34 (build 21797, api 8, 2024-03-27)
### 1.7.33 (build 21795, api 8, 2024-03-24) ### 1.7.33 (build 21795, api 8, 2024-03-24)
- Stress test input-devices are now a bit smarter; they won't press any buttons - Stress test input-devices are now a bit smarter; they won't press any buttons
while UIs are up (this could cause lots of chaos if it happened). while UIs are up (this could cause lots of chaos if it happened).

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

@ -52,8 +52,8 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be # Build number and version of the ballistica binary we expect to be
# using. # using.
TARGET_BALLISTICA_BUILD = 21795 TARGET_BALLISTICA_BUILD = 21797
TARGET_BALLISTICA_VERSION = '1.7.33' TARGET_BALLISTICA_VERSION = '1.7.34'
@dataclass @dataclass

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

@ -39,8 +39,8 @@ auto main(int argc, char** argv) -> int {
namespace ballistica { namespace ballistica {
// These are set automatically via script; don't modify them here. // These are set automatically via script; don't modify them here.
const int kEngineBuildNumber = 21795; const int kEngineBuildNumber = 21797;
const char* kEngineVersion = "1.7.33"; const char* kEngineVersion = "1.7.34";
const int kEngineApiVersion = 8; const int kEngineApiVersion = 8;
#if BA_MONOLITHIC_BUILD #if BA_MONOLITHIC_BUILD