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 '5f22dc817c'
${ noResults }
o3de/Code/Legacy/CrySystem
History
Esteban Papp 37ffe90353 Merge branch 'development' into cmake/SPEC-7182 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/QtUtil.h
#	Code/Legacy/CryCommon/Linux_Win32Wrapper.h
#	Code/Legacy/CryCommon/ProjectDefines.h
#	Code/Legacy/CryCommon/StringUtils.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CryCommon/UnicodeEncoding.h
#	Code/Legacy/CryCommon/UnicodeFunctions.h
#	Code/Legacy/CryCommon/UnicodeIterator.h
#	Code/Legacy/CryCommon/WinBase.cpp
#	Code/Legacy/CryCommon/platform.h
#	Code/Legacy/CryCommon/platform_impl.cpp
#	Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
#	Gems/Maestro/Code/Source/Cinematics/Movie.cpp
 		5 years ago
..
LevelSystem Merge branch 'development' into cmake/SPEC-7182 5 years ago
RemoteConsole Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ViewSystem Merge branch 'development' into cmake/SPEC-7182 5 years ago
XML Merge branch 'development' into cmake/SPEC-7182 5 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 removing files that got added by rebase 5 years ago
CmdLine.h More string fixes 5 years ago
CmdLineArg.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CmdLineArg.h More string fixes 5 years ago
ConsoleBatchFile.cpp Merge branch 'development' into cmake/SPEC-7484 5 years ago
ConsoleBatchFile.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ConsoleHelpGen.cpp Code/Legacy cleanup 5 years ago
ConsoleHelpGen.h More string fixes 5 years ago
CrySystem_precompiled.h removing more unused stuff 5 years ago
DebugCallStack.cpp More windows/linux fixes 5 years ago
DebugCallStack.h More string fixes 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 Merge branch 'development' into cmake/SPEC-7182 5 years ago
IDebugCallStack.h linux fixes 5 years ago
LocalizedStringManager.cpp Some more build fixes 5 years ago
LocalizedStringManager.h More string fixes 5 years ago
Log.cpp Merge branch 'development' into cmake/SPEC-7484 5 years ago
Log.h removing files that got added by rebase 5 years ago
SimpleStringPool.h CryEngine compiles 5 years ago
System.cpp Code/Legacy cleanup 5 years ago
System.h Merge branch 'development' into cmake/SPEC-7484 5 years ago
SystemCFG.cpp Merge branch 'development' into cmake/SPEC-7484 5 years ago
SystemCFG.h Code/Legacy cleanup 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 Merge branch 'development' into cmake/SPEC-7182 5 years ago
SystemWin32.cpp Merge branch 'development' into cmake/SPEC-7182 5 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 Code/Legacy cleanup 5 years ago
XConsole.cpp @lumberyard-employee-dm suggestion to use (w)string_view as the src to simplify functions in conversions.h 5 years ago
XConsole.h Merge branch 'development' into cmake/SPEC-7484 5 years ago
XConsoleVariable.cpp Code/Legacy cleanup 5 years ago
XConsoleVariable.h runtime fixes (Editor running) 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