diff --git a/.efrocachemap b/.efrocachemap index f6917df6..c366859b 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4096,26 +4096,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": "03ce0cbe2c5eb8576d814335c98ff1df", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "1bc4d43781710952837ed1f36cb9097a", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "26648500a2711df748e0da026c5714a0", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "ad48088c6950ea49afc507c945cd2c9c", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "4aff6fdd4acfdfc76510fe079acf6d1b", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "6e2bed02d26a055713d36ea1fda854bc", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "35b613d5c460e7da16dd4c8c2d4a5c62", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "645bfd279bce981998ba6178898d3d4d", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "5aed19cc3ced5e6f14b11cd9ec83c69e", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "42e4c96550b9f0b8a43605a0c568e48a", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "726b841da7222677fc01620b16be80a6", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "30d5973aff519624d7c5268d31a0d003", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "6d83c89cb4d4a2cdf73855e5e7c8fed6", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "34ff854bfcd18fa75a9bb620dfcd4da5", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "2b4f709911e8460bc2abe3acfccdbb04", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "67ec66ade109751e6af1242b63850b1e", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "ebe5c4ec18d47ab793a103960e5515ff", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "fb266361242881927093827411e6ab3d", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "90ef79c3a9ef580570ac01b6c7e20178", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "fb8a94307692e581bf60208f63d765eb", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "03751f224ff1d9cb180bd3c29fecfffc", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "3fda769fd02af8dbc52f21c75053ceef", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "645402b26da0b870165ccc19d3f1a9a3", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "4e2752ec4059f95cd547fce9a7b92ee6", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "907bdaadbd708758f1a1c2a1f25221bc", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "acc7943dcddbe9091f2b02d7de285320", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "550e45883913d6b79dac641d2fd62169", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "fb1469e7832b29285293a037016f0bc2", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "df690309667b176961fa8ff2dcbe3d66", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "dd40fc692b4a1059ed877cbef6a463de", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "d36435109f5c842bc42673656c456c6f", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "66d32acd4ef582737d0b1554ea24e024", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "e86abf7520d0fa01fde66895ee76b274", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "145da896caf778e6bf548cf92476659b", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "0d7a782902f38e96c77779bd11e3644e", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "d761efb5fe5934038b14fa5bb87e9555", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "9922c10e8c64291395e432b784c1aaa1", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "70dfd9b79a9355d3623e15f61295f89b", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "9c93da9a220ed8ddf54acd8e3320c8d8", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "df9dc6ad492e00051bade37be7ef2672", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "653df60722ed096b8cc3ac3a4196e5a5", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "f82c1e575e8f23c1e278db61a740a4d5", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "653df60722ed096b8cc3ac3a4196e5a5", @@ -4132,14 +4132,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "ea327f45634a8e42259c5ecadf219e36", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "547362a74979fa82b854a475dffeae90", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "ea327f45634a8e42259c5ecadf219e36", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "558ef83c31ba8a0e9541f856ad997af2", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "d1bf489578c3800c1c2135742b16dbff", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "7217b4688aa3a08f06c938e4d1c653ce", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "ae327c7127f2d4d487ed4c13f5958ae7", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "578b992ba4bebbb5b2895ebc923dd748", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "0d567bd2c97258e22d93ccc9591386c7", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "b8e9ac8dccc7f2afeda34fb2c1f74a32", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "c4f2c0e42696712ad208d24ab7e095b7", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "b590a38017172560a8fbda38ecb77960", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "56195775dd8d2c9dfdb268d1c1573087", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "876e8a437bfda095c2aa07f368db5339", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "e8e5d20dbcf6f7cc68fb13d814538374", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "72db0f512d4e5eb4604e187b0dc84cc7", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "2ff965a9427d9cf1a32f6ab03f7212de", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "db52582072dea3dc84b726022776ac03", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "778c8744b4c09e85a4269b2475469f72", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad", "src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d", diff --git a/CHANGELOG.md b/CHANGELOG.md index ae83084d..f5a527a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22045, api 9, 2024-10-19) +### 1.7.37 (build 22047, api 9, 2024-10-20) - Bumping api version to 9. As you'll see below, there's some UI changes that will require a bit of work for any UI mods to adapt to. If your mods don't touch UI stuff at all you can simply bump your api version and call it a day. diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 764b6b71..f20acadf 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -53,7 +53,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 22045 +TARGET_BALLISTICA_BUILD = 22047 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/ballistica/base/ui/dev_console.cc b/src/ballistica/base/ui/dev_console.cc index 1c7e3855..d8b57cd4 100644 --- a/src/ballistica/base/ui/dev_console.cc +++ b/src/ballistica/base/ui/dev_console.cc @@ -1450,8 +1450,9 @@ void DevConsole::Draw(FrameDef* frame_def) { // Make sure we don't muck with our UI while we're in here. auto lock = ScopedUILock_(this); - close_button_->Draw(pass, bottom); - + if (close_button_) { + close_button_->Draw(pass, bottom); + } for (auto&& button : tab_buttons_) { button->Draw(pass, bottom); } diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 0fd56f66..4e4d28dc 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -40,7 +40,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 22045; +const int kEngineBuildNumber = 22047; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9;