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.

pappeste 01933f45b1 Merge branch 'main' into ly-as-sdk/LYN-2948 ... # Conflicts: # Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json		5 years ago
..
Assets	Renamed osx_gl to mac and es3 to android for cache folders (#949)	5 years ago
Code	Merge pull request #984 from aws-lumberyard-dev/attachments-transform-scale	5 years ago
CMakeLists.txt	LYN-3069 Revert some 3rdparty changes and address issue (#185)	5 years ago
gem.json	Adding back gem.json files to the Atom and AtomLyIntegration folders	5 years ago
preview.png	Initial commit	5 years ago