You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Esteban Papp f8e99cd7dd Merge branch 'development' into cmake/SPEC-2513_w4244 ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/CryEditDoc.cpp # Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp # Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp # Gems/PhysXDebug/Code/Source/SystemComponent.cpp		4 years ago
..
LevelSystem	Audio legacy cleanup - Move global functions to be handled by AudioSystemComponent (#3283)	4 years ago
RemoteConsole	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
ViewSystem	Merge branch 'development' into cmake/SPEC-2513_w4244	4 years ago
XML	fixes for Code/CryEngine	4 years ago
AZCoreLogSink.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
AZCrySystemInitLogSink.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
AZCrySystemInitLogSink.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
CMakeLists.txt	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
CmdLine.cpp	Code/Legacy	4 years ago
CmdLine.h	More string fixes	4 years ago
CmdLineArg.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
CmdLineArg.h	More string fixes	4 years ago
ConsoleBatchFile.cpp	Merge branch 'development' into cmake/SPEC-7484	4 years ago
ConsoleBatchFile.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
ConsoleHelpGen.cpp	Code/Legacy cleanup	4 years ago
ConsoleHelpGen.h	More string fixes	4 years ago
CrySystem_precompiled.h	removing more unused stuff	4 years ago
DebugCallStack.cpp	[redcode/crythread-2nd-pass] replaced instances of AZStd::lock_guard<> with AZStd::scoped_lock as per feedback	4 years ago
DebugCallStack.h	More string fixes	4 years ago
DllMain.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
Huffman.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
Huffman.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
IDebugCallStack.cpp	Merge branch 'development' into cmake/SPEC-7182	4 years ago
IDebugCallStack.h	linux fixes	4 years ago
LocalizedStringManager.cpp	fixes for Code/CryEngine	4 years ago
LocalizedStringManager.h	Merge branch 'development' into redcode/crythread-2nd-pass	4 years ago
Log.cpp	Merge branch 'development' into cmake/SPEC-2513_w4244	4 years ago
Log.h	Merge branch 'development' into redcode/crythread-2nd-pass	4 years ago
SimpleStringPool.h	CryEngine compiles	4 years ago
System.cpp	Deprecate profiler categories based on global enum	4 years ago
System.h	Merge branch 'development' into cmake/SPEC-7484	4 years ago
SystemCFG.cpp	Merge branch 'development' into cmake/SPEC-7484	4 years ago
SystemCFG.h	Code/Legacy cleanup	4 years ago
SystemEventDispatcher.cpp	[redcode/crythread-2nd-pass] removed or replaced remaining CryMutex/CryLock usage with equivalent AZStd version	4 years ago
SystemEventDispatcher.h	[redcode/crythread-2nd-pass] removed CryThread*.h files	4 years ago
SystemInit.cpp	Merge branch 'development' into cmake/SPEC-7182	4 years ago
SystemWin32.cpp	Merge branch 'development' into cmake/SPEC-7182	4 years ago
Timer.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
Timer.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
WindowsErrorReporting.cpp	Code/Legacy cleanup	4 years ago
XConsole.cpp	warning fixes for new code	4 years ago
XConsole.h	Merge branch 'development' into cmake/SPEC-7484	4 years ago
XConsoleVariable.cpp	Code/Legacy cleanup	4 years ago
XConsoleVariable.h	runtime fixes (Editor running)	4 years ago
crysystem_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
crysystem_shared_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago