Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev into release-prep #31

Merged
merged 9 commits into from
Aug 6, 2024
Binary file modified otls/OBJ_TaleSpire_Biome.hdanc
Binary file not shown.
Binary file modified otls/OBJ_TaleSpire_Object.hdanc
Binary file not shown.
Binary file modified otls/OBJ_TaleSpire_Shared_Data.hdanc
Binary file not shown.
Binary file modified otls/OBJ_TaleSpire_Terrain.hdanc
Binary file not shown.
Binary file modified otls/SOP_TaleSpire_Copy.hdanc
Binary file not shown.
Binary file modified otls/SOP_TaleSpire_Fetch_Water.hdanc
Binary file not shown.
Binary file modified otls/SOP_TaleSpire_Object_Set.hdanc
Binary file not shown.
Binary file modified otls/SOP_TaleSpire_Scatter.hdanc
Binary file not shown.
Binary file modified otls/SOP_TaleSpire_Set_Water_Level.hdanc
Binary file not shown.
Binary file modified otls/SOP_TaleSpire_Tiler.hdanc
Binary file not shown.
10 changes: 10 additions & 0 deletions scripts/data/nodes/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Contents.net Files
The files in this directory are the default contents of
various sub-networks inside of the TaleSpire nodes. They are
encrypted as ascii text for ease of storage.

When in Dev Mode on various nodes there will be an option to
write out these networks.

When a new node is placed down the contents of these files get
decrypted and placed in the proper sub-networks.
4 changes: 3 additions & 1 deletion scripts/python/htg/nodes/OBJ_TaleSpire_Shared_Data.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ def build_ts_database(node):
proxy_name = asset_name.replace(' ', '_').replace('/', '_').replace('(', '_').replace(')', '_')
proxy_base_path = f'{htg_basedir}/geo/ts_proxies'

if is_floor and tag_name in ('1x1', '2x2') and not asset_dict['IsDeprecated'] == 1:
if (is_floor and tag_name in ('1x1', '2x2')
and not asset_dict['IsDeprecated'] == 1
and not "tempwater" in asset_name.lower()):
point.setAttribValue('is_floor', 1)
point.setAttribValue('proxy_path',
f'{proxy_base_path}/Standin_floor_{tag_name}.bgeo.sc')
Expand Down
2 changes: 1 addition & 1 deletion scripts/python/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This is the version of the release.
# Should be updated whenever a push is done.
# Include branch name on daily pushes. Only upgrade Major and Minor version when Pulling into the master branch.
version = '0.22.0'
version = '0.22.1-dev'