Esteban Papp ec1a08d487 Merge branch 'development' into cmake/SPEC-7484 ...

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

# Conflicts:
#	Code/Editor/ConfigGroup.cpp
#	Code/Editor/ControlMRU.cpp
#	Code/Editor/CryEdit.cpp
#	Code/Editor/CryEdit.h
#	Code/Editor/IEditorImpl.cpp
#	Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp

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

..

LevelSystem

Merge branch 'development' into cmake/SPEC-7484

2021-08-10 09:23:34 -07: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

Merge branch 'development' into cmake/SPEC-7484

2021-08-05 20:05:25 -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

removing files that got added by rebase

2021-07-28 09:54:42 -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

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

More windows/linux fixes

2021-08-03 18:56:46 -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

linux fixes

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

IDebugCallStack.h

linux fixes

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

LocalizedStringManager.cpp

Some more build fixes

2021-08-05 21:49:00 -07:00

LocalizedStringManager.h

More string fixes

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

Log.cpp

Merge branch 'development' into cmake/SPEC-7484

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

Log.h

removing files that got added by rebase

2021-07-28 09:54:42 -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

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

Merge branch 'development' into cmake/SPEC-7484

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

SystemWin32.cpp

removing some dead code, commented code referring old types, static AZStd::strings

2021-08-05 12:47:36 -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

Merge branch 'development' into cmake/SPEC-7484

2021-08-05 20:05:25 -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