birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
6b96be82ea6640cad04ed57ab494dec9a00c7ec7
o3de/Gems/Atom/Feature/Common/Code/Source
T
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
2021-08-25 11:47:19 -07:00
..
ACES
Overhaul of LookModification (#3282)
2021-08-18 16:59:34 -05:00
AuxGeom
Gems/Atom
2021-08-23 13:01:33 -07:00
Builders
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Checkerboard
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CoreLights
Merge branch 'development' into cmake/linux_fix_warn_unused
2021-08-20 14:51:35 -07:00
Decals
Merge branch 'development' into cmake/linux_fix_warn_unused
2021-08-20 14:51:35 -07:00
DiffuseGlobalIllumination
more fixes
2021-08-20 10:09:44 -07:00
DisplayMapper
Overhaul of LookModification (#3282)
2021-08-18 16:59:34 -05:00
ImageBasedLights
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ImGui
Fix input priority conflict with LyShine and ImGuiPass (#3329)
2021-08-23 13:05:19 -07:00
LookupTable
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LuxCore
Gems/Atom builds
2021-07-30 18:53:50 -07:00
Material
Changed MaterialConverterBus GetMaterialTypePath() to return a string instead of char*
2021-08-20 17:22:11 -07:00
Math
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Mesh
Merge branch 'development' into ExposeLodControls
2021-08-20 12:45:00 -07:00
MorphTargets
fixing Atom
2021-08-16 16:03:36 -07:00
OcclusionCullingPlane
Gems/Atom
2021-08-23 13:01:33 -07:00
Platform
Gems/Atom builds
2021-07-30 18:53:50 -07:00
PostProcess
Overhaul of LookModification (#3282)
2021-08-18 16:59:34 -05:00
PostProcessing
some unused fixes
2021-08-19 18:26:43 -07:00
RayTracing
more fixes
2021-08-20 10:09:44 -07:00
ReflectionProbe
Gems/Atom
2021-08-23 13:01:33 -07:00
ReflectionScreenSpace
Gems/Atom
2021-08-16 16:05:31 -07:00
ScreenSpace
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Shadows
more fixes
2021-08-20 10:09:44 -07:00
SkinnedMesh
Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller
2021-08-24 15:07:27 -06:00
SkyBox
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TransformService
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Utils
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CommonModule.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CommonSystemComponent.cpp
Promote IndexedDataVector to public Feature/Utils header
2021-07-31 00:26:23 -06:00
CommonSystemComponent.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorCommonSystemComponent.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorCommonSystemComponent.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
FrameCaptureSystemComponent.cpp
move JsonUtils to AzCore
2021-08-17 14:06:24 -07:00
FrameCaptureSystemComponent.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ProfilingCaptureSystemComponent.cpp
Merge branch 'development' into cmake/linux_fix_warn_unused
2021-08-24 11:49:35 -07:00
ProfilingCaptureSystemComponent.h
[ATOM-16021] Initial continuous capture support (#2624)
2021-08-10 09:57:04 -07:00
RenderCommon.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00