From fc7ee67246b86b2fa03dc9cbfb50906225987930 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 20 Aug 2020 15:24:31 -0500 Subject: [PATCH] tidying --- .efrocachemap | 24 ++++++++++++------------ CHANGELOG.md | 4 +++- tools/efrotools/android.py | 1 - tools/efrotools/pcommand.py | 10 ++++++---- tools/pcommand | 15 +++++++-------- 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 66c15b2b..802a2ec7 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3928,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/48/84/5eb5628720ff75385cc13928a49e", - "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a6/9f/f37978a5ffe39ac6edc664f60174", - "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/6b/72/41f71faf74598e73632cd337f614", - "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ad/cf/aa8d6f48de619d0bd19332eb5b2c", - "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/73/84/f232bc8c631bf1390cfadd542bf3", - "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d8/5c/c05a51b3cf567e4068bc3855b75e", - "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/8c/ed/d94a3be4a30c6225eba48babaedf", - "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/67/30/6f428cfd113e4d29954d3fa83070", - "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/be/b2/0129c26e2aa3c928c400546c3882", - "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/72/02/444ad6235391423f3a54562cebcb", - "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/8f/21/9043cbb8ca95ae560a8805a63975", - "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/89/67/6be3af6d18c98b227e4b20952705" + "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/47/8a/9ebc5daa1524ab2c28f110594713", + "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/47/54/4afa32ce286c9fd1769d5974d806", + "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a4/f6/70e8021e7eecd0ac2780c5290e20", + "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/5e/1c/1537e910399d1ff9f16597d9a687", + "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/bb/6d/2d6e692c88f33c69bb2cf4346d41", + "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a4/e7/364c1ffda791abc63375d6fcbf24", + "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/8d/5f/425c115720b7f176a9968b064aec", + "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9b/1e/14c166e8608beb01074606b58b6d", + "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/9c/d1/91d2ba146c8c8cbb5a314321fe68", + "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/f0/f7/1aa0a6b5a48bc91b48f8314f6091", + "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/ac/22/f41a02837800ffdcd1ab00b8c860", + "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/1d/4a/5c01f5243c5dcae456f8f2dbf63d" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index b926cb28..767aa154 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ -### 1.5.25 (20165) +### 1.5.25 (20171) - Added Venetian language (thanks Federico!) +- Fixed an issue where chosen-one flashes would remain if the player leaves the game +- Added android input-device detection log messages for debugging ### 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.. diff --git a/tools/efrotools/android.py b/tools/efrotools/android.py index 45294876..16ed82f7 100644 --- a/tools/efrotools/android.py +++ b/tools/efrotools/android.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3.8 # Copyright (c) 2011-2020 Eric Froemling # # Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/tools/efrotools/pcommand.py b/tools/efrotools/pcommand.py index 8f7bc855..b7c22ff4 100644 --- a/tools/efrotools/pcommand.py +++ b/tools/efrotools/pcommand.py @@ -85,10 +85,12 @@ def pcommand_main(globs: Dict[str, Any]) -> None: retval = 255 if show_help: - print('Pcommand contains project related commands too small' - ' to warrant full scripts.') - print(f"Run {Clr.MAG}'pcommand help {Clr.BLD}'" - f'{Clr.RST} for full command documentation.') + print(f'The {Clr.MAG}{Clr.BLD}pcommand{Clr.RST} script encapsulates' + f' a collection of project-related commands.') + print(f"Run {Clr.MAG}{Clr.BLD}'pcommand [COMMAND] ...'" + f'{Clr.RST} to run a command.') + print(f"Run {Clr.MAG}{Clr.BLD}'pcommand help [COMMAND]'" + f'{Clr.RST} for full documentation for a command.') print('Available commands:') for func, obj in sorted(funcs.items()): doc = getattr(obj, '__doc__', '').splitlines()[0].strip() diff --git a/tools/pcommand b/tools/pcommand index 3a244185..bd1d6665 100755 --- a/tools/pcommand +++ b/tools/pcommand @@ -19,22 +19,21 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. # ----------------------------------------------------------------------------- -"""Wee little snippets of functionality specific to this project. +"""A collection of commands for use with this project. All top level functions here can be run by passing them as the first argument on the command line. (or pass no arguments to get a list of them). - -Functions can be placed here when they're not complex enough to warrant -their own files. Often these functions act as user-facing entry points -to functionality contained in efrotools or other standalone tool modules. """ + +# Note: we import as little as possible here at the module level to +# keep launch times fast; most imports should happen within individual command +# functions. + from __future__ import annotations -# Note: import as little as possible here at the module level to -# keep launch times fast for small snippets. from typing import TYPE_CHECKING -# Pull in the snippets we want to expose. Its more efficient to define them in +# Pull in commands we want to expose. Its more efficient to define them in # modules rather than inline here because we'll be able to load them via pyc. # pylint: disable=unused-import from efrotools.pcommand import (