birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
10a8780e6f669df86b0abc1cda98f7dabca65495
o3de/Gems/Atom/Feature/Common/Code/Source
T
History
dmcdiar 10a8780e6f Merge branch 'main' into Atom/dmcdiar/ATOM-14951 
# Conflicts:
#	Gems/Atom/Feature/Common/Assets/Passes/OpaqueParent.pass
#	Gems/Atom/Feature/Common/Assets/Passes/ReflectionGlobalFullscreen.pass
#	Gems/Atom/Feature/Common/Assets/Passes/Reflections.pass
#	Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardPassOutput.azsli
#	Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionGlobalFullscreen.azsl
2021-04-22 21:49:21 -07:00
..
ACES
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
AuxGeom
Merge branch 'main' into non-uniform-scale-mesh
2021-04-19 11:05:10 +01:00
Builders
Initial commit
2021-03-08 14:30:57 -08:00
Checkerboard
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
CoreLights
Fix for directional light not having shadows in editor
2021-04-21 11:54:37 -07:00
Decals
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
DiffuseProbeGrid
Minor cleanup
2021-04-20 01:01:27 -07:00
DisplayMapper
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
ImageBasedLights
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
ImGui
Merge branch 'main' into Atom/moudgils/MacRuntimeFixes
2021-04-13 19:45:18 -07:00
LookupTable
Initial commit
2021-03-08 14:30:57 -08:00
LuxCore
Initial commit
2021-03-08 14:30:57 -08:00
Material
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
Math
Initial commit
2021-03-08 14:30:57 -08:00
Mesh
Merge branch 'main' into Atom/dmcdiar/ATOM-14951
2021-04-22 21:49:21 -07:00
MorphTargets
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
Platform
Initial commit
2021-03-08 14:30:57 -08:00
PostProcess
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
PostProcessing
ATOM-15252 [Atom 0.8.5] Track View capture crashes when scene contains certain postfx
2021-04-16 09:47:03 -07:00
RayTracing
Merge branch 'main' into non-uniform-scale-mesh
2021-04-21 10:56:36 +01:00
ReflectionProbe
feedback from PR
2021-04-20 10:25:19 +01:00
ReflectionScreenSpace
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
ScreenSpace
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
Shadows
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
SkinnedMesh
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
SkyBox
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
TransformService
feedback from PR
2021-04-20 10:25:19 +01:00
Utils
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
2021-04-18 12:12:32 -05:00
CommonModule.cpp
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
CommonSystemComponent.cpp
Added DiffuseProbeGridClassification pass.
2021-04-19 02:29:20 -07:00
CommonSystemComponent.h
Initial commit
2021-03-08 14:30:57 -08:00
EditorCommonSystemComponent.cpp
Initial commit
2021-03-08 14:30:57 -08:00
EditorCommonSystemComponent.h
Initial commit
2021-03-08 14:30:57 -08:00
FrameCaptureSystemComponent.cpp
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
FrameCaptureSystemComponent.h
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
ProfilingCaptureSystemComponent.cpp
ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
2021-04-14 22:48:46 -07:00
ProfilingCaptureSystemComponent.h
Initial commit
2021-03-08 14:30:57 -08:00
RenderCommon.h
Minor changes to comment.
2021-04-21 00:29:32 -07:00