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 d7574777a8 Resolved merge conflicts ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>		5 years ago
..
Platform	Added new lines to Streamer.*.setreg files at the end	5 years ago
AssetProcessorPlatformConfig.setreg	[ATOM-15472] Shader Build Pipeline: Remove Deprecated Files And Funct… (#1079)	5 years ago
application_options.setreg	External Project Build Path Support using SDK Binaries (#690)	5 years ago
bootstrap.setreg	Renamed osx_gl to mac and es3 to android for cache folders (#949)	5 years ago
gem_autoload.serializecontexttools.setreg	Support for nested slice conversions (#1121)	5 years ago
prefab.setreg	Spawning priority threshold through SetReg	5 years ago
prefab.tools.setreg	LYN-2537 engine assets (#254)	5 years ago
sceneassetimporter.setreg	FbxImportRequestHandler is now loaded only once per AssetBuilder and Editor + re-enabled STL support (#933)	5 years ago
setregbuilder.assetprocessor.setreg	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
streamer.editor.setreg	Added new lines to Streamer.*.setreg files at the end	5 years ago
streamer.game.debug.setreg	Added new lines to Streamer.*.setreg files at the end	5 years ago
streamer.game.profile.setreg	Added new lines to Streamer.*.setreg files at the end	5 years ago
streamer.game.setreg	Added new lines to Streamer.*.setreg files at the end	5 years ago
streamer.setreg	Added new lines to Streamer.*.setreg files at the end	5 years ago
streamer.test.setreg	Added new lines to Streamer.*.setreg files at the end	5 years ago