Esteban Papp 5ca84cb07e Merge branch 'development' into cmake/win_fix_wnew ...

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

# Conflicts:
#	Code/Legacy/CryCommon/Cry_Camera.h
#	Code/Legacy/CryCommon/IShader.h

2021-08-24 10:46:18 -07:00

..

Components

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

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

Containers

push/pop mismatch

2021-08-20 18:39:40 -07:00

DataTypes

addressing PR comments/suggestions

2021-08-05 19:30:09 -07:00

Events

Changes to SDK wrappers and functions to allow more flexible scene file processing (#3112)

2021-08-17 06:52:20 -07:00

Export

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

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

Import

Fix python fbx tests (#2171)

2021-07-20 06:48:35 -07:00

Mocks

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

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

Tests

Changes to SDK wrappers and functions to allow more flexible scene file processing (#3112)

2021-08-17 06:52:20 -07:00

Utilities

push/pop mismatch

2021-08-20 18:39:40 -07:00

CMakeLists.txt

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

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

DllMain.cpp

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

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

SceneBuilderDependencyBus.h

Added a new registry setting that disables automatic conversion of materials from model files like FBX.

2021-08-02 16:09:11 -07:00

scenecore_files.cmake

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

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

scenecore_testing_files.cmake

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

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

SceneCoreConfiguration.h

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

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

SceneCoreStandaloneAllocator.cpp

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

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

SceneCoreStandaloneAllocator.h

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

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