diff --git a/.efrocachemap b/.efrocachemap
index 057ab683..10931f64 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/4e/53/7ec6327e532452541ad97ff927ab",
- "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/70/7f/d853bede37c4b91d822cf853fc51",
- "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/9f/be/93c11fb8a237efcec5fe9e95b52f",
- "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a2/4a/cd3f8408329ac476450b14d961a4",
- "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/0f/6e/fb1fffbb11902f90edd5ea3ff257",
- "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f0/f7/9cb910b949bab6ac8b4c82f8b03d",
- "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/f2/1e/483962e078392dafe3c47ab56ec8",
- "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ca/70/1c30ceee55f2a89657507b7023d7",
- "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/56/89/69526aeb40798e71afe19984b68f",
- "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/93/d1/23e82bfbdfb38bf3e443939490be",
- "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/e5/a2/96201ceeefb90d6ebb4b81089b67",
- "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/55/42/cfd614f84ade2658ba12dff258b6"
+ "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/24/62/ba95f1a18d481f1cb6c154db5a1c",
+ "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d4/59/3e6553fa8d37f195a138d2464025",
+ "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/20/c0/0584548c8a8b198d44a31fcacc2d",
+ "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/8d/71/28e1828d3a3b35372b260cfd8cf3",
+ "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/77/e7/f7dc1cb46460bcb19ba179407af4",
+ "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/74/d4/f583f9cf258c28966dbd55b9cb1f",
+ "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/f5/9d/a15377aa4b028dac302332be6e7a",
+ "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a8/2e/e69ef7d8ca7ed3bb2cd680fdb0a0",
+ "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/61/c7/01c3ecce17f17166c9b848b19bdc",
+ "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/8d/de/f25b5905e1fb3a1e9ce01cf7b946",
+ "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/90/2f/f2244495552190f95b4de21b9538",
+ "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/60/42/2352f743f4b871106b5e92ffeebc"
}
\ No newline at end of file
diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml
index 255c242b..6507a224 100644
--- a/.idea/dictionaries/ericf.xml
+++ b/.idea/dictionaries/ericf.xml
@@ -975,6 +975,7 @@
iserverget
iserverput
ispunch
+ ispunched
isubval
isysroot
itms
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18789952..57f9ac4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
-### 1.5.19 (20114)
-- Cleaned up some bomb chain-reaction logic to avoid weird corner-cases such as land-mine explosions behaving like punches when set off by a punch. Holler if anything explosion-related looks broken.
+### 1.5.19 (20123)
+- Cleaned up some bomb logic to avoid weird corner-cases such as land-mine explosions behaving like punches when set off by punches or bombs potentially resulting in multiple explosions when triggered by multiple other bombs simultaneously. Holler if anything explosion-related seems off now.
+- Reactivated and cleaned up fatal-error message dialogs; they should now show up more consistently and on more platforms when something really bad happens instead of getting a silent crash.
+- Certain hardware buttons on Android which stopped working in 1.5 should now be working again..
### 1.5.18 (20108)
- A bit of project cleanup; tools/snippets is now tools/pcommand, etc.
diff --git a/assets/src/ba_data/python/ba/_app.py b/assets/src/ba_data/python/ba/_app.py
index 184da001..fbb88a8a 100644
--- a/assets/src/ba_data/python/ba/_app.py
+++ b/assets/src/ba_data/python/ba/_app.py
@@ -520,13 +520,6 @@ class App:
# it to the server and/or get rid of it.
_apputils.handle_leftover_log_file()
- # Notify the user if we're using custom system scripts.
- # FIXME: This no longer works since sys-scripts is an absolute path;
- # need to just add a proper call to query this.
- # if env['python_directory_app'] != 'data/scripts':
- # ba.screenmessage("Using custom system scripts...",
- # color=(0, 1, 0))
-
# Only do this stuff if our config file is healthy so we don't
# overwrite a broken one or whatnot and wipe out data.
if not self.config_file_healthy:
diff --git a/assets/src/ba_data/python/ba/_netutils.py b/assets/src/ba_data/python/ba/_netutils.py
index ea138d01..0fd9ed2e 100644
--- a/assets/src/ba_data/python/ba/_netutils.py
+++ b/assets/src/ba_data/python/ba/_netutils.py
@@ -158,10 +158,13 @@ class ServerCallThread(threading.Thread):
elif isinstance(exc, OSError):
if exc.errno == 10051: # Windows unreachable network error.
pass
- elif exc.errno in [errno.ETIMEDOUT]:
+ elif exc.errno in [errno.ETIMEDOUT, errno.EHOSTUNREACH]:
pass
else:
do_print = True
+ elif (self._response_type == ServerResponseType.JSON
+ and isinstance(exc, json.decoder.JSONDecodeError)):
+ pass
else:
do_print = True
diff --git a/docs/ba_module.md b/docs/ba_module.md
index fe520533..e8f344b3 100644
--- a/docs/ba_module.md
+++ b/docs/ba_module.md
@@ -1,5 +1,5 @@
-last updated on 2020-07-05 for Ballistica version 1.5.18 build 20108
+last updated on 2020-07-08 for Ballistica version 1.5.19 build 20119
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!