birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6b96be82ea'
${ noResults }
o3de/Code/Legacy/CrySystem
History
Esteban Papp 6b96be82ea Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
 		4 years ago
..
LevelSystem more fixes for Code 4 years ago
RemoteConsole Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ViewSystem Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller 4 years ago
XML PR comments/improvements 4 years ago
AZCoreLogSink.h more fixes 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 Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
LocalizedStringManager.h Merge branch 'development' into redcode/crythread-2nd-pass 4 years ago
Log.cpp Merge branch 'development' into cmake/linux_fix_warn_unused 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 Merge branch 'development' into cmake/linux_fix_warn_unused 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 Refactor budget definitions as named functions instead of template specializations 4 years ago
SystemEventDispatcher.h [redcode/crythread-2nd-pass] removed CryThread*.h files 4 years ago
SystemInit.cpp Merge branch 'development' into cmake/linux_fix_warn_unused 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 Fixed console variables crash. 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