Merge branch 'master' of github.com:efroemling/ballistica

.idea/dictionaries/ericf.xml

@@ -1,6 +1,10 @@
 <component name="ProjectDictionaryState">
   <dictionary name="ericf">
     <words>
+      <w>onln</w>
+      <w>nprocessors</w>
+      <w>getconf</w>
+      <w>cpus</w>
       <w>aaaa</w>
       <w>aaab</w>
       <w>aaac</w>

Makefile

@@ -273,8 +273,9 @@ preflightfull2:
 #                                                                              #
 ################################################################################
 
-# This should give the cpu count on linux and mac; can expand this if need be.
-CPUS = $(shell getconf _NPROCESSORS_ONLN || echo 4)
+# This should give the cpu count on linux and mac; may need to expand this
+# if using this on other platforms.
+CPUS = $(shell getconf _NPROCESSORS_ONLN || echo 8)
 ROOT_DIR = ${abspath ${CURDIR}}
 VERSION = $(shell tools/version_utils version)
 BUILD_NUMBER = $(shell tools/version_utils build)

assets/src/data/scripts/_ba.py

@@ -4,6 +4,12 @@ The real _bs is a compiled extension module and only available
 in the live game. This dummy module allows Pylint/Mypy/etc. to
 function reasonably well outside of the game.
 
+Make sure this file is never included in an actual game distro!
+
+Ideally this should be a stub (.pyi) file, but we'd need
+to make sure that it still works with all our tools
+(mypy, pylint, pycharm).
+
 NOTE: This file was autogenerated by gendummymodule; do not edit by hand.
 """