mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15 ...

# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp

2021-06-15 10:41:13 -07:00

..

Platform

New line

2021-06-04 16:13:18 -07:00

application_options.setreg

External Project Build Path Support using SDK Binaries (#690)

2021-05-14 13:01:11 -05:00

AssetProcessorPlatformConfig.setreg

[ATOM-15472] Shader Build Pipeline: Remove Deprecated Files And Funct… (#1079)

2021-06-11 07:48:23 -05:00

bootstrap.setreg

Renamed osx_gl to mac and es3 to android for cache folders (#949)

2021-05-26 19:17:17 -05:00

gem_autoload.serializecontexttools.setreg

Support for nested slice conversions (#1121)

2021-06-03 15:59:45 -05:00

prefab.setreg

Spawning priority threshold through SetReg

2021-05-26 16:39:24 -07:00

prefab.tools.setreg

LYN-2537 engine assets (#254)

2021-04-28 21:38:43 -05:00

sceneassetimporter.setreg

FbxImportRequestHandler is now loaded only once per AssetBuilder and Editor + re-enabled STL support (#933)

2021-05-27 08:45:32 -07:00

setregbuilder.assetprocessor.setreg

Fix Android Startup Error related to bootstrap's project_path being in the target deployed bootstrap path (#1322)

2021-06-15 09:19:29 -07:00

streamer.editor.setreg

LYN-2537 engine assets (#254)

2021-04-28 21:38:43 -05:00

streamer.game.setreg

LYN-2537 engine assets (#254)

2021-04-28 21:38:43 -05:00

streamer.setreg

LYN-2537 engine assets (#254)

2021-04-28 21:38:43 -05:00

streamer.test.setreg

LYN-2537 engine assets (#254)

2021-04-28 21:38:43 -05:00