2dcf206b35
Merge commit 'd7dc2579270d2f78786c14d69648692e714a11bc' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:50:27 -06:00
832e78e588
Merge commit 'fc3c5fbd09ed410305cc4f436155850117203701' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:50:21 -06:00
f49df9c474
Merge commit '94ddafc7a2c5c1987e25bfca845c16d03b35f1fc' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:50:16 -06:00
ac6f005240
Merge commit 'fb36145e2e1f34574948233aa65eaa97f20e6e67' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:47:27 -06:00
f23798a10a
Merge commit '58b6a9c1acfc4e1344e9d0b79b5572ef173c030c' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:30 -06:00
f6faad4adb
Merge commit '2fa10d7e6a99c38d578fe5ed969cfd07c5f0df28' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:24 -06:00
065a3144fc
Merge commit 'a60fba5bec8180ca4859be29d9c37ea0e14300bf' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:19 -06:00
a07534ea51
Merge commit '7e5115114ca9500abf67095acb71fbb6087d06c8' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:13 -06:00
efaa5d4d0f
Merge commit '197e7b95e1b217991c5599134b492dbecf9cedfc' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:08 -06:00
2c8a93fb9c
Merge commit 'a2bb968371194a92bdd6e2841f73c85a79ce2a20' into mbalfour/gitflow_211220_stabilization_2111RTE
...
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
# Conflicts:
# Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
# Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp
# Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.cpp
# Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.h
# Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
# Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.h
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerBus.h
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h
# Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
# Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl
# Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp
# Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetHandler.h
# Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.cpp
# Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h
# Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasFileHandling.h
# Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponent.h
# Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
# Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp
# Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp
# Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.h
# Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp
# Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
# Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
# Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp
# Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Modifier.cpp
# Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Scanner.cpp
# Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h
# Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
# Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.h
# Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
# Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
# Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp
# Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
2021-12-20 14:42:47 -06:00
79fcef41b3
Merge commit '40e1116e26628849c91fc450f4ce2c3720aca297' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 13:49:24 -06:00
22df3a843e
Merge commit '6613030fe691d87c3a870f17c448746616c44787' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 13:49:19 -06:00
d586d5f80c
Merge commit 'ac03b6f50b3b417f723bb4d0699d254dc3edc78d' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 13:49:13 -06:00
bb14675db7
Fix tests Debug ( #6405 )
...
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
2021-12-20 16:53:41 +00:00
d5b9cf10cf
Collection of miscellaneous PAL changes required for restricted platforms. ( #6482 )
...
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-12-20 08:15:10 -07:00
fea4d0e6b1
adding TimeSystem unit tests ( #6446 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-12-20 14:32:25 +00:00
798a8478ed
Merge pull request #6489 from aws-lumberyard-dev/Atom/scottmur/displaymapper_sandbox
...
sandboxing DisplayMapper P0 test for investigation
2021-12-17 17:48:41 -08:00
c6eead4efa
remove uber build exceptions ( #6466 )
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-17 15:23:14 -08:00
1ba23247b4
sandboxing DisplayMapper P0 test for investigation
...
Signed-off-by: Scott Murray <scottmur@amazon.com >
2021-12-17 15:16:24 -08:00
ddfcccfe2a
Add EditorPythonBindings as an explicit dependency of the White Box Tool ( #6479 )
...
* add EditorPythonBindings as an explicit dependency of the White Box Tool
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add Gem::EditorPythonBindings.Editor as a runtime dependency to White Box Tool Gem
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* remove redundant target scope
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-12-17 16:24:16 -06:00
18ce01ba7c
Add 2 performance testing levels ( #6463 )
...
First a level with approximately 10K cubes with various PBR materials
Second a level with a vegetation system set up to spawn between 10K - 30K instances of cubes with various PBR materials
Plus ancillary data files these levels need.
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com >
2021-12-17 15:08:43 -06:00
9c7a558ccb
basic refactor of assets ( #6467 )
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-17 12:36:05 -08:00
2ddf55474e
chore: remove "using namespace " from AZCore Memory ( #6373 )
...
* chore: remove "using namespace " from AZCore Memory
REF: https://github.com/o3de/o3de/issues/6281
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: fix formatting
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: fix indentation for AllocatorBase.cpp
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: fix formatting
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: address minor checkstyle problems
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-12-17 13:26:31 +00:00
d20aa935ba
Quaternion to scaled-axis angle representation (and back) helpers ( #6421 )
...
Direct conversion helpers for quaternion to the scaled axis-angle representation and back without the need to convert them first to the axis-angle format and manually scale (or normalize on the way back). This also avoids having to deal with the special case of an identity representation which is 0,0,0 in the scaled axis-angle format while our convention for axis-angle is 0,1,0 for the axis and 0 for the angle.
Added unit tests that check the conversion round-trips from quaternion -> (scaled) axis-angle -> quaternion as well as comparing the scaled axis-angle representations from the direct helper functions as well as the axis-angle while manually scaling/normalizing.
Signed-off-by: Benjamin Jillich <jillich@amazon.com >
2021-12-17 09:43:35 +01:00
8dc5f9b07c
Merge pull request #6461 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16956
...
Disable DiffuseProbeGridDownsamplePass
2021-12-16 17:39:56 -07:00
ae8f724124
Merge pull request #6394 from aws-lumberyard-dev/carlitosan-sc-redcode-asset
...
redcoding asset handler, holder, tracker, memory asset
2021-12-16 16:29:58 -08:00
ea04449fa0
Merge pull request #6266 from aws-lumberyard-dev/Neil_o3de_local
...
Converting PbrMaterialChart to prefab, and moving to AutomatedTesting
2021-12-16 16:23:42 -08:00
f52d49834a
[EMotionFX] Prefer #pragma once ( #6435 )
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-12-16 13:42:38 -08:00
285d92ff0d
[AudioSystem] ACE bug fix: Ctrl-S doesn't work correctly when a level is loaded. ( #6411 )
...
Signed-off-by: Maxim Ivanov <imginimg@gmail.com >
2021-12-16 14:53:22 -06:00
a08881cdf8
Merge branch 'development' into Atom/dmcdiar/ATOM-16956
2021-12-16 13:27:27 -07:00
ad5f3f0e53
Merge pull request #6439 from aws-lumberyard-dev/Atom/antonmic/ClearPass
...
Atom/antonmic/clear pass
2021-12-16 12:12:36 -08:00
d7dc257927
Add MainPipeline to pass hierarchy for when HDR color grading component requests for the lut generation's image attachment. ( #6436 )
...
Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com >
2021-12-16 12:07:37 -08:00
20e697a8d6
Fixing case error with material files
...
Signed-off-by: nwidmaie <nwidmaie@amazon.com >
2021-12-16 11:32:47 -08:00
53cf7b462b
Changing all ClearPass to SlowClearPass
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-12-16 11:03:20 -08:00
2bc381811d
addressed PR feedback
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-12-16 10:42:53 -08:00
fc3c5fbd09
[Mac] Fix build error in ( #6410 )
...
Signed-off-by: amzn-sj <srikkant@amazon.com >
2021-12-16 09:43:00 -08:00
94ddafc7a2
Atom/qingtao/image builder fixes ( #6432 )
...
* LYN-8837 o3de Material Editor - Texture Settings Editor - Hangs when converting texture (#6359 )
Fixed a editor hanging issue when preview texture with astc format (starts multiple job threads inside a job thread)
Fixed an issue of changing texture setting didn't trigger image re-process.
Fixed an issue with image asset which has texture setting may have dependency with wrong preset
Added a EIF_HDR for source image in hdr format.
Fixed astc compression issue which may wrongly compress image to HDR astc format
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com >
(cherry picked from commit d9f0a3012d#6412 )
Fixed a regression issue with image builder which it can choose proper preset for images with alpha content.
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com >
(cherry picked from commit b640f6d691
2021-12-16 09:19:44 -08:00
18cfcd659b
Fix missing parent class reflection for ProceduralPrefabSystemComponent ( #6413 )
...
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-12-16 07:49:32 -08:00
f4ae3a5b7d
Fix: Find function reports code with a line offset of 1 ( #6331 )
...
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com >
2021-12-16 15:39:03 +00:00
01770a1574
Fixes for CameraInput handling ( #6425 )
...
* add temporary optimize off calls
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix + tests for camera input issue
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* simplify boolean expression (PR feedback)
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-12-16 09:35:39 +00:00
d065eb9498
Initial improvements to fix viewport icon selection and draw order ( #6284 )
...
* wip fixes for entity viewport icons displaying in the correct order and handling selection correctly
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add additional comment about z value
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* move manual sorting and some small tidy-up
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update comment
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates following initial round of PR feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* additional changes to support tests for entity icon intersection
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add support to enable/disable icons separately from helpers
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* final tests added and small tidy-up to display EntityId correctly
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update some manipulator test framework calls after utility functions were moved
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix for implicit cast
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* move icon scale values to AZ_CVARS
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix failing tests caught in AR and update some naming conventions for tests
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update naming convention for members of ProjectedViewportRay
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update other references to ProjectedViewportRay
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update more references to ProjectedViewportRay change
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update menus for python tests
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-12-16 09:35:23 +00:00
73e0bdbe6e
fix version deletion error
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-15 21:49:01 -08:00
df8326a1b0
Merge pull request #6440 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16961
...
Fix for missing meshes in the RayTracing Acceleration Structure
2021-12-15 22:07:24 -07:00
c800b38ef9
Merge branch 'development' into Atom/dmcdiar/ATOM-16956
2021-12-15 21:23:31 -07:00
a1be8f832e
Build BLAS objects from the BLAS instance list instead of the mesh list
...
Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com >
2021-12-15 19:38:39 -07:00
18bb69a5cb
removed unnecessary lines
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-12-15 18:37:48 -08:00
fb36145e2e
Rte fixes for stability ( #6434 )
...
* Fixed SRG updated related crash
Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com >
* Fixed SRG compile issue with metal which leads to multiple gpu crashes inlucde ImGuiPass render crash (#6315 )
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com >
Co-authored-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com >
2021-12-15 18:35:17 -08:00
0a8ba35738
Added ClearPass and automatic instantiation from ParentPass for slots specifying a clear action
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-12-15 18:32:59 -08:00
58b6a9c1ac
Merge pull request #6427 from aws-lumberyard-dev/Prism/GeneratorFix
...
Add a missing comma to fix generator
2021-12-15 16:05:30 -08:00
cf9385fc39
Garbled name when using Chinese charaters ( #6379 )
...
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com >
2021-12-15 17:42:14 -06:00
Mike Balfour
AMZN-Igarri
bosnichd
amzn-sean
jromnoa
carlitosan
Scott Murray
Tom Hulton-Harrop
rgba16f
Michael Pollind
Benjamin Jillich
dmcdiarmid-ly
Chris Burel
Maxim Ivanov
antonmic
hershey5045
nwidmaie
amzn-sj
Qing Tao
amzn-mike
tjmgd
moudgils
AMZN-Phil