Merge branch 'master' into level_detail_bc

This commit is contained in:
Jan Groß
2018-09-02 21:03:34 +02:00
committed by GitHub
45 changed files with 18609 additions and 4548 deletions

View File

@@ -1,5 +1,7 @@
fileFormatVersion: 2
guid: be524af1caf68134f82b9c43ce1db13e
ModelImporter:
serializedVersion: 23
fileIDToRecycleName:
@@ -8,42 +10,52 @@ ModelImporter:
100004: Cube_002
100006: Cube_003
100008: Cube_004
100010: Cube_005
100012: Cube_006
100014: //RootNode
r
400000: Cube_000
400002: Cube_001
400004: Cube_002
400006: Cube_003
400008: Cube_004
400010: Cube_005
400012: Cube_006
400014: //RootNode
2100000: unnamed
2300000: Cube_000
2300002: Cube_001
2300004: Cube_002
2300006: Cube_003
2300008: Cube_004
2300010: Cube_005
2300012: Cube_006
3300000: Cube_000
3300002: Cube_001
3300004: Cube_002
3300006: Cube_003
3300008: Cube_004
3300010: Cube_005
3300012: Cube_006
4300000: Cube_006
4300002: Cube_004
4300004: Cube_003
4300006: Cube_002
4300008: Cube_001
4300010: Cube_000
4300012: Cube_005
7400000: Default Take
9500000: //RootNode
2186277476908879412: ImportLogs
externalObjects: {}
materials:
importMaterials: 1