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

tidying

Browse Source
This commit is contained in:
Eric 2024-03-01 17:03:15 -08:00
parent 5a9a5a190d
commit e811679ec5
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
5 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.efrocachemap generated
View File

@ -4060,26 +4060,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": "1cf452ed4653e93921de7a2b6bb19669",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "2635ca7a0e0d9ca9291b0611a6e3a4a9",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "ae3efe5eaf140d58ad2404119f41f832",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "1f942a62356c44611567f92b8eeac697",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "dbc6bf037fe98ab85df435f0f5dcd64b",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "70a6974c4b620e124f05b40dcd6813db",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "5d01f7bc6644d3a67ca463af36bd5535",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "52471d786b3ee3fc810129b33d18f6a9",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "efd3526235cbaf84c126ece8260d39d2",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "a1c07fde2b8ab53fb9cf11d7f86a39d8",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "2361961394bf06d914077f41969e7013",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ec9d52d27119a55d8a86e40b04785cfc",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "0a10c3f196f48cd338b66240755d25ed",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "6af21795e58dfe4790686ae21886bfcd",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "ddb898d18b9f1a59e4fa9d57a6f7a7d8",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "10852d507a445bcadb19dd1468aff190",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "ad4c7c93ab7a7c31cf30719a05fcb412",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "ac24b39b493dc7ed6243e7d297b03992",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "12be5e9f91892836b5a0e1ef6280a71a",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "ebf1b09620266808688f72bf99785657",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "9cfdec94ec84dd9c8811631b8bb9794d",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "d0c987c9bb70256d74edac186d0f4162",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "6bbd0d415831f0dc029334e4bd19ef5c",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "1e74862be648297c9f2892e137456d54",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "85add7681422d4f26816c384230b754c",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "324e55800b57332cbaa16971d2806463",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "4977b35a78b3dd97a85d492ec2da8e74",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "da556d1a27865674bcfc5bfe9f317f29",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "26d122da6d23020090486f7869a80357",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "55938b5e06b1f5ed017e15a07a240e19",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "42b9cf187a57e5954ce3f601a92a2352",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "4967471f83df6bebee68f61eb272631a",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "6ca147ea4e4275d899b09fed75e42e61",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "d52e5f6ccec7284c964bffb3496d9ec4",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "032c2d040d0beb02d0f2c70d5480e4b9",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "6f926618da3c1601df5215cf4553a2bc",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "b4e179bcc1a36cd9c0ac9ec04899d4f8",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "0d15b7ed7ee2eea10e51e13c8bea9548",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "98eb49198af3b3f18968c193e947a563",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "d6cb1d65c3b092174298054f0dd782ea",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "ee36a39fd0f524989cb68930c89c8868",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "dbed9145e5db116d92aa47cb9e98da39",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "ee36a39fd0f524989cb68930c89c8868",

4
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.33 (build 21767, api 8, 2024-03-01)
### 1.7.33 (build 21769, api 8, 2024-03-01)
- 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).
- Added a 'Show Demos When Idle' option in advanced settings. If enabled, the
@ -22,6 +22,8 @@
classes forget to adapt to the change.
- Implemented `efro.dataclassio.IOMultiType` which will make my life a lot
easier.
- Punches no longer physically affect powerup boxes which should make it easier
to grab the powerup (Thanks VinniTR!).
### 1.7.32 (build 21741, api 8, 2023-12-20)
- Fixed a screen message that no one will ever see (Thanks vishal332008?...)

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 = 21767
TARGET_BALLISTICA_BUILD = 21769
TARGET_BALLISTICA_VERSION = '1.7.33'

2
src/assets/ba_data/python/bascenev1lib/actor/spaz.py
View File

@ -1226,6 +1226,8 @@ class Spaz(bs.Actor):
if not self.node:
return None
node = bs.getcollision().opposingnode
# Don't want to physically affect powerups.
if node.getdelegate(PowerupBox):
return None

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 = 21767;
const int kEngineBuildNumber = 21769;
const char* kEngineVersion = "1.7.33";
const int kEngineApiVersion = 8;