diff --git a/.efrocachemap b/.efrocachemap index ccd2a426..5114ba42 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4064,26 +4064,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": "7cf705701bab34748af15971e5f9a90f", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "dd38cb0d13d5432403c6aa5a9360f201", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "4f07365746d6da86428e377754513bd5", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "4fac288787b04ed0e2c997c2fd421507", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "96af1ce7bf69f5ff0cff7af6f7a1cad6", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "24cc85e509d291341cdb4da2a6cbcc58", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "60b419b8bd702d2d76b02d0295d125b0", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "983d31837bbf1dc128f96668de4554e6", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "e611c1bc08f1d2e04c29e87626d457c6", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c847a2653d487d5893f53670d7108dec", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "073e725787ad536eff4a7baca9d6944f", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "11191672f8b7fffc240be03e7a610d14", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "e94e4e55d1a286c5cb5f1c280c6fc735", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "7131406bf0f32bc579929307e26d86cc", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "4b1955f776c8c2697311ca99619bbb4b", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "7dce31f3707233a351e26ffbf40f37e2", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "6b3ab059b402032177c1066d94be69f5", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "b06d14a8368bf049cef7166b945b5179", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "76921b371d70572df5a788b252d7bdf3", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "17e05e083b67ca6b83bcb8cc8a096779", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "6e8c0b5c28b62540f046c2ba38168608", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "b097a52e72eb501bc33585a3bd54b988", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "fcfda4425d3ce0d60e82660dc5e3660a", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "1ae03e80c9ac8a0caddbaa52d6675f37", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "872caac576c0c8fed8c7f591edb035db", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "d1b2ebe83c2ce40af748e9f98c6ac179", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "2d27be5a852c7f5321b4d83c02dfd050", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "7c1f46daa627b16b36ef29d1ff28c1a3", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f152ea8d6f80de022ed9332f361139b5", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "a172802fb8a1f9e07460f12a0ac4f863", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "38f35f3b37cd9696639c34b0d6e74505", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "fc3cd78f2f6820ffffdbf3fe7bb64c19", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "1e9bf4419bb99d6cde7237c0d9f7f810", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "f243db567e1b19997460568b585a0584", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "3593beacdda3443066feb96ed5805b0e", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "37e2b26a57a9240a81ea2ff77c09d800", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "f8a8e15b53645a3c1b0b2173a9682200", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "ba56e540170084daff5686efb3f53cd0", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "7f852d4ff1372722087ca4b07ba31bcf", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "6a9ae109fdbef22d975c536608419c9b", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "6ccd6f2bd0e20520063d4bf8e2c016d0", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "82e76d58eab4962ee7567fbc655072d6", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "6ccd6f2bd0e20520063d4bf8e2c016d0", @@ -4100,14 +4100,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "6b00cce1baf5f95d36ae911cdcb23dba", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "8708149fb6208e4e5889b4742784623d", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "6b00cce1baf5f95d36ae911cdcb23dba", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "a1ef4bb4e27d76089c190ed2203c498b", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "c72e1610acaca9ddbb425b21fd2b9cb0", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "2f53cc39631dad4c8932f1255644fba9", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "b16beacb638319086d6d70ecf2b67bc0", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "16a7028dbc1443127f8d53d4387606a6", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "2f7ba6a6a59cd9944c81dbba95dfeef7", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "fb12abbd4d7b19b13c6e20d87e2cc8b5", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "3325c38eb737213bffe773e84e769ebf", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "4d37d8db6457ea6fe36a8a1f8937f17d", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "8272e1708fae9ffbb2fbccab2fe33b66", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "e03d37a1cd44b30ab15dd8170ed13c23", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "2582464cd41de669ec508f55b992910f", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "c9849e097b112f073eff906610c35ee0", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "34cb97fc702b45ca805a651d4a96513b", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "ee693eb5f303cfe5df15d8cb6ee6f0ee", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "575fedd00692a44a3f958cf06f3d9d7b", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "f8cd3af311ac63147882590123b78318", "src/ballistica/base/mgen/pyembed/binding_base.inc": "ad347097a38e0d7ede9eb6dec6a80ee9", diff --git a/CHANGELOG.md b/CHANGELOG.md index bdcd690b..260448bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.28 (build 21325, api 8, 2023-09-07) +### 1.7.28 (build 21326, api 8, 2023-09-09) - Renamed Console to DevConsole, and added an option under advanced settings to always show an ugly 'dev' button onscreen which can be used to toggle it. The diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 3e5c3e5a..a886959b 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21325 +TARGET_BALLISTICA_BUILD = 21326 TARGET_BALLISTICA_VERSION = '1.7.28' diff --git a/src/ballistica/base/base.h b/src/ballistica/base/base.h index cbe74a24..dba6f777 100644 --- a/src/ballistica/base/base.h +++ b/src/ballistica/base/base.h @@ -787,7 +787,7 @@ class BaseFeatureSet : public FeatureSetNativeComponent, std::string console_startup_messages_; std::mutex shutdown_suppress_lock_; - bool shutdown_suppress_disallowed_; + bool shutdown_suppress_disallowed_{}; int shutdown_suppress_count_{}; bool tried_importing_plus_{}; bool tried_importing_classic_{}; diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 52b62beb..1576606e 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -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 = 21325; +const int kEngineBuildNumber = 21326; const char* kEngineVersion = "1.7.28"; const int kEngineApiVersion = 8;