birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,931 Commits 3 Branches 3 Tags
main
Commit Graph

8931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Galvan c1d7294c5b Merge pull request #7120 from aws-lumberyard-dev/cgalvan/gitflow_220124_o3de_main 
Merged `stabilization/2111RTE` to `main`
2111.2 		2022-01-27 12:07:39 -06:00
Chris Galvan acc2346678 Merge remote-tracking branch 'upstream/stabilization/2111RTE' into cgalvan/gitflow_220124_o3de_main 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-01-24 13:13:43 -06:00
Alex Peterson 1909e5fa54 Handle case where engine.json missing or corrupt (#7049) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2022-01-21 13:09:09 -08:00
Tom Hulton-Harrop 93358dcbeb Cherry-pick of PR-6700 - Updates to ViewportTitleDlg to better expose grid snapping visualization (#6997) 
* cherry-pick of PR 6700

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* revert title dialog look to old style

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2022-01-21 09:19:53 +00:00
AMZN-Phil 0bddc1a826 Merge pull request #6429 from aws-lumberyard-dev/Prism/InstallerBuildNumCP 
Cherry pick changes to 2111RTE for installer version build number
 2022-01-20 10:33:32 -08:00
Alex Peterson 66f0f1cf5a Duplicate engine detection and help in Project Manager (#6984) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2022-01-19 17:55:05 -08:00
Chris Galvan c7284a781e Merge pull request #6365 from aws-lumberyard-dev/Atom/guthadam/materialcomponent/workaround_for_lost_image_overrides_with_prefabs 
Temporary fix for material component losing image overrides with prefabs
 2022-01-04 11:28:39 -06:00
hershey5045 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
amzn-sj fc3c5fbd09 [Mac] Fix build error in (#6410) 
Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-12-16 09:43:00 -08:00
Qing Tao 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)

* ATOM-16958 [Image Builder] Alpha data would be removed for source image with alpha content (#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
moudgils 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
AMZN-Phil 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
AMZN-Phil 82af1e6870 Force a string check on the version numbers 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-12-15 10:21:01 -08:00
AMZN-Phil 38c8d94156 Use version check to allow for a defined empty string to fail and greater to check build number is a number greater than 0 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-12-15 10:20:48 -08:00
AMZN-Phil f44697fbf4 Check whether env variables are defined 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-12-15 10:20:23 -08:00
Mike Chang c019fe8946 Add conditional to pull O3DE_BUILD_VERSION through environment var (#6096) 
Signed-off-by: Mike Chang <changml@amazon.com>
 2021-12-15 10:19:36 -08:00
AMZN-Phil 105524b7c0 Add a missing comma to fix generator 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-12-15 09:29:40 -08:00
AMZN-Phil 2fa10d7e6a Merge pull request #6397 from aws-lumberyard-dev/Prism/PMVS2022Check 
Force Project Manager to generate VS2019 projects on Windows
 2021-12-14 12:46:35 -08:00
rgba16f a60fba5bec Change Vulkan RHI CommandList::SetStreamBuffers to not do 2 memory allocation per draw by using fixed_vector 
Signed-off-by: rgba16f 82187279+rgba16f@users.noreply.github.com
 2021-12-14 14:15:36 -06:00
Nicholas Van Sickle 7e5115114c Merge pull request #6403 from aws-lumberyard-dev/nvsickle/FixAmbiguousTypeSerialization 
Ensure StoreTypeName stores the correct type for generic types
 2021-12-14 10:41:19 -08:00
Tom Hulton-Harrop 197e7b95e1 Fix for change with axis gizmo labels not appearing (#6256) (#6387) 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-14 09:24:10 +00:00
Nicholas Van Sickle f71b134a84 Ensure JsonSerializer::StoreTypeName stores the correct type for generic types 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-13 23:40:35 -08:00
AMZN-Phil 98fa18558e Force Project Manager to use VS2019 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-12-13 17:40:09 -08:00
carlitosan a2bb968371 Merge pull request #6345 from aws-lumberyard-dev/sc-editor-onto-rte-part4-6322 
Sc editor onto rte part4 6322
 2021-12-13 13:15:59 -08:00
rgba16f 2d13b648da Change Vulkan RHI CommandList::SetStreamBuffers to not do 2 memory allocation per draw by using fixed_vector 
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-12-13 13:16:02 -06:00
carlitosan 0a1dc3c4bd Fix missing asset handler error on EditorSCComponent load from pre SourceHandle files 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:54 -08:00
carlitosan 837e532ad7 fail safe for EditorScriptCanvasComponents saved before AZ::IO::Path got json support 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:52 -08:00
carlitosan a5b30ffc5a fix interpreted statics 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:50 -08:00
carlitosan 9830925309 small fixes for SC play in editor and warnings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:49 -08:00
carlitosan 0963bc0cc5 removed commented out include 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:47 -08:00
carlitosan dc538d94e5 update error window message and add AP launch request 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:45 -08:00
carlitosan cbc70b4b88 Add dialog window for messaging when SC assets fail to save 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:43 -08:00
carlitosan aeabf21bba clean up debug output settings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:41 -08:00
carlitosan 0f07de7454 fix verbose setting 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:39 -08:00
carlitosan ac6c90cd2c pre-PR cleanup 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:37 -08:00
carlitosan 169416c2f9 remove testing code 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:35 -08:00
carlitosan d284d908b9 Make version explorer wait on AP for dependent assets 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:33 -08:00
carlitosan d8e5315199 Use weak reference for undo state, as it is an entirely internal class 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:31 -08:00
carlitosan b9bbe233be Restore undo/redo 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:29 -08:00
carlitosan 3e728d1183 fixed another string_view printf error caught by linux compiler 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:27 -08:00
carlitosan b10c679c33 fixed string_view printf error caught by linux compiler 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:25 -08:00
carlitosan 4f00718a38 fix linux build error, change translation system errors to warnings 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:23 -08:00
carlitosan 07bf8fc755 fix linux build error 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:21 -08:00
chcurran 0cc4c06213 remove uneeded files/comments 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:19 -08:00
chcurran d31c6a2774 remove uneeded files/comments 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:28:17 -08:00
carlitosan b0ef83e194 Delete $tmp29198_Test_LY_79396.scriptcanvas 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-13 10:27:50 -08:00
Guthrie Adams 3bca63bb71 Temporary fix for material component losing image overrides with prefabs 
The bug reported that overridden texture properties would be lost whenever an entity was created, destroyed, or a prefab was created. Initially, it seemed like there was a problem with the custom JSON serializer for material properties. Debugging proved this to be incorrect because all of the data was converted to JSON values in the serializer on multiple passes. At some point during prefab patching, the data for the asset properties is lost while other values like colors and floats serialize correctly. Converting the asset data values into asset IDs resolves the immediate problem for the material component but the underlying issue is still under investigation by the prefab team. This change is being posted for review in case the underlying issue cannot be resolved in time for the next release.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>

Fixing unittests and moving texture conversion into material component controller

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-12-13 11:35:05 -06:00
lumberyard-employee-dm 40e1116e26 Use LegacySystemInterfaceCreated to initialize physics material library. (#6168) (#6347) 
* Use LegacySystemInterfaceCreated to initialize physics material library. OnCatalogLoaded was used before but it's not called when running the editor without assets processed yet.

Signed-off-by: moraaar <moraaar@amazon.com>

Co-authored-by: moraaar <moraaar@amazon.com>
 2021-12-13 12:10:36 +00:00
chcurran 87023cae47 finish last of pre-PR clean up, including saving over previsouly opened tabs 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:46 -08:00
chcurran 6421463df2 clean up WIP 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:46 -08:00