-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '45c783d15242966301bbc828ee5c44c7458c44da' into cgalvan/…
…gitflow_231005_o3de-extras
- Loading branch information
Showing
74 changed files
with
2,272 additions
and
665 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.9, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.0, | ||
| 0.0, | ||
| 0.0, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.9, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.0, | ||
| 0.0, | ||
| 0.0, | ||
| 1.0 | ||
| ], | ||
| "opacity.mode": "Blended", | ||
| "opacity.alphaSource": "None", | ||
| "opacity.factor": 0.5 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.9, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.0, | ||
| 0.0, | ||
| 1.0, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.9, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.0, | ||
| 0.0, | ||
| 1.0, | ||
| 1.0 | ||
| ], | ||
| "emissive.enable": true, | ||
| "emissive.color": [ | ||
| 0.0, | ||
| 0.0, | ||
| 1.0, | ||
| 1.0 | ||
| ], | ||
| "emissive.intensity": 5.5 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.9, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.0, | ||
| 0.0, | ||
| 1.0, | ||
| 1.0 | ||
| ], | ||
| "opacity.mode": "Blended", | ||
| "opacity.alphaSource": "None", | ||
| "opacity.factor": 0.6 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.9, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.0, | ||
| 0.0, | ||
| 1.0, | ||
| 1.0 | ||
| ], | ||
| "opacity.mode": "Blended", | ||
| "opacity.alphaSource": "None", | ||
| "opacity.factor": 0.5 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 1.0, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.6627, | ||
| 0.302, | ||
| 0.1568, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.9, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.921, | ||
| 0.921, | ||
| 0.921, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.1, | ||
| "metallic.factor": 0.6, | ||
| "baseColor.color": [ | ||
| 0.0, | ||
| 0.0, | ||
| 1.0, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.825, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.175, | ||
| 0.175, | ||
| 0.175, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.825, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.175, | ||
| 0.175, | ||
| 0.175, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.9, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.6, | ||
| 0.0, | ||
| 0.6, | ||
| 1.0 | ||
| ], | ||
| "opacity.mode": "Blended", | ||
| "opacity.alphaSource": "None", | ||
| "opacity.factor": 0.5 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 1.0, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.7, | ||
| 0.7, | ||
| 0.0, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.99, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.1, | ||
| 0.1, | ||
| 0.1, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.95, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.607, | ||
| 0.607, | ||
| 0.5607, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.1, | ||
| "metallic.factor": 1.0, | ||
| "baseColor.color": [ | ||
| 0.8, | ||
| 0.64869, | ||
| 0.120759, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.9, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.0, | ||
| 1.0, | ||
| 0.0, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "materialType": "Materials/Types/StandardPBR.materialtype", | ||
| "materialTypeVersion": 5, | ||
| "propertyValues": { | ||
| "metallic.useTexture": false, | ||
| "normal.useTexture": false, | ||
| "roughness.useTexture": false, | ||
| "specularF0.enableMultiScatterCompensation": true, | ||
| "specularF0.useTexture": false, | ||
| "baseColor.useTexture": false, | ||
| "roughness.factor": 0.99, | ||
| "metallic.factor": 0.0, | ||
| "baseColor.color": [ | ||
| 0.7, | ||
| 0.7, | ||
| 0.7, | ||
| 1.0 | ||
| ] | ||
| } | ||
| } |
Oops, something went wrong.