Esteban Papp 2d1ed48fea Merge branch 'development' into cmake/SPEC-2513_w4018 ...

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

# Conflicts:
#	Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp

2021-08-10 11:45:02 -07:00

..

LevelSystem

Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements

2021-08-06 10:32:38 -04:00

RemoteConsole

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

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

ViewSystem

Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements

2021-08-06 10:32:38 -04:00

XML

CryEngine compiles

2021-07-27 19:28:56 -07:00

AZCoreLogSink.h

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

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

AZCrySystemInitLogSink.cpp

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

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

AZCrySystemInitLogSink.h

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

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

CMakeLists.txt

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

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

CmdLine.cpp

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

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

CmdLine.h

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

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

CmdLineArg.cpp

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

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

CmdLineArg.h

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

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

ConsoleBatchFile.cpp

CryEngine compiles

2021-07-27 19:28:56 -07:00

ConsoleBatchFile.h

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

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

ConsoleHelpGen.cpp

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

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

ConsoleHelpGen.h

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

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

crysystem_files.cmake

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

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

CrySystem_precompiled.h

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

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

crysystem_shared_files.cmake

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

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

DebugCallStack.cpp

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

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

DebugCallStack.h

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

Huffman.cpp

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

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

Huffman.h

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

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

IDebugCallStack.cpp

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

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

IDebugCallStack.h

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

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

LocalizedStringManager.cpp

CryEngine compiles

2021-07-27 19:28:56 -07:00

LocalizedStringManager.h

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

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

Log.cpp

CryEngine compiles

2021-07-27 19:28:56 -07:00

Log.h

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

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

SimpleStringPool.h

CryEngine compiles

2021-07-27 19:28:56 -07:00

System.cpp

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

System.h

Camera Component, Editor Viewport Widget refactoring.

2021-08-05 10:05:19 -04:00

SystemCFG.cpp

CryEngine compiles

2021-07-27 19:28:56 -07:00

SystemCFG.h

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

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

SystemEventDispatcher.cpp

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

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

SystemEventDispatcher.h

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

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

SystemInit.cpp

Fix issues with audio localization bank switching (#2945)

2021-08-09 11:51:06 -05:00

SystemWin32.cpp

fix w4018

2021-08-05 19:43:56 -07:00

Timer.cpp

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

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

Timer.h

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

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

WindowsErrorReporting.cpp

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

XConsole.cpp

CryEngine compiles

2021-07-27 19:28:56 -07:00

XConsole.h

CryEngine compiles

2021-07-27 19:28:56 -07:00

XConsoleVariable.cpp

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

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

XConsoleVariable.h

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

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