Esteban Papp ec1a08d487 Merge branch 'development' into cmake/SPEC-7484 ...

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ConfigGroup.cpp
#	Code/Editor/ControlMRU.cpp
#	Code/Editor/CryEdit.cpp
#	Code/Editor/CryEdit.h
#	Code/Editor/IEditorImpl.cpp
#	Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp

2021-08-10 09:23:34 -07:00

..

AssetDatabase

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

AssetManager

Use lambda instead of AZStd::bind (#2658)

2021-08-05 20:10:26 -05:00

connection

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

FileProcessor

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

FileServer

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

FileWatcher

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

InternalBuilders

fix reference to temporary (#2312)

2021-07-21 11:00:45 -07:00

resourcecompiler

Merge branch 'development' into cmake/SPEC-2513_w4267

2021-08-02 18:03:04 -07:00

shadercompiler

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

tests

{LYN-4996} Asset Processor is not reprocessing STL files after settings are edited/updated (#2095)

2021-07-20 09:26:11 -07:00

ui

FixedMaxPathString replacement

2021-08-05 19:25:26 -07:00

unittests

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

utilities

[Mac] Building and running game projects from an SDK (#2943)

2021-08-10 10:10:37 -05:00

assetprocessor.h

Automated test for scene files with and without python scripts running python incorrectly (#2373)

2021-08-02 10:57:57 -07:00

AssetProcessorBatchBuildTarget.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

AssetProcessorBuildTarget.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

main_batch.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

main_gui.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00