Merge branch 'main' into 33-trap-pitfall-art

This commit is contained in:
Cat Flynn 2021-02-24 15:33:47 +00:00
commit f2a9cf4229
4 changed files with 3 additions and 2595 deletions

3
game/.gitignore vendored
View File

@ -89,3 +89,6 @@ config.txt
# Generated dialogue files # Generated dialogue files
[Aa]ssets/Data/Dialogue/token* [Aa]ssets/Data/Dialogue/token*
[Aa]ssets/Data/Dialogue/dialogue.data* [Aa]ssets/Data/Dialogue/dialogue.data*
# FMOD
[Aa]ssets/Plugins/FMOD/Cache/

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 27b34f0051f845c458ad3a0129726e59
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: c89ac03cd2d3f984e901aee227e1a9f9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant: