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.
o3de/Code/Legacy/CrySystem
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
4 years ago
..
LevelSystem Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements 4 years ago
RemoteConsole Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ViewSystem Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements 4 years ago
XML CryEngine compiles 4 years ago
AZCoreLogSink.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
AZCrySystemInitLogSink.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
AZCrySystemInitLogSink.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CMakeLists.txt Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CmdLine.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CmdLine.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CmdLineArg.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CmdLineArg.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ConsoleBatchFile.cpp CryEngine compiles 4 years ago
ConsoleBatchFile.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ConsoleHelpGen.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ConsoleHelpGen.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CrySystem_precompiled.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
DebugCallStack.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
DebugCallStack.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
DllMain.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Huffman.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Huffman.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IDebugCallStack.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IDebugCallStack.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
LocalizedStringManager.cpp CryEngine compiles 4 years ago
LocalizedStringManager.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Log.cpp CryEngine compiles 4 years ago
Log.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
SimpleStringPool.h CryEngine compiles 4 years ago
System.cpp Merge branch 'development' into cmake/SPEC-7179 5 years ago
System.h Camera Component, Editor Viewport Widget refactoring. 4 years ago
SystemCFG.cpp CryEngine compiles 4 years ago
SystemCFG.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
SystemEventDispatcher.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
SystemEventDispatcher.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
SystemInit.cpp Fix issues with audio localization bank switching (#2945) 4 years ago
SystemWin32.cpp fix w4018 4 years ago
Timer.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Timer.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
WindowsErrorReporting.cpp Merge branch 'development' into cmake/SPEC-7179 5 years ago
XConsole.cpp CryEngine compiles 4 years ago
XConsole.h CryEngine compiles 4 years ago
XConsoleVariable.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
XConsoleVariable.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
crysystem_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
crysystem_shared_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago