Merge remote-tracking branch 'origin/feat/inport-props' into feat/craft-discovery
# Conflicts: # Assets/External/Animated PBR Chest Demo/Materials/WoodChest.mat # Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta # Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta # Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta
This commit is contained in:
+1465
File diff suppressed because it is too large
Load Diff
+15
@@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: edf2ad9558523bf4d96324dcc8171333
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 259457
|
||||
packageName: 'Better Fog: Height Fog, Light Scattering & More'
|
||||
packageVersion: 3.1
|
||||
assetPath: Assets/INab Studio/Post Processing Assets/Better Fog/Demo Scenes/Custom
|
||||
Renderers (Transparents with fog).unity
|
||||
uploadId: 916910
|
||||
+1664
File diff suppressed because it is too large
Load Diff
+15
@@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d86d68b06d154aa4d943356e14dfb79d
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 259457
|
||||
packageName: 'Better Fog: Height Fog, Light Scattering & More'
|
||||
packageVersion: 3.1
|
||||
assetPath: Assets/INab Studio/Post Processing Assets/Better Fog/Demo Scenes/Height
|
||||
Fog + Fog Offset (Multiplication).unity
|
||||
uploadId: 916910
|
||||
+1682
File diff suppressed because it is too large
Load Diff
+15
@@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f5b4b2dee360b904f9b7b9404820bead
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 259457
|
||||
packageName: 'Better Fog: Height Fog, Light Scattering & More'
|
||||
packageVersion: 3.1
|
||||
assetPath: Assets/INab Studio/Post Processing Assets/Better Fog/Demo Scenes/Particles
|
||||
(Fog Offset + Fog Particles).unity
|
||||
uploadId: 916910
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,14 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d657b8de63b26df4685156d0793690fc
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 259457
|
||||
packageName: 'Better Fog: Height Fog, Light Scattering & More'
|
||||
packageVersion: 3.1
|
||||
assetPath: Assets/INab Studio/Post Processing Assets/Better Fog/Demo Scenes/Showcase.unity
|
||||
uploadId: 916910
|
||||
+1751
File diff suppressed because it is too large
Load Diff
+15
@@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6987c2d89c2bdbf4ca5ee2af28fce24b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 259457
|
||||
packageName: 'Better Fog: Height Fog, Light Scattering & More'
|
||||
packageVersion: 3.1
|
||||
assetPath: Assets/INab Studio/Post Processing Assets/Better Fog/Demo Scenes/Vertical
|
||||
Fog Plane (Fog Offset).unity
|
||||
uploadId: 916910
|
||||
+1883
File diff suppressed because it is too large
Load Diff
+15
@@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 811a27cb2ec4b864ea16e88bf712f62b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 259457
|
||||
packageName: 'Better Fog: Height Fog, Light Scattering & More'
|
||||
packageVersion: 3.1
|
||||
assetPath: Assets/INab Studio/Post Processing Assets/Better Fog/Demo Scenes/World
|
||||
Fog Plane.unity
|
||||
uploadId: 916910
|
||||
+1810
File diff suppressed because it is too large
Load Diff
+15
@@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 57bdd80cb013763459464713b593a2a8
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 259457
|
||||
packageName: 'Better Fog: Height Fog, Light Scattering & More'
|
||||
packageVersion: 3.1
|
||||
assetPath: Assets/INab Studio/Post Processing Assets/Better Fog/Demo Scenes/World
|
||||
Sphere Analytical Fog.unity
|
||||
uploadId: 916910
|
||||
Reference in New Issue
Block a user