9f0b6d65f4
merging latest dev
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2022-01-29 22:29:02 -08:00
f87d0f8386
Updated all .material files to have materialTypeVersion instead of propertyLayoutVersion. This was renamed in code at some point but we forgot to rename in the files. Before this was silently ignored but since I removed MaterialSourceDataSerializer, this started being reported as a warning.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2022-01-18 19:02:36 -08:00
a436ea7f9b
BasePbr working
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-12-15 22:30:37 -08:00
4522968c0b
merging latest dev
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-12-13 12:55:38 -08:00
8fa99c47db
Work in progress, current shader compilation error
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-12-13 12:51:34 -08:00
9698047340
Modified Color Swatch Fix ( #6137 )
...
* Modified Color Swatch Fix
Signed-off-by: Benjamin Black <benblac@amazon.com >
* Updating Macbeth Colors to work with new material formatting
Signed-off-by: Benjamin Black <benblac@amazon.com >
* Tweaks to red color values
Signed-off-by: Benjamin Black <benblac@amazon.com >
* Tweaked red swatch color values provided by Ken
Signed-off-by: Benjamin Black <benblac@amazon.com >
2021-12-06 16:18:32 -08:00
0116f0a520
Adding Macbeth level to AutomatedTesting and converting to Prefab ( #6060 )
...
* Adding macbeth level to AutomatedTesting
Signed-off-by: Sean Masterson <semaster@amazon.com >
* removing unnecessary files
Signed-off-by: Sean Masterson <semaster@amazon.com >
2021-12-02 08:26:56 -08:00
28170ffe41
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
antonmic
santorac
benblack75
SWMasterson
Chris Burel
alexpete