diff --git a/.efrocachemap b/.efrocachemap
index d0b4c525..ec6b11d7 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -4135,16 +4135,16 @@
"assets/build/windows/x64/vc_redist.x64.exe": "https://files.ballistica.net/cache/ba1/ea/19/8b8787d81abcdce158ba608cd24f",
"assets/build/windows/x64/vcruntime140_1d.dll": "https://files.ballistica.net/cache/ba1/11/d8/ff6344b429b00c24d9a1930d4338",
"assets/build/windows/x64/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/20/33/0825e11e6518f87ece3009309933",
- "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ff/62/5125915d72879180babf3d26b2fc",
- "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/dd/0f/42f87cbaceb401bed5981f137d4a",
- "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/99/58/5a2a52d0b9d3c0fc57b90246bdb2",
- "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/86/07/e15c1708be88dc2069d16b654624",
- "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/4c/ba/33f8898f39a83ccf6e3965828bb3",
- "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d7/07/cf5586ecebc8360c011fa7f268eb",
- "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/1f/87/4420eed6d8a61ba456bd958a22cb",
- "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/00/97/dcb47fff319f0539fb65eb6d39c5",
- "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/85/cc/001c4778eda9e1ee1ecea4c22bab",
- "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/f1/f4/35e9d455770501d48b89cd7d5a43",
- "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/e6/d0/b26b16a1e3abc54cf9d46c1d14bf",
- "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/58/34/9577c9876162458e59f66e72c8e5"
+ "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/89/4c/40cf1444b54cde1b8bf8596612ea",
+ "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c8/7b/ae898aca9e1000a7ceef18e7d90a",
+ "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/50/a8/139b0aab8e196efcdcabce873fb8",
+ "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/59/ab/fb77b5befd76e55b0ef287f09cc9",
+ "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ac/d9/f45a67d978cacfb1cf67d9f572b7",
+ "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/9e/dc/496e106c69b04e6e287812fd513c",
+ "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/1c/bc/b4e726affda0ccef4fbe18301f9d",
+ "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ca/03/42277cc689249139bbf713f100f9",
+ "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/68/78/189de5c70bcaa4a854b6075ec363",
+ "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/7e/8d/7967bcd04e49a1b59905f1bd2a88",
+ "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/26/ff/949c3339724acb558b731eedb62d",
+ "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/96/cd/d251d1699675f1741570fb7d2d93"
}
\ No newline at end of file
diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py
index eba2eed8..afa2ece8 100644
--- a/assets/src/ba_data/python/_ba.py
+++ b/assets/src/ba_data/python/_ba.py
@@ -34,7 +34,7 @@ NOTE: This file was autogenerated by gendummymodule; do not edit by hand.
"""
# (hash we can use to see if this file is out of date)
-# SOURCES_HASH=30991209163728546136111726610486266810
+# SOURCES_HASH=215440954657254583733032942455994403734
# I'm sorry Pylint. I know this file saddens you. Be strong.
# pylint: disable=useless-suppression
diff --git a/assets/src/ba_data/python/bastd/ui/settings/testing.py b/assets/src/ba_data/python/bastd/ui/settings/testing.py
index 3bdb2679..be3c17df 100644
--- a/assets/src/ba_data/python/bastd/ui/settings/testing.py
+++ b/assets/src/ba_data/python/bastd/ui/settings/testing.py
@@ -106,7 +106,7 @@ class TestingWindow(ba.Window):
entry_name = entry['name']
- # if we haven't yet, record the default value for this name so
+ # If we haven't yet, record the default value for this name so
# we can reset if we want..
if entry_name not in ba.app.value_test_defaults:
ba.app.value_test_defaults[entry_name] = (
@@ -132,14 +132,14 @@ class TestingWindow(ba.Window):
if i == 0:
ba.widget(edit=btn, up_widget=self._back_button)
ba.widget(edit=btn, show_buffer_top=20, show_buffer_bottom=20)
- entry['widget'] = ba.textwidget(
- parent=self._subcontainer,
- position=(h + 100, v),
- size=(0, 0),
- h_align='center',
- v_align='center',
- maxwidth=60,
- text=str(round(_ba.value_test(entry_name), 4)))
+ entry['widget'] = ba.textwidget(parent=self._subcontainer,
+ position=(h + 100, v),
+ size=(0, 0),
+ h_align='center',
+ v_align='center',
+ maxwidth=60,
+ text='%.4g' %
+ _ba.value_test(entry_name))
btn = ba.buttonwidget(parent=self._subcontainer,
position=(h + 140, v - 19),
size=(40, 40),
@@ -174,19 +174,19 @@ class TestingWindow(ba.Window):
_ba.value_test(entry['name'],
absolute=ba.app.value_test_defaults[entry['name']])
ba.textwidget(edit=entry['widget'],
- text=str(round(_ba.value_test(entry['name']), 4)))
+ text='%.4g' % _ba.value_test(entry['name']))
def _on_minus_press(self, entry_name: str) -> None:
entry = self._get_entry(entry_name)
_ba.value_test(entry['name'], change=-entry['increment'])
ba.textwidget(edit=entry['widget'],
- text=str(round(_ba.value_test(entry['name']), 4)))
+ text='%.4g' % _ba.value_test(entry['name']))
def _on_plus_press(self, entry_name: str) -> None:
entry = self._get_entry(entry_name)
_ba.value_test(entry['name'], change=entry['increment'])
ba.textwidget(edit=entry['widget'],
- text=str(round(_ba.value_test(entry['name']), 4)))
+ text='%.4g' % _ba.value_test(entry['name']))
def _do_back(self) -> None:
# pylint: disable=cyclic-import
diff --git a/config/toolconfigsrc/projectile b/config/toolconfigsrc/projectile
index 11766487..e7af40de 100644
--- a/config/toolconfigsrc/projectile
+++ b/config/toolconfigsrc/projectile
@@ -1,3 +1,2 @@
+/tools
+/assets/src/ba_data/python
-+/ballisticacore-android/BallisticaCore/src
diff --git a/docs/ba_module.md b/docs/ba_module.md
index d7a89752..c51a7a6f 100644
--- a/docs/ba_module.md
+++ b/docs/ba_module.md
@@ -1,5 +1,5 @@
-last updated on 2020-06-13 for Ballistica version 1.5.4 build 20067
+last updated on 2020-06-15 for Ballistica version 1.5.5 build 20069
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/tools/batools/build.py b/tools/batools/build.py
index 95d03e9a..0b88edde 100644
--- a/tools/batools/build.py
+++ b/tools/batools/build.py
@@ -399,7 +399,7 @@ def gen_fulltest_buildfile_apple() -> None:
# (throw release build in the mix to hopefully catch opt-mode-only errors).
lines.append('nice -n 18 make mac-appstore-release-build')
lines.append('nice -n 18 make mac-new-build')
- lines.append('nice -n 18 make mac-server-build')
+ lines.append('nice -n 18 make cmake-server-build')
lines.append('nice -n 18 make cmake-build')
if DO_SPARSE_TEST_BUILDS:
extras = SPARSE_TEST_BUILDS[dayoffset % len(SPARSE_TEST_BUILDS)]
diff --git a/tools/snippets b/tools/snippets
index 8e1fb344..25bb7722 100755
--- a/tools/snippets
+++ b/tools/snippets
@@ -43,32 +43,11 @@ from efrotools.snippets import (
sync, sync_all, scriptfiles, pycharm, clioncode, androidstudiocode,
makefile_target_list, spelling, spelling_all, pytest, echo,
compile_python_files)
-# from efrotools.snippets import compile_python_files as _orig_compile_py_files
# pylint: enable=unused-import
if TYPE_CHECKING:
from typing import Optional
-# def compile_python_files() -> None:
-# """Override for compiling python files."""
-# from pathlib import Path
-# import subprocess
-# import os
-# from efrotools import getlocalconfig
-
-# # Run the standard command
-# _orig_compile_py_files()
-
-# # Optionally also blow away blessing status to keep it clear that
-# # things need to be re-blessed.
-# blesspath = Path(PROJROOT, 'tools/bless')
-# if os.path.exists(blesspath) and getlocalconfig(PROJROOT).get(
-# 'auto_clear_blessing', False):
-# subprocess.run([blesspath, 'clear'], check=True, cwd=PROJROOT)
-
-# # Copy the original func's doc-string
-# compile_python_files.__doc__ = _orig_compile_py_files.__doc__
-
def archive_old_builds() -> None:
"""Stuff our old public builds into the 'old' dir.