diff --git a/.efrocachemap b/.efrocachemap index 6ba29bf3..48b75350 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4099,26 +4099,22 @@ "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": "d7f10c3f6cdb9cf2b617408c4021ba94", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "cc61292668bd17f2fe46e073773d2987", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "b2c092184364928890c77282a5544e9e", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "7372c74f2900f47bcd6953693f788d72", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "de7bc22871f4214832c3b4c790b4457e", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "3a1a9dbaf55a6972507fe91885968329", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "28e0068b529459277dc8dff13a4b591e", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "cb61d50e234885ba9f1843e890c5ae34", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "a21a8e51e8e8d3d7c36e15b06bd120ee", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "94c19f209b480f260da24974a79528cd", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "75c5b1163cb47ef155dbe217e6eaff66", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "473c6da755e14a6becaab77e8a5ad177", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "fc088b90200fd64bc7ca39bd66c3ac17", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "b0c911dd26aef2eea3718fe21d515147", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "8309970d3378f504cf6ff9acca114c53", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "de6f251f4a1db14a170ae1233706b40d", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "c043048569de57aa73a7932477686daa", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "0bdcf13be49ad1ff44651454d91644b6", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "1acca8f96d3aa0d6498b12061fae34da", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "ad6ce2536044431404556f86047aafd7", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "d314072db12fb7b512b5551f3526064d", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "de67e2ff928077e015b6166d581efd42", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "679d2308b6be9873e2d6d47dde6461e1", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "2923b1965be6eb525f0352c446c3eb15", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "4e5fe5c5015f1a134322bd334db88428", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "c6aed5533db188434ae3df4ddfa0cddd", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "4f83277af92eaf69a0dac219f2cece75", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "0dbfb2a09158a1ee6860f179b427fe61", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "49d1361fefd89847ddd921b4445ccf78", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "9ee5f22221e773306739819a950cfaa9", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "a77bfd134b20060f2b83a303e41129e5", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "fc5a9eff06eb6de7b42f46fd3a6d33d9", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "71732602d609176f8416ef031f87fd52", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "077af171f0d39e36162a98eb5feb8b0f", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "94675c3b5ec959d0c773e20871145879", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "338d00e0e7a49e896d213452be843c50", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "45b1203c8f48993bb49cb5ede270cbbf", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "462796ac70e26fe008fc0930753e8036", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "45b1203c8f48993bb49cb5ede270cbbf", @@ -4131,18 +4127,14 @@ "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "601828216b02db67da60ae8f0f75964e", "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "b028662de3f7a0343598bdc09b12cde8", "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "601828216b02db67da60ae8f0f75964e", - "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "9da47d5c11e1ef092a181c59ff4b9e6c", - "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "bb665a4035cd8ec9352d20c59c72031c", - "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "9a326b4ecd0db9be46adf95955f8da6f", - "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "bb665a4035cd8ec9352d20c59c72031c", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "6aed3577c3fcda71e12c1fe30378d4fd", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "4e0cd227ae0c03b33d4a9bd9789cf842", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "f6c02f3d7adbd8d960cda84c78c86e3d", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "44ecea795acdc1d254d44e18596deafd", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "5c624572ecf795f7d43493d1e77b7080", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "d075a3419e244eb14c4b7db6d772085e", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "cc1265b8a182bb775e6f8f710d313dc3", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "810e6b37b1a7b121e764ad141da523c4", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "c792a6a1d0d3de0aeea89a7cafe11fe5", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "acb9f54a7d90e4dabdd2106c837fd15b", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "e18042b7cbc21ce21669900f5817d04f", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "a8a35c2e560175170a04fb81ed02d619", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "3eb8eb76b3a73e27bd583f5e2a731c5d", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "4d4249637e801668528999bde9f65b21", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "c79d8bea3202597b3b210e819c11aff4", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "dc2ec3b1c241ef0e4d4580f84f47c4d9", "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": "3a583e7e03bd4907b21adc3bf5729d15", diff --git a/CHANGELOG.md b/CHANGELOG.md index 860dd7f6..a4b45712 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22091, api 9, 2024-11-11) +### 1.7.37 (build 22094, api 9, 2024-11-11) - 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. @@ -147,6 +147,11 @@ connections are being blocked. Do not enable this if you don't need to. - (build 22085) Added protection against an attack consisting of spamming invalid game-query packets. +- Using prefab builds on a Mac now requires an Apple Silicon machine (M1 or + newer). Mac x86 prefab builds were becoming a major bottleneck in pushing out + updates. Please let me know if you are making substantial use of prefab builds + on an x86 Mac and I can reconsider. Note that this only concerns the prefab + build system; regular official game builds still fully support x86 Macs. ### 1.7.36 (build 21944, api 8, 2024-07-26) - Wired up Tokens, BombSquad's new purchasable currency. The first thing these diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index ea992fc4..728ae275 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 = 22091 +TARGET_BALLISTICA_BUILD = 22094 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 6c486942..e5e5f69c 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 = 22091; +const int kEngineBuildNumber = 22094; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9; diff --git a/tools/batools/build.py b/tools/batools/build.py index cfae1b42..2880eef7 100644 --- a/tools/batools/build.py +++ b/tools/batools/build.py @@ -73,6 +73,10 @@ class PrefabPlatform(Enum): if system == 'Darwin': if machine == 'x86_64': + if bool(True): + raise CleanError( + 'Prefab builds now require an Apple Silicon mac.' + ) return cls.MAC_X86_64 if machine == 'arm64': return cls.MAC_ARM64 diff --git a/tools/batools/pcommands.py b/tools/batools/pcommands.py index b064a863..50ab5786 100644 --- a/tools/batools/pcommands.py +++ b/tools/batools/pcommands.py @@ -735,6 +735,7 @@ def make_prefab() -> None: if len(sys.argv) != 3: raise RuntimeError('Expected one argument') + targetstr = PrefabTarget(sys.argv[2]).value platformstr = PrefabPlatform.get_current().value