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/Framework/AzCore/AzCore
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
..
Android Deprecate profiler categories based on global enum 4 years ago
Asset Deprecate profiler categories based on global enum 4 years ago
Casting Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Component Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
Compression Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Console Merge branch 'development' into cmake/SPEC-2513_w4244 4 years ago
Debug Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
Driller Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
EBus Settings registry notification deadlock fix (#3065) 4 years ago
IO Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller 4 years ago
IPC Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Interface Minimal TypeInfo header/reduce std interdependencies. (#2688) 4 years ago
JSON Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Jobs Merge branch 'development' into cmake/SPEC-2513_w4244 4 years ago
Math Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
Memory Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
Module Merge pull request #3272 from aws-lumberyard-dev/PIX 4 years ago
Name Addresses comments around AZ_TRAIT_UNIT_TEST_NAME_COUNT from PR 4 years ago
NativeUI Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Outcome Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PlatformId Add linux equivalents for all the places that enumerate platforms (#3325) 4 years ago
Preprocessor Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
RTTI Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
Script Remove RAD (pending future interface for external profiler registration) 4 years ago
ScriptCanvas Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Serialization Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
Settings Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking 4 years ago
Slice Deprecate profiler categories based on global enum 4 years ago
Socket Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
State Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Statistics Remove RAD (pending future interface for external profiler registration) 4 years ago
StringFunc change conversions to static_cast 4 years ago
Task More fixes for Code/Framework 4 years ago
Threading Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Time Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
UnitTest Refactor budget definitions as named functions instead of template specializations 4 years ago
UserSettings Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Utils Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
XML Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
std Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
AzCoreModule.cpp Add preliminary budget tracking system and remove driller integration 4 years ago
AzCoreModule.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
BuildInfo.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Docs.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Platform.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Platform.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PlatformDef.h remove unnecessary ALIGN macros 4 years ago
PlatformIncl.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
PlatformRestrictedFileDef.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
azcore_files.cmake Refactor budget definitions as named functions instead of template specializations 4 years ago
azcoretestcommon_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
base.h more fixes for Code 4 years ago