RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-08 08:45:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Syncing latest changes between public/private.

Browse Source
This commit is contained in:
Eric Froemling 2020-02-15 20:57:48 -08:00
parent 4c11316cd0
commit 2dce23612a
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/dictionaries/ericf.xml generated
View File

@ -86,6 +86,7 @@
<w>assetbundle</w> <w>assetbundle</w>
<w>assetcache</w> <w>assetcache</w>
<w>assetdata</w> <w>assetdata</w>
<w>assetfiles</w>
<w>assetpack</w> <w>assetpack</w>
<w>assetpackage</w> <w>assetpackage</w>
<w>assetpackput</w> <w>assetpackput</w>

18
assets/src/ba_data/python/bacommon/assets.py
View File

@ -48,15 +48,9 @@ class AssetType(Enum):
DATA = 'data' DATA = 'data'
class AssetInfo(entity.CompoundValue):
"""Info for a specific asset file in a package."""
filehash = entity.Field('h', entity.StringValue())
fileext = entity.Field('e', entity.StringValue())
class AssetPackageFlavorManifestValue(entity.CompoundValue): class AssetPackageFlavorManifestValue(entity.CompoundValue):
"""A manifest of asset info for a specific flavor of an asset package.""" """A manifest of asset info for a specific flavor of an asset package."""
assets = entity.CompoundDictField('a', str, AssetInfo()) assetfiles = entity.DictField('assetfiles', str, entity.StringValue())
class AssetPackageFlavorManifest(entity.EntityMixin, class AssetPackageFlavorManifest(entity.EntityMixin,
@ -66,4 +60,14 @@ class AssetPackageFlavorManifest(entity.EntityMixin,
class AssetPackageBuildState(entity.Entity): class AssetPackageBuildState(entity.Entity):
"""Contains info about an in-progress asset cloud build.""" """Contains info about an in-progress asset cloud build."""
# Asset names still being built.
in_progress_builds = entity.ListField('b', entity.StringValue()) in_progress_builds = entity.ListField('b', entity.StringValue())
# The initial number of assets needing to be built.
initial_build_count = entity.Field('c', entity.IntValue())
# Build error string. If this is present, it should be presented
# to the user and they should required to explicitly restart the build
# in some way if desired.
error = entity.Field('e', entity.OptionalStringValue())

4
docs/ba_module.md
View File

@ -1,6 +1,6 @@
<!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND --> <!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND -->
<!--DOCSHASH=a17e7abfc5ab7bf18ceac832fb0825ea--> <!--DOCSHASH=fe9431fb6bf549f08e65d5554359ddab-->
<h4><em>last updated on 2020-02-05 for Ballistica version 1.5.0 build 20001</em></h4> <h4><em>last updated on 2020-02-15 for Ballistica version 1.5.0 build 20001</em></h4>
<p>This page documents the Python classes and functions in the 'ba' module, <p>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 <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p> 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 <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p>
<hr> <hr>

4
tools/bacloud
View File

@ -416,6 +416,10 @@ class App:
if __name__ == '__main__': if __name__ == '__main__':
try: try:
App().run() App().run()
except KeyboardInterrupt:
# Let's do a clean fail on keyboard interrupt.
# Can make this optional if a backtrace is ever useful..
sys.exit(-1)
except CleanError as exc: except CleanError as exc:
if str(exc): if str(exc):
print(f'{CLRRED}{exc}{CLREND}') print(f'{CLRRED}{exc}{CLREND}')