Merge branch 'Feature/TrimSheet' into 'main'
ALPHA LEVEL See merge request kernel-panic/revival!24
This commit is contained in:
commit
84c67b7f11
game/Assets
3D Assets.meta
3D Assets
TRAPS.meta
TRAPS
SPIKE PIT.meta
TRIM 1.metaSPIKE PIT
M_SpikeTrap.matM_SpikeTrap.mat.metaSpikeTrap_low.fbxSpikeTrap_low.fbx.metalambert1_Base_Color.jpglambert1_Base_Color.jpg.metalambert1_Height.jpglambert1_Height.jpg.metalambert1_Metallic.jpglambert1_Metallic.jpg.metalambert1_Mixed_AO.jpglambert1_Mixed_AO.jpg.metalambert1_Normal_DirectX.jpglambert1_Normal_DirectX.jpg.metalambert1_Roughness.jpglambert1_Roughness.jpg.meta
TRIM 1
M_TrimSheet1.matM_TrimSheet1.mat.metaMeshes.meta
Meshes
Doorway_A.fbxDoorway_A.fbx.metaFloor_A.fbxFloor_A.fbx.metaFloor_B.fbxFloor_B.fbx.metaFloor_C.fbxFloor_C.fbx.metaFloor_D.fbxFloor_D.fbx.metaFloor_E.fbxFloor_E.fbx.metaFloor_F.fbxFloor_F.fbx.metaFloor_G.fbxFloor_G.fbx.metaFloor_Spline.fbxFloor_Spline.fbx.metaFountain_A.fbxFountain_A.fbx.metaNew Lighting Settings.lightingNew Lighting Settings.lighting.metaPillar_A.fbxPillar_A.fbx.metaPillar_B.fbxPillar_B.fbx.metaPillar_C.fbxPillar_C.fbx.metaPillar_D.fbxPillar_D.fbx.metaRailing_A.fbxRailing_A.fbx.metaRoof_A.fbxRoof_A.fbx.metaStairs_A.fbxStairs_A.fbx.metaStairs_B.fbxStairs_B.fbx.metaSunLightSettings.lightingSunLightSettings.lighting.metaWalkway_Spline.fbxWalkway_Spline.fbx.metaWallPiece_A.fbxWallPiece_A.fbx.metaWallPiece_B.fbxWallPiece_B.fbx.metaWallPiece_C.fbxWallPiece_C.fbx.metaWall_A.fbxWall_A.fbx.metaWall_B.fbxWall_B.fbx.metaWall_C.fbxWall_C.fbx.meta
Textures.metaTextures
blinn1_Base_Color.tgablinn1_Base_Color.tga.metablinn1_Height.tgablinn1_Height.tga.metablinn1_Metallic.tgablinn1_Metallic.tga.metablinn1_Mixed_AO.tgablinn1_Mixed_AO.tga.metablinn1_Normal_DirectX.tgablinn1_Normal_DirectX.tga.metablinn1_Roughness.tgablinn1_Roughness.tga.meta
Water.matWater.mat.metaScenes
0
game/Assets/ASSETS/TRIM 1/M_TrimSheet1.mat.meta → game/Assets/3D Assets/TRIM 1/M_TrimSheet1.mat.meta
0
game/Assets/ASSETS/TRIM 1/M_TrimSheet1.mat.meta → game/Assets/3D Assets/TRIM 1/M_TrimSheet1.mat.meta
0
game/Assets/ASSETS/TRIM 1/Meshes/Doorway_A.fbx → game/Assets/3D Assets/TRIM 1/Meshes/Doorway_A.fbx
0
game/Assets/ASSETS/TRIM 1/Meshes/Doorway_A.fbx → game/Assets/3D Assets/TRIM 1/Meshes/Doorway_A.fbx
0
game/Assets/ASSETS/TRIM 1/Meshes/Fountain_A.fbx → game/Assets/3D Assets/TRIM 1/Meshes/Fountain_A.fbx
0
game/Assets/ASSETS/TRIM 1/Meshes/Fountain_A.fbx → game/Assets/3D Assets/TRIM 1/Meshes/Fountain_A.fbx
0
game/Assets/ASSETS/TRIM 1/Meshes/Railing_A.fbx → game/Assets/3D Assets/TRIM 1/Meshes/Railing_A.fbx
0
game/Assets/ASSETS/TRIM 1/Meshes/Railing_A.fbx → game/Assets/3D Assets/TRIM 1/Meshes/Railing_A.fbx
File diff suppressed because it is too large
Load Diff
@ -93,10 +93,10 @@ MonoBehaviour:
|
|||||||
m_Value: {x: 0.7020849, y: 0.73619574, z: 1, w: 0.04683842}
|
m_Value: {x: 0.7020849, y: 0.73619574, z: 1, w: 0.04683842}
|
||||||
midtones:
|
midtones:
|
||||||
m_OverrideState: 1
|
m_OverrideState: 1
|
||||||
m_Value: {x: 0.9806411, y: 1, z: 0.9229189, w: -0.07025762}
|
m_Value: {x: 0.9806411, y: 1, z: 0.9229189, w: -0.17749621}
|
||||||
highlights:
|
highlights:
|
||||||
m_OverrideState: 1
|
m_OverrideState: 1
|
||||||
m_Value: {x: 1, y: 0.99147195, z: 0.9255205, w: -0.11709601}
|
m_Value: {x: 1, y: 0.98038995, z: 0.8660951, w: -0.090286344}
|
||||||
shadowsStart:
|
shadowsStart:
|
||||||
m_OverrideState: 0
|
m_OverrideState: 0
|
||||||
m_Value: 0
|
m_Value: 0
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user