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

..

SceneBuilder

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

2021-08-17 12:10:46 -07:00

SceneCore

Merge branch 'development' into cmake/win_fix_wnew

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

SceneData

fixing build

2021-08-05 14:30:04 -07:00

SceneUI

Deprecate profiler categories based on global enum

2021-08-18 17:33:09 -06:00

SDKWrapper

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

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

CMakeLists.txt

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

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