Merge branch 'develop' into feature-text

Browse Source

...

This commit is contained in:

Andrew Cassidy

2020-07-02 20:13:46 -07:00

parent 96c625f6f2 be641272ad

commit a9b05a677e

41 changed files with 1661 additions and 1312 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

BIN

GameData/ConformalDecals/Plugins/ConformalDecals.dll

Binary file not shown.