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.
o3de/Code/Tools/AssetProcessor/native
Esteban Papp e28d04aea6 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
5 years ago
..
AssetDatabase Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
AssetManager Use lambda instead of AZStd::bind (#2658) 5 years ago
FileProcessor Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
FileServer Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
FileWatcher Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
InternalBuilders fix reference to temporary (#2312) 5 years ago
connection Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
resourcecompiler Merge branch 'development' into cmake/SPEC-2513_w4267 5 years ago
shadercompiler Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
tests {LYN-4996} Asset Processor is not reprocessing STL files after settings are edited/updated (#2095) 5 years ago
ui FixedMaxPathString replacement 5 years ago
unittests Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
utilities Automated test for scene files with and without python scripts running python incorrectly (#2373) 5 years ago
AssetProcessorBatchBuildTarget.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
AssetProcessorBuildTarget.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
assetprocessor.h Automated test for scene files with and without python scripts running python incorrectly (#2373) 5 years ago
main_batch.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
main_gui.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago