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

fixed an issue with early ui sounds getting cut off

Browse Source
This commit is contained in:
Eric 2023-06-07 16:50:06 -07:00
parent 6e99e1a74a
commit aee8a0ce44
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
5 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
.efrocachemap generated
View File

@ -4072,26 +4072,26 @@
"build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/c5/09/4f10b8a21ba87aa5509cff7a164b",
"build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/ff/0a/a354984f9c074dab0676ac7e4877",
"build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/2a/1c/9ee5db6d1bceca7fa6638fb8abde",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ea/ac/927a791c93cc1e6160b7202c79d7",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/de/44/a79ac89addd007739685d89bae22",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c9/51/e112fb2c1e405cea79b24d619b8a",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/6f/4f/9f14fd6402306c9ab0232b5e8185",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/1d/5a/9029e36f46a1a67dad5bb6c8a2ad",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/83/3a/a91a13479eadad7a0094ca0b0489",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/4b/20/5ecde2d5ce73329387cccbdcc92a",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/51/5b/b99e665602e0789c474d92b5691b",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/70/6c/d9423e05572e8a0d69c3ebdd3115",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/4a/84/6080c3100fbde22c6c41afb999cc",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/52/63/643b9d489fda791a9fd4269bc9e1",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/2a/fd/230e6813e3a758e27be5dcc7f246",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/77/fa/de0aff4e77956c656c23e4614c80",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/b8/da/ad8b96a52b4b0f957067a74f480c",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/23/c0/eed89d718d27961e6eb2abe13f62",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/29/3d/831bf3a5fff2bc54d63d71ac1d34",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/be/55/3602d941aee9de09cb774389e7e1",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/92/f5/1f53fbad721edd3d26006409a9ba",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/d9/c5/5e8d95be1ed33e417c8bcfda33f1",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/0d/a9/9294b2c1935467adec45ce12f998",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/57/cf/fe513c33a572cdcfbbba9e76a537",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/3f/dc/b35efa449a34a40af97204dc0027",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/76/f7/b07fc9a280c607649265028e511e",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/dc/1f/9ee6f88ed657c465e5c18a937e42",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ac/fe/2bbd42cfdd1636f0b429c709e169",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/57/4a/f2aad7e06f9130d63d963146dea3",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/df/cf/401fc1dad742264fa10af1a93f9b",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/4a/6b/74200494c9ff5506d53dfadeedbb",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/52/1a/1c7b34726cfd69083c6ac7cb0751",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/ad/2e/a6dc78f3fd0de3378cdeb1ee0849",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/6f/ce/22702096896bd2648334fbabdb00",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/94/2f/d2e9fba5f220a16a0416aab24fd4",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/5f/84/4c71130875897f96a1852dc926e4",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/a0/c2/f90402315ad5fadfd39e8c93b83e",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ec/50/6cd315f45dcc28aa6a9c542475f0",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/59/39/102368cce793e002313b04d4c2fa",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/55/a9/862acc6882cd9d9c3242259362b8",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/bb/55/75de30d2dcec6bcada3e167ace4a",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/fe/18/4b0ea64c6e4d339373c6ce4dd513",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/89/c1/14800dfecf06745aa48c6bd11f71",
"build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/66/b7/4be2fcf57b9bc9cb12d97d6ac298",
"build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/4d/31/1654791c0ae8eb78b517b548f2f7",
"build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/62/04/d4b18d10e866785b23756d48f91c",
@ -4108,14 +4108,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/a7/38/f5ebf21a44b3968a1623ae839721",
"build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/b7/fa/1f32d0fedf5e54092d434bff20ed",
"build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/d2/5a/08f06543729620d0d08b31b4c0a4",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/27/9e/09ba177addf4728f8977fb3b0e69",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/b4/5a/c650ab354e214f6b532f1bbed952",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/9a/3e/2171d892b31fba64f264c5211377",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/32/df/e34d912551eb816c0f2760e281b4",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/5b/ec/11c0d050e8c7919dc087291262fd",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/99/e6/f269ceb5fa4893e6601696bdefc3",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/40/33/31f2ef159d286c0dd383557ab5ed",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/25/f6/5073484bf33596818469f86b2363",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/90/4a/e7373009c863cb50a741c89832a6",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/ba/d7/2e82016141f71fac12716b11c712",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/da/d9/0edd077345b39ce402d0a451ff87",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/f0/28/49238893669c104657695fd7ca4b",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/9f/ba/27e8f751e94b52b7ea181f2a7bd2",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/89/8a/4e92f77bb6a90b3b0b7f4f418c7a",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/be/61/253d4d74d66d4a6bf163a4e7cba8",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/60/28/09274265646c1080d10f2e854fe5",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa",
"src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/75/9f/bcf597b362c9f2480cb348188bdd",

8
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.20 (build 21061, api 8, 2023-06-07)
### 1.7.20 (build 21063, api 8, 2023-06-07)
- This seems like a good time for a `refactoring` release in anticipation of
changes coming in 1.8. Basically this means that a lot of things will be
@ -280,6 +280,12 @@
exact class names instead of the 'game' shortcut.
- (build 21060) Fixed a bug where epic mode was not in slow motion (but sounds
still were hehehehe).
- (build 21062) The audio server no longer stops all playing sounds when it is
reset. This behavior was intented to keep game sounds from 'bleeding' out into
the main menu, but with app-mode-switches now causing resets just after launch
it is making some early UI sounds (such as the 'power-down' sound if a plugin
disappears) sound cut-off and broken. Please holler if you notice any sounds
that get 'stuck' playing after games/etc.
### 1.7.19 (build 20997, api 7, 2023-01-19)

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

@ -28,7 +28,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be
# using.
TARGET_BALLISTICA_BUILD = 21061
TARGET_BALLISTICA_BUILD = 21063
TARGET_BALLISTICA_VERSION = '1.7.20'
_g_env_config: EnvConfig | None = None

22
src/ballistica/base/audio/audio_server.cc
View File

@ -644,10 +644,26 @@ void AudioServer::Process() {
}
void AudioServer::Reset() {
// Stop all playing sounds.
for (auto&& i : sources_) {
i->Stop();
// Note: up until version 1.7.20, the audio server would stop all playing
// sounds when reset. This would prevent against long sounds playing at
// the end of a game session 'bleeding' into the main menu/etc. However,
// these days, resets are becoming more common due to app-mode switches
// and whatnot, and the chances of cutting off an intended ui sound are
// growing. In particular, a 'power down' sound at launch when a plugin is
// no longer found is being cut off by the initial app-mode switch.
// So disabling the stop behavior for now and hoping that doesn't bite us.
// Ideally we should have sounds contexts so that we can stop sounds for
// a particular scene when that scene ends/etc. This would also fix our
// current problem where epic mode screws up the pitch on our UI sounds.
if (explicit_bool(false)) {
// Stop all playing sounds.
for (auto&& i : sources_) {
i->Stop();
}
}
// Still need to reset this though or epic-mode will screw us up.
SetSoundPitch(1.0f);
}

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 = 21061;
const int kEngineBuildNumber = 21063;
const char* kEngineVersion = "1.7.20";
auto MonolithicMain(const core::CoreConfig& core_config) -> int {