Merge remote-tracking branch 'origin/programming' into leveldesign
# Conflicts: # Viagg-io/ProjectSettings/EditorBuildSettings.asset
Dominik Gut
@ -14,13 +14,13 @@
|
||||
Composite(Sequence) {
|
||||
//RunTree("32_Grotto_Story_B_Grotto_Intro")
|
||||
|
||||
//RunTree("32_Grotto_Kueche_Intro")
|
||||
RunTree("32_Grotto_Kueche_Intro")
|
||||
//RunTree("32_Grotto_Kueche_Zwiebeln_schneiden")
|
||||
RunTree("32_Grotto_Kueche_alles_gefunden")
|
||||
//RunTree("32_Grotto_Kueche_alles_gefunden")
|
||||
//RunTree("32_Grotto_Kueche_Interesse_Kochen")
|
||||
//RunTree("32_Grotto_Kueche_Kochen_Anzahl")
|
||||
//RunTree("32_Grotto_Kueche_Zusammen_Kochen")
|
||||
RunTree("32_Grotto_Kueche_Parmigiano")
|
||||
//RunTree("32_Grotto_Kueche_Parmigiano")
|
||||
//RunTree("32_Grotto_Im_Grotto_Essen_Intro")
|
||||
}
|
||||
}
|
||||
|
||||
@ -710,7 +710,7 @@ MonoBehaviour:
|
||||
LiveUpdatePort: 9264
|
||||
EnableMemoryTracking: 0
|
||||
AndroidUseOBB: 0
|
||||
AndroidPatchBuild: 1
|
||||
AndroidPatchBuild: 0
|
||||
MeterChannelOrdering: 0
|
||||
StopEventsOutsideMaxDistance: 0
|
||||
BoltUnitOptionsBuildPending: 0
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0977a1da3081d5d469e616e1fa1c692c
|
||||
guid: 61d90deb37c0e46be98cba4198a10963
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
906779
Viagg-io/Assets/Scenes/3.2-Grotto-v0.unity
Normal file
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 73660f1e1eb0e524fb6b6f42ca2c7b54
|
||||
guid: 51bd2edc532024f96a432eaf867d3a47
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
BIN
Viagg-io/Assets/Scenes/3.2-Grotto-v0/LightingData.asset
Normal file
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2f1c3014b6e5d9f47ab6d5c982c66b7d
|
||||
guid: 1a10286c0191e429e8bf8ac54a8b5c7c
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 112000000
|
||||
BIN
Viagg-io/Assets/Scenes/3.2-Grotto-v0/ReflectionProbe-0.exr
Normal file
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 90f55034ca206b94eb8c380dfeb8c120
|
||||
guid: 07acb425eee48482bbba511136e53475
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
BIN
Viagg-io/Assets/Scenes/3.2-Grotto-v0/ReflectionProbe-1.exr
Normal file
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dacead820ce2cd242ae01ace40f4164f
|
||||
guid: 031b5f0dafd4b48debaa3ad596e2b2a7
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
BIN
Viagg-io/Assets/Scenes/3.2-Grotto-v0/ReflectionProbe-2.exr
Normal file
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ed7101ffb9d45fa43827245a6cc6164b
|
||||
guid: 7e95315b0505249ed892183cdafc20bd
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 61d90deb37c0e46be98cba4198a10963
|
||||
guid: 0977a1da3081d5d469e616e1fa1c692c
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 51bd2edc532024f96a432eaf867d3a47
|
||||
guid: 73660f1e1eb0e524fb6b6f42ca2c7b54
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1a10286c0191e429e8bf8ac54a8b5c7c
|
||||
guid: 2f1c3014b6e5d9f47ab6d5c982c66b7d
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 112000000
|
||||
|
||||
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 534 KiB After Width: | Height: | Size: 534 KiB |
|
Before Width: | Height: | Size: 707 KiB After Width: | Height: | Size: 707 KiB |
|
Before Width: | Height: | Size: 975 KiB After Width: | Height: | Size: 975 KiB |
|
Before Width: | Height: | Size: 813 KiB After Width: | Height: | Size: 813 KiB |
|
Before Width: | Height: | Size: 824 KiB After Width: | Height: | Size: 824 KiB |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 1.3 MiB |
|
Before Width: | Height: | Size: 891 KiB After Width: | Height: | Size: 891 KiB |
|
Before Width: | Height: | Size: 280 KiB After Width: | Height: | Size: 280 KiB |
|
Before Width: | Height: | Size: 920 KiB After Width: | Height: | Size: 920 KiB |
|
Before Width: | Height: | Size: 429 KiB After Width: | Height: | Size: 429 KiB |
|
Before Width: | Height: | Size: 312 KiB After Width: | Height: | Size: 312 KiB |
|
Before Width: | Height: | Size: 466 KiB After Width: | Height: | Size: 466 KiB |
|
Before Width: | Height: | Size: 450 KiB After Width: | Height: | Size: 450 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 613 KiB After Width: | Height: | Size: 613 KiB |
|
Before Width: | Height: | Size: 709 KiB After Width: | Height: | Size: 709 KiB |
|
Before Width: | Height: | Size: 659 KiB After Width: | Height: | Size: 659 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
