Merge branch 'EngineAssetify' of https://github.com/Areloch/Torque3D into EngineAssetify_Followups_XML2Check

Browse source

# Conflicts:
#	Engine/source/ts/tsShapeConstruct.cpp

...

This commit is contained in:

AzaezelX 2021-08-02 13:54:51 -05:00

parent c43cee13ab 88ae8a9665

commit c5d0310bc3

180 changed files with 2337 additions and 1572 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1868

Engine/source/ts/tsShapeConstruct.cpp

View file

File diff suppressed because it is too large Load diff