diff --git a/.efrocachemap b/.efrocachemap index b5e9f174..af852ec7 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3934,26 +3934,26 @@ "assets/build/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/1c/e1/4a1a2eddda2f4aebd5f8b64ab08e", "assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f", "ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a", - "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/34/e6/2023348d2e30796113cf9e1fff25", + "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/4f/e0/5a5aef75cf5f05fd8282ad92d1eb", "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/74/1d/fc9e33e565475daaac80da5252f0", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c7/8e/17f6ab7057a23b6bd8cf7b546d14", - "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c1/ca/1ebc3cc5da621c8eb476fd59d87a", - "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/40/a0/f117a6d90f40768e4c59eb3017bd", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c1/c8/92f9a0bf8969fcbd22927734606e", + "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e6/14/560fd83f1c5a0928611a76fde770", + "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/19/0e/d45bdd5617d5b4404e76ca1cb214", "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/7b/ac1a200be0f37078af0991faca3b", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/74/a3/17c72e2a90f42cf8113ee54140d5", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/94/6e/3d7662462b4a2390e78724dd7571", - "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/18/d3/13e89623484056df9b293e5bb557", - "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/6a/67/03e825ccc7d85940edb896a2a4fa", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e1/91/79f7ea75971674c4429db6f68b52", - "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e7/de/7aff816cc607f98e6060748a4e43", - "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/56/8e/bfd18c93e150f0210b6c59c55779", - "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ed/dc/cd73fe886f0563e3aa660a0fac63", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2d/64/f6c1ce2c84743a7379adeb480df9", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f3/5a/14a3669b9c0107ea31520b6cfdf4", - "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/37/7b/4470cd9677af871e523b95ad0092", - "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/fc/ea/96cba4392f86c5207f78eb7c3e97", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/57/81/7b9b1a4ecac8afca7e2a4fcacdc8", - "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/70/d7/ce06a0226af75ef6f2a86ac2e5ed", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fd/d2/6afb31906b505245196190546e51", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/91/0f/ab8b884c63ced885a6cf7630e8d9", + "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/5e/cf/8edaa19ea0a5eb13769626d1a540", + "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/cc/9b/9356a25f110fa3d4e8605b9e2904", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/15/81/8ab98b768524d02766ff8a354682", + "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/1e/fa/ad873063e48b4d24edf4e4aeb7cc", + "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/92/7b/66ee04a3dcf88cd518889d2e9e99", + "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/37/a8/798f929264b3d557b2ba88f2894d", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e1/75/6093230a354406f2f7c3a3c46f71", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cf/be/f4df8928742323c928e2c8415d75", + "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/73/4a/9d6e87d4a44eef10b6b9825306fc", + "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/0a/a2/0c173213a9a79c93ff2bc4696d85", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/bb/7a/9028eb0a7de38218ef06a767f875", + "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/f8/4d/b409a6528e441f92b8894c705fcf", "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/7d/b6/475f313a5e1163d8b18f81fda053", "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/6c/78/4d4cd81c4b925a202fe4d961ab69", "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ce/42/dabc253464415881a92d09a5cbcb", diff --git a/assets/src/ba_data/python/._ba_sources_hash b/assets/src/ba_data/python/._ba_sources_hash index 1c6abecb..fe0338ff 100644 --- a/assets/src/ba_data/python/._ba_sources_hash +++ b/assets/src/ba_data/python/._ba_sources_hash @@ -1 +1 @@ -260782962963330120203403491987170958879 \ No newline at end of file +168473775412204194101843586699698465034 \ No newline at end of file diff --git a/docs/ba_module.md b/docs/ba_module.md index f187e602..c28ddca8 100644 --- a/docs/ba_module.md +++ b/docs/ba_module.md @@ -1,5 +1,5 @@ -

last updated on 2021-06-12 for Ballistica version 1.6.4 build 20379

+

last updated on 2021-06-15 for Ballistica version 1.6.4 build 20381

This page documents the Python classes and functions in the 'ba' module, which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please let me know. Happy modding!


diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc index 31c1dd52..ba576957 100644 --- a/src/ballistica/ballistica.cc +++ b/src/ballistica/ballistica.cc @@ -21,7 +21,7 @@ namespace ballistica { // These are set automatically via script; don't modify them here. -const int kAppBuildNumber = 20380; +const int kAppBuildNumber = 20381; const char* kAppVersion = "1.6.4"; // Our standalone globals. diff --git a/tools/batools/project.py b/tools/batools/project.py index e16eb1d6..83820d81 100755 --- a/tools/batools/project.py +++ b/tools/batools/project.py @@ -669,20 +669,12 @@ class Updater: # Note: This should happen near the end because it may run the cmake # build so its success may depend on the cmake build files having # already been updated. - - # TEMP - dont do this in spinoffs - if 'ballistica' + 'core' != 'ballisticacore': - return - - # FIXME: should support running this in public too. - if not self._public: - try: - subprocess.run(['tools/pcommand', 'update_dummy_module'] + - self._checkarglist, - check=True) - except Exception as exc: - raise CleanError( - 'Error checking/updating dummy module.') from exc + try: + subprocess.run(['tools/pcommand', 'update_dummy_module'] + + self._checkarglist, + check=True) + except Exception as exc: + raise CleanError('Error checking/updating dummy module.') from exc def _update_docs_md(self) -> None: # Update our docs/*.md files.