diff --git a/.efrocachemap b/.efrocachemap
index 93c29242..060f61fb 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -420,12 +420,12 @@
"assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/04/0a/c4f7d2794b018593ab0b2bcb07f0",
"assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/06/4d/18777c9a2eb2207a2891a2837a70",
"assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/81/90/23ab1ecc8c55267bd904a9c05344",
- "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/90/18/f6865956be7b13e7b8cdc6a3f06c",
- "assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/a9/3c/63857b3f5f943205d7a5d8f8e476",
+ "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/af/5d/5475c7fa4b5899788c5b3e241e01",
+ "assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/6a/11/c33066f52828a303d62613254148",
"assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/49/5f/b29bb65369040892fe6601801637",
"assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/45/68/29dd2936391a747f99227423675b",
"assets/build/ba_data/data/languages/chinesetraditional.json": "https://files.ballistica.net/cache/ba1/d1/96/688ec16a817f34509e69109a431d",
- "assets/build/ba_data/data/languages/croatian.json": "https://files.ballistica.net/cache/ba1/bb/9c/360fc084e6254a087096993af219",
+ "assets/build/ba_data/data/languages/croatian.json": "https://files.ballistica.net/cache/ba1/c7/ea/7b4357666b328b991fe82ea9a3fb",
"assets/build/ba_data/data/languages/czech.json": "https://files.ballistica.net/cache/ba1/dd/5a/14ca3ebb92a802315921e2b2b215",
"assets/build/ba_data/data/languages/danish.json": "https://files.ballistica.net/cache/ba1/3f/46/e4da3c1d2b0ebf916df55c608b28",
"assets/build/ba_data/data/languages/dutch.json": "https://files.ballistica.net/cache/ba1/d1/07/37b7adc3dbec7328d26c5325f212",
@@ -437,10 +437,10 @@
"assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/17/78/3fd0dca40e632ce53d03a944e7fa",
"assets/build/ba_data/data/languages/hindi.json": "https://files.ballistica.net/cache/ba1/11/56/ed2b07866104596338f7ce582d64",
"assets/build/ba_data/data/languages/hungarian.json": "https://files.ballistica.net/cache/ba1/87/2d/027aa239eb66ea8f496562f4fd83",
- "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/a3/b6/8987b9fc6a7cb0f61364f567c901",
+ "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/a9/71/817446169ae436e6775f76cd5aec",
"assets/build/ba_data/data/languages/italian.json": "https://files.ballistica.net/cache/ba1/82/7b/fac54bd2911a93d3d50df3c25ee2",
"assets/build/ba_data/data/languages/korean.json": "https://files.ballistica.net/cache/ba1/0a/84/bbb6ed2abf66509406f534cbbb52",
- "assets/build/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/39/33/5aaa68496edca5b6d9c988b657cb",
+ "assets/build/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/86/bf/284e1d1c6f07720828754b1ad4c9",
"assets/build/ba_data/data/languages/polish.json": "https://files.ballistica.net/cache/ba1/1d/55/f8a3d9c1d8132527b1f273bdf7f7",
"assets/build/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/b7/d8/4713322c35511a50e00b0aaead5a",
"assets/build/ba_data/data/languages/romanian.json": "https://files.ballistica.net/cache/ba1/44/3c/7cc06ca8d5475e1687d0ed05bdbf",
@@ -449,9 +449,10 @@
"assets/build/ba_data/data/languages/slovak.json": "https://files.ballistica.net/cache/ba1/b7/0a/fab820b96e7aa587ee56427ecdc2",
"assets/build/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/c2/bc/a426b99c4fde5f1eeeac97cf3600",
"assets/build/ba_data/data/languages/swedish.json": "https://files.ballistica.net/cache/ba1/50/9f/be006ba19be6a69a57837eb6dca0",
- "assets/build/ba_data/data/languages/turkish.json": "https://files.ballistica.net/cache/ba1/82/7c/5363de81ac6823935098df95dc66",
+ "assets/build/ba_data/data/languages/turkish.json": "https://files.ballistica.net/cache/ba1/fc/68/afb751f913d8ae75effebc95f4a0",
"assets/build/ba_data/data/languages/ukrainian.json": "https://files.ballistica.net/cache/ba1/b8/8c/ac972d1936acf2aaa1d06a4b5ce6",
- "assets/build/ba_data/data/languages/vietnamese.json": "https://files.ballistica.net/cache/ba1/96/96/b2e468ceec8800b7b0f1e1c5977c",
+ "assets/build/ba_data/data/languages/venetian.json": "https://files.ballistica.net/cache/ba1/ae/ec/9335bf4749a979061be7b8e6d613",
+ "assets/build/ba_data/data/languages/vietnamese.json": "https://files.ballistica.net/cache/ba1/04/52/683a27aaf9aa7c63e7e595f80d08",
"assets/build/ba_data/data/maps/big_g.json": "https://files.ballistica.net/cache/ba1/47/0a/a617cc85d927b576c4e6fc1091ed",
"assets/build/ba_data/data/maps/bridgit.json": "https://files.ballistica.net/cache/ba1/03/4b/57ee9b42854b26f23f81bd8c58ef",
"assets/build/ba_data/data/maps/courtyard.json": "https://files.ballistica.net/cache/ba1/03/38/344dd05bfef7bbdf464035ec5aa2",
@@ -3927,16 +3928,16 @@
"assets/build/windows/Win32/ucrtbased.dll": "https://files.ballistica.net/cache/ba1/b5/85/f8b6d0558ddb87267f34254b1450",
"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",
- "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c1/bd/ada4f12eadaa33f3fcf4f1b70ede",
- "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ba/85/c4389f7f89b870b1685e9eed5eec",
- "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/df/26/962a1518a29fe8f1c1048b574c35",
- "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/6d/e6/2fb6f02fac2a8c7ffc1f3ebf4786",
- "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e9/94/aadedc02a13bb4eb697ce9d7f9a4",
- "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a9/0b/755d9f57d38ce4de022d3909ed1c",
- "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/1f/aa/188da0d5b891f43c417275d430d2",
- "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/5d/bd/70427b399c0f72820c7e9dbeafd2",
- "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/06/f4/de0f4e54f5ad6c0b6989adeaaafe",
- "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/b7/ea/80b27468b5fb287e5bff9e7a3085",
- "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/3c/d0/4244f654e02b5465ea397a7e8b61",
- "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/3a/65/529b2aa735e8a1c0b7f047cf5653"
+ "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fc/51/42cfaaf8101f604adbf7bdcb7c34",
+ "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a9/b6/2a886ca52b15e3c1a4ac7ca327f3",
+ "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/c7/e5/cf5c585713f11c691047580a1f0c",
+ "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/59/7e/0fd8ce8fb147026004e8a6a313f4",
+ "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ce/4b/75871cc1df9b1536818717a03714",
+ "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f0/94/bfb8f62d52af7a114e36f90a3f1c",
+ "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/77/3f/65c310bf29312f1fcb75f7d92fc9",
+ "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/20/11/51e2583fbb531888d79559a0ff92",
+ "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/20/f2/a60ad18026aaefb0261a595781d6",
+ "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/b6/ac/54d5bb63ee411bb0cc10ce76e5bf",
+ "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/33/e7/4e471804132ec72ca1bf4229612b",
+ "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/b8/1f/09cc97502db36973d70a9bbb42c9"
}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81b04c29..aefbbcbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 1.5.25 (20164)
+- Added Venetian language (thanks Federico!)
+
### 1.5.24 (20163)
- Upgraded Python from version 3.7 to 3.8. This is a substantial change (though nothing like the previous update from 2.7 to 3.7) so please holler if anything is broken. These updates will happen once every year or two now..
- Windows debug builds now use Python debug libraries. This should hopefully catch more errors that would otherwise go undetected and potentially cause crashes.
diff --git a/assets/.asset_manifest_private.json b/assets/.asset_manifest_private.json
index ed6eeb97..1bb8aa43 100644
--- a/assets/.asset_manifest_private.json
+++ b/assets/.asset_manifest_private.json
@@ -451,6 +451,7 @@
"ba_data/data/languages/swedish.json",
"ba_data/data/languages/turkish.json",
"ba_data/data/languages/ukrainian.json",
+ "ba_data/data/languages/venetian.json",
"ba_data/data/languages/vietnamese.json",
"ba_data/data/maps/big_g.json",
"ba_data/data/maps/bridgit.json",
diff --git a/assets/Makefile b/assets/Makefile
index ab0997b1..4efd83ac 100644
--- a/assets/Makefile
+++ b/assets/Makefile
@@ -4755,6 +4755,7 @@ DATA_TARGETS = \
build/ba_data/data/languages/swedish.json \
build/ba_data/data/languages/turkish.json \
build/ba_data/data/languages/ukrainian.json \
+ build/ba_data/data/languages/venetian.json \
build/ba_data/data/languages/vietnamese.json \
build/ba_data/data/maps/big_g.json \
build/ba_data/data/maps/bridgit.json \
diff --git a/assets/src/ba_data/python/ba/_app.py b/assets/src/ba_data/python/ba/_app.py
index 611189b3..c3fafecf 100644
--- a/assets/src/ba_data/python/ba/_app.py
+++ b/assets/src/ba_data/python/ba/_app.py
@@ -121,6 +121,7 @@ class App:
'sr': 'Serbian',
'uk': 'Ukrainian',
'vi': 'Vietnamese',
+ 'vec': 'Venetian',
'hi': 'Hindi'
}
diff --git a/assets/src/ba_data/python/bastd/actor/controlsguide.py b/assets/src/ba_data/python/bastd/actor/controlsguide.py
index a68a6d7c..7158bdc5 100644
--- a/assets/src/ba_data/python/bastd/actor/controlsguide.py
+++ b/assets/src/ba_data/python/bastd/actor/controlsguide.py
@@ -271,6 +271,8 @@ class ControlsGuide(ba.Actor):
# If we have a touchscreen, we only fade in if we have a player with
# an input device that is *not* the touchscreen.
+ # (otherwise it is confusing to see the touchscreen buttons right
+ # next to our display buttons)
touchscreen: Optional[ba.InputDevice] = _ba.getinputdevice(
'TouchScreen', '#1', doraise=False)
diff --git a/docs/ba_module.md b/docs/ba_module.md
index 0550db84..15986a93 100644
--- a/docs/ba_module.md
+++ b/docs/ba_module.md
@@ -1,5 +1,5 @@
-last updated on 2020-08-03 for Ballistica version 1.5.24 build 20162
+last updated on 2020-08-09 for Ballistica version 1.5.24 build 20164
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!