Commit Graph

4687 Commits

Author SHA1 Message Date
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts).
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-08 13:56:47 -05:00
Esteban Papp d075d5f7b5 fix AzGenericTypeInfo template handling with clang 12+ (#833) (#1947)
Co-authored-by: Tom spot Callaway <spot@fedoraproject.org>
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Co-authored-by: Tom "spot" Callaway <72474383+spotaws@users.noreply.github.com>
Co-authored-by: Tom spot Callaway <spot@fedoraproject.org>
2021-07-08 11:29:55 -07:00
Scott Romero 0730960a4f [development] Mobile settings tool validator and save fixes (#1931)
Updated and simplified the version number validation regex to support 4-component numerical only version strings
Removed stale WAF reconfigure and replaced save notification dialog to inform the user a manual reconfigure of the project may be required for the settings to be propagated
2021-07-08 11:28:42 -07:00
Chris Galvan 5bba645521 Merge pull request #1959 from aws-lumberyard-dev/cgalvan/SupportVectorMinAttributes
Fixed EMFX nodes min/max attributes.
2021-07-08 12:26:42 -05:00
Chris Galvan cb069d68f0 Removed min/max settings that were just using the float min/max since these are the default.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-08 11:54:51 -05:00
Jacob Hilliard 08c2796760 [ATOM-15682] Initial CPU Visualizer widget (#1836)
* Visualizer: implement basic performance widget with controls

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: implement basic function statistics

 - Fix floating point bug in drawing logic
 - Implement color picker for regions
 - Aggregate invocations and average time across frames

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: drawing execution time labels

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: fix fstring type errors

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: fix remaining fstring errors

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: implement cursor-relative zooming

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: try to update AR status

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: address PR comments + cleanup

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: address more PR comments

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: address more PR comments

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
2021-07-08 09:52:04 -07:00
Esteban Papp c132b00f6e Removing some unused files from Code/Editor/Plugins (#1943)
* fix path

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* remove some unused files from Code/Editor/Plugins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-08 09:46:31 -07:00
mgwynn 82d2fb9244 Adding header to resolve undefined type error (#1938)
Signed-off-by: mgwynn <mgwynn@amazon.com>
2021-07-08 09:26:56 -07:00
Chris Galvan 15acb6b85a Merge pull request #1422 from aws-lumberyard-dev/nvsickle/CameraInputHardening
Switch RenderViewportWidget to Qt based events instead of AzFramework ones
2021-07-08 11:23:31 -05:00
Chris Galvan 1a2f83043d Merge pull request #1960 from aws-lumberyard-dev/jckand/ViewMenuTestFix
Updating expected View menu options for test_Menus_ViewMenuOptions_Work
2021-07-08 10:40:15 -05:00
carlitosan 78ea825df2 Merge pull request #1744 from aws-lumberyard-dev/carlitosan/thecleansing
Removal of dead runtime code from ScriptCanvas editor
2021-07-08 08:37:33 -07:00
Qing Tao 6d9230e292 ATOM-15939 Add support to capture attachment for ParentPass (#1887)
* ATOM-15939 Add support to capture attachment for ParentPass
- Moved the attachment read back support to Pass class so it supports both ParentPass and RenderPass.
- Added support to output input or output state of an InputOutput attachment.
- Enabled showing ParentPass attachments in PassTree tool.

Signed-off-by: Tao <qingtao@amazon.com>
2021-07-08 08:23:37 -07:00
hultonha 2affcad2bb Merge pull request #1647 from aws-lumberyard-dev/LYN-3718
LYN-3718 After searching for something and selecting an item in Asset Picker, deleting the term in the search bar de-selects the selected item
2021-07-08 15:17:11 +01:00
jckand-amzn ea0e38aaf4 Updating expected View menu options for test_Menus_ViewMenuOptions_Work
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-07-08 08:10:09 -05:00
Chris Galvan 86c9c04c37 Fixed EMFX nodes min/max attributes.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-08 08:02:27 -05:00
moraaar af48fc44e3 Fixed warning of variable not being used in release of ImguiAtom.
Signed-off-by: moraaar <moraaar@amazon.com>
2021-07-08 12:37:43 +01:00
moraaar 8a582fdf3f Udating SHA for nvcloth windows package.
Signed-off-by: moraaar <moraaar@amazon.com>
2021-07-08 11:55:59 +01:00
moraaar 7d5f8d5125 Updating linux version of NvCloth, poly2tri and v-hacd.
Signed-off-by: moraaar <moraaar@amazon.com>
2021-07-08 11:55:59 +01:00
moraaar 15e0aa7984 Use latest version of nvcloth, poly2tri and v-hacd 3rdParty libraries for windows, android, mac and ios.
Signed-off-by: moraaar <moraaar@amazon.com>
2021-07-08 11:55:59 +01:00
sphrose 83d1bc0fbf Merge branch 'stabilization/2106' into LYN-3718 2021-07-08 10:19:11 +01:00
Jon B e8cc6a86ed Merge pull request #1944 from aws-lumberyard-dev/pruiksma/LYN-3913
[LYN-3913] Fix conversion to unsupported photometric unit on light type change
2021-07-07 19:09:18 -07:00
Jon B 1d14d95be8 Merge pull request #1939 from aws-lumberyard-dev/pruiksma/ltc_fix_fix
Undoing change from review feedback as it led to an incorrect result in some cases
2021-07-07 19:08:14 -07:00
Jeongseok Lee ec026963b8 Create 3rd-party directory if not exists (#1877)
Signed-off-by: Jeongseok Lee <jeoslee@amazon.com>
2021-07-07 18:18:48 -07:00
Chris Galvan adb300b586 Merge pull request #1695 from aws-lumberyard-dev/cgalvan/FixLCGraphNotOpeningOnEdit
[LYN-3195] Fixed fancy docking restore state to only touch dock tab containers that it created
2021-07-07 20:18:09 -05:00
chcurran 21b511b174 Merge branch 'carlitosan/thecleansing' of https://github.com/aws-lumberyard-dev/o3de into carlitosan/thecleansing 2021-07-07 17:13:11 -07:00
chcurran 7dbdfbc3fe Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 2021-07-07 17:10:27 -07:00
Shirang Jia 55a3b41222 Fix unmounting error (#1940) 2021-07-07 16:44:42 -07:00
Chris Galvan c097ae8235 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-07 18:43:26 -05:00
SJ 9ca7a698df Fix Mac Editor crash when adding PhysX Collider component to an entity. (#1930)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-07-07 18:17:40 -05:00
Ken Pruiksma d5fdd1035f Merge branch 'stabilization/2106' into pruiksma/ltc_fix_fix 2021-07-07 18:07:19 -05:00
Ken Pruiksma 6c0264862e Removing unnecessary code
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-07-07 18:05:36 -05:00
Ken Pruiksma a75b8eb636 [LYN-3913] Fix conversion to unsupported photometric unit on light type change.
When converting to a light type that doesn't support the currently used photometric unit, the editor component will convert the photometric unit to the universally supported lumen.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-07-07 18:00:40 -05:00
Twolewis b9964bbb5a Fixed Material Editor not launching (#1920)
* Fixed Material Editor not launching

Explicitly providing project-path as part of launch parameters.

Signed-off-by: Lloyd Tullues <lloyd@carbonated.com>

* Update Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: Lloyd Tullues <lloyd@carbonated.com>

* Minor - adding whitespace for consistency

Signed-off-by: Lloyd Tullues <lloyd@carbonated.com>

Co-authored-by: Lloyd Tullues <lloyd@carbonated.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-07 15:16:09 -07:00
Ken Pruiksma 5e98eefcc2 Undoing change from review feedback as it led to an incorrect result in some cases.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-07-07 17:13:43 -05:00
Shirang Jia 992f5aab1b Convert Incremental scripts to Python3 (#1934)
Convert incremental build script to Python3
2021-07-07 15:12:10 -07:00
Tommy Walton f177f671ac Fix for LYN-4594: [Atom][EMFX] Loading a saved level with entity and an actor component causes the editor to freeze. (DCO fixup) (#1878)
* Queue shader loads and register with the dynamic draw context after the shader is loaded to avoid a deadlock when there are multiple scenes processing at the same time.

Signed-off-by: amzn-tommy <waltont@amazon.com>

* Fixed AzCore case in AtomFont.h and two other files I found while searching

Signed-off-by: amzn-tommy <waltont@amazon.com>

* Switched to a utility that will both get the assetId and create the Asset, without calling GetAsset explicitely

Signed-off-by: amzn-tommy <waltont@amazon.com>

* Fixing typos in error message

Signed-off-by: amzn-tommy <waltont@amazon.com>
2021-07-07 15:09:14 -07:00
Tommy Walton 5b9647c11b Fix for ATOM-15923 : Editor Spends Several Minutes Entering/Ending Play Game Mode (#1846)
* Cut off kd-tree generation if more than 10 percent of triangles straddle split axis

Signed-off-by: amzn-tommy <waltont@amazon.com>

* Switched to aznumeric_cast and added a comment with a JIRA to follow up on

Signed-off-by: amzn-tommy <waltont@amazon.com>
2021-07-07 15:08:57 -07:00
Qing Tao 1b474afdb0 ATOM-14322 Random crashes when exist RHI/Raytracing sample running __fullTestSuite__ (#1926)
Signed-off-by: Tao <qingtao@amazon.com>
2021-07-07 14:55:36 -07:00
chcurran 76d959dccf Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 2021-07-07 14:49:23 -07:00
nvsickle c8fb453760 Fix copyright header copy/paste issue.
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-07 14:40:59 -07:00
Chris Galvan 30f8c75613 Merge pull request #1908 from aws-lumberyard-dev/cgalvan/FixLegacyCryIcons
Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.
2021-07-07 16:39:46 -05:00
Chris Galvan 3037837be6 Fixed logic to remove the tabs not close them.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-07 16:37:25 -05:00
Chris Burel 80bdd4e17b Clang compile fixes (#1876)
* Fix compile error from -Wwritable-strings

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix flags used to build MaskedOcclusionCulling with clang

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix class that has a final destructor, but the class itself was not final

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-07 14:34:45 -07:00
lumberyard-employee-dm 3be4c9a393 Removing extra whitespace from the ScriptCanvas Node Library files
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-07 16:33:16 -05:00
lumberyard-employee-dm f9f711c039 Removing superfluous whitespace.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-07 16:33:09 -05:00
Alex Peterson af8e6afc6a Update README LFS instructions (#1925)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
2021-07-07 14:31:45 -07:00
amzn-phist 302fef2ec8 Update Wwise version info in Readme.md (#1910)
* Update Wwise version info in Readme.md

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Updates to Wwise readme text

Correct capitalization of 'Wwise' and add info about selecting the
SDK(C++) component.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-07-07 16:22:52 -05:00
Mike Balfour 274669a1b4 Fixed Vegetation Debugger to work with Atom rendering and AZ::Console. (#1924)
The previous implementation used Cry rendering and CVars and had been left in a commented-out state. These changes restore it back to full functionality.

Signed-off-by: mbalfour <mbalfour@amazon.com>
2021-07-07 16:05:38 -05:00
Terry Michaels 24d21cadae Merge pull request #1475 from aws-lumberyard-dev/nvsickle/ViewportInfoDpiScaling
Make IMGUI & viewport info scale with DPI
2021-07-07 15:55:46 -05:00
nvsickle 964b4247f7 Update license header
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-07 13:50:13 -07:00