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.

Chris Galvan 049b33d2df Merging stabilization/2111RTE -> development, resolved conflicts ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>		4 years ago
..
Application	Atom Tools: Removing unnecessary modules, components, and dead code from SMC	4 years ago
AssetBrowser	Atom Tools: moving custom asset browser code to common location	4 years ago
AssetGridDialog	Atom Tools: Changed ME preset browser dialog into generic asset grid dialog in ATF	4 years ago
Communication	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
Debug	Working on making Material Editor able to open materials that have missing textures.	4 years ago
Document	Merge pull request #6960 from aws-lumberyard-dev/Atom/guthadam/atom_tools_shared_asset_browser	4 years ago
DynamicProperty	Atom Tools: Removing unnecessary modules, components, and dead code from ME	4 years ago
Inspector	Atom Tools: Removing unnecessary modules, components, and dead code from ME	4 years ago
Platform	Linux Fixes for Launching the Material Editor (#4808)	4 years ago
PreviewRenderer	Guard against creating a PreviewRenderer with uninitialized RPI. (#5708)	4 years ago
Util	Merging stabilization/2111RTE -> development, resolved conflicts	4 years ago
Viewport	Merge branch 'development' of https://github.com/o3de/o3de into feat/add-cursor-wrap-mode-viewport	4 years ago
Window	Atom Tools: moving custom asset browser code to common location	4 years ago
AtomToolsFrameworkModule.cpp	Converted preview renderer to use AZ::Interface	4 years ago
AtomToolsFrameworkModule.h	Re-enabled linux tests physics (#5701)	4 years ago
AtomToolsFrameworkSystemComponent.cpp	Atom Tools: Removing unnecessary modules, components, and dead code from ME	4 years ago
AtomToolsFrameworkSystemComponent.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago