Esteban Papp 036114a5a7 Merge branch 'development' into cmake/SPEC-2513_w4244 ...

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

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp

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

..

LevelSystem

Merge branch 'development' into cmake/SPEC-7182

2021-08-11 11:16:24 -07:00

RemoteConsole

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

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

ViewSystem

CryEngine

2021-08-16 16:39:13 -07:00

XML

fixes for Code/CryEngine

2021-08-16 16:03:28 -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

Code/Legacy

2021-08-16 16:42:22 -07:00

CmdLine.h

More string fixes

2021-07-29 15:53:32 -07:00

CmdLineArg.cpp

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

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

CmdLineArg.h

More string fixes

2021-07-29 15:53:32 -07:00

ConsoleBatchFile.cpp

Merge branch 'development' into cmake/SPEC-7484

2021-08-05 20:05:25 -07:00

ConsoleBatchFile.h

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

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

ConsoleHelpGen.cpp

Code/Legacy cleanup

2021-07-30 17:39:02 -07:00

ConsoleHelpGen.h

More string fixes

2021-07-29 15:53:32 -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

removing more unused stuff

2021-08-06 16:42:38 -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

[redcode/crythread-2nd-pass] replaced instances of AZStd::lock_guard<> with AZStd::scoped_lock as per feedback

2021-08-12 12:40:03 -07:00

DebugCallStack.h

More string fixes

2021-07-29 15:53:32 -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

Merge branch 'development' into cmake/SPEC-7182

2021-08-11 11:16:24 -07:00

IDebugCallStack.h

linux fixes

2021-08-03 17:59:35 -07:00

LocalizedStringManager.cpp

fixes for Code/CryEngine

2021-08-16 16:03:28 -07:00

LocalizedStringManager.h

Merge branch 'development' into redcode/crythread-2nd-pass

2021-08-11 20:31:58 -07:00

Log.cpp

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

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

Log.h

Merge branch 'development' into redcode/crythread-2nd-pass

2021-08-11 20:31:58 -07:00

SimpleStringPool.h

CryEngine compiles

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

System.cpp

Code/Legacy cleanup

2021-07-30 17:39:02 -07:00

System.h

Merge branch 'development' into cmake/SPEC-7484

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

SystemCFG.cpp

Merge branch 'development' into cmake/SPEC-7484

2021-08-05 20:05:25 -07:00

SystemCFG.h

Code/Legacy cleanup

2021-07-30 17:39:02 -07:00

SystemEventDispatcher.cpp

[redcode/crythread-2nd-pass] removed or replaced remaining CryMutex/CryLock usage with equivalent AZStd version

2021-08-10 20:35:55 -07:00

SystemEventDispatcher.h

[redcode/crythread-2nd-pass] removed CryThread*.h files

2021-08-10 21:27:22 -07:00

SystemInit.cpp

Merge branch 'development' into cmake/SPEC-7182

2021-08-11 11:16:24 -07:00

SystemWin32.cpp

Merge branch 'development' into cmake/SPEC-7182

2021-08-11 11:16:24 -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

Code/Legacy cleanup

2021-07-30 17:39:02 -07:00

XConsole.cpp

warning fixes for new code

2021-08-16 16:05:41 -07:00

XConsole.h

Merge branch 'development' into cmake/SPEC-7484

2021-08-05 20:05:25 -07:00

XConsoleVariable.cpp

Code/Legacy cleanup

2021-07-30 17:39:02 -07:00

XConsoleVariable.h

runtime fixes (Editor running)

2021-08-05 19:31:12 -07:00