4c582a2b0a
Merge branch 'main' into non-uniform-scale-mesh
2021-04-15 08:29:57 +01:00
79a34f87b0
fixing merge conflicts
2021-04-15 08:28:50 +01:00
d8169e08fb
merging from main
2021-04-15 08:18:11 +01:00
fa7f61cf0d
ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
...
- Added pause/resume button to ImGui Profiler to pause/resume profiling
- Added showing pass execution timeline
- Change TimestampResult to include both begin tick and duration tick. Update some function names of TimestampResult.
- Update some functions names in Pass.
- Stop showing accumulated time for ParentPass.
- Fixed a crash issue with ImGuiManager which doesn't have default font.
2021-04-14 22:48:46 -07:00
3d3f43b0b9
Merge pull request #36 from aws-lumberyard-dev/Atom/moudgils/MacRuntimeFixes
...
Atom/moudgils/mac runtime fixes
2021-04-14 20:57:40 -07:00
b5386fd53b
Merge pull request #54 from aws-lumberyard-dev/Atom/dmcdiar/LYN-2735
...
[LYN-2735] The Editor crashes upon creating a level when the Prefab system has been disabled in a new project
2021-04-14 15:51:04 -07:00
2fb2813b48
updating atom mesh component to support non-uniform scale component
2021-04-14 14:05:59 +01:00
9aec30a608
Merge branch 'main' into Atom/moudgils/MacRuntimeFixes
2021-04-13 21:48:17 -07:00
68d58f48ae
Merge branch 'main' into Atom/moudgils/MacRuntimeFixes
2021-04-13 19:45:18 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
e6c12499f7
Added raytracingscenesrg.srgi to the default project template and AutomatedTesting project.
...
Added assert to check for successful load of the raytracingscenesrg asset.
2021-04-13 14:05:48 -07:00
16ba08c917
Mac compile fixes, Fix imgui rendering, Introduce a new RHI::BufferBindFlag, Fix a crash in AsyncStreaming, Fix shader build errors
2021-04-13 11:03:27 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
greerdv
qingtao
moudgils
dmcdiarmid-ly
moudgils
alexpete