You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonny Galloway 275fbc714d Merge branch 'aws-lumberyard:main' into cherry-pick_fix_ATOM14976_to_main		5 years ago
..
Assets	replacing 1.0 mat ed model changes, filename change	5 years ago
Code	Merge pull request #687 from aws-lumberyard-dev/Atom/guthadam/ATOM-15128	5 years ago
Scripts	Set scripts to be executable	5 years ago
CMakeLists.txt	Initial commit	5 years ago
MaterialEditor.xml	Initial commit	5 years ago
preview.svg	ATOM-15128 replacing material editor icon	5 years ago
workspace.mel	Integrating up through commit 90f050496	5 years ago