Commit Graph

4193 Commits

Author SHA1 Message Date
lumberyard-employee-dm e06ec2caa9 Fixed cmake configuring when using an External Gem (#2020)
The ly_get_absolute_pal_filename method has been refactored to no longer
use regular expressions to determine how to split a PAL directory, but
instead Path operations are used

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-09 12:19:42 -05:00
jjjoness 1b530195fc Clarify ImGui activation in Editor viewport (#1765)
* Clarify ImGui activation in Editor viewport

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* All working following changes from comments in PR

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* One more change

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* fixes from comments in PR.

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fixed git merge error

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Added header to ImGuiBus.h

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fix for Jenkins error

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Minor typo fix

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-07-09 12:03:20 -05:00
Benjamin Jillich 76cef6e91f Project Manager: Showing a progress bar when copying projects (#2025)
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-09 18:38:11 +02:00
Esteban Papp e3be8b4c46 Enable AZ_TRAIT_AZFRAMEWORK_USE_PROJECT_MANAGER for Mac/Linux (#2017)
Validated it opens the project manager in Mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-09 09:01:35 -07:00
Benjamin Jillich 595ac3fb08 Project Manager: Feature tag filtering for header of the gem catalog (#1956)
* [LYN-4440] Added new feature tag remove icon

Signed-off-by: Benjamin Jillich <jillich@amazon.com>

* [LYN-4440] Added new gem filter tag widget

Signed-off-by: Benjamin Jillich <jillich@amazon.com>

* [LYN-4440] Added feature tag widget used for showing the filtered tags in the gem catalog header

Signed-off-by: Benjamin Jillich <jillich@amazon.com>

* [LYN-4440] Added filter tag widget container to the gem catalog header and connected it to the gem model

Signed-off-by: Benjamin Jillich <jillich@amazon.com>

* [LYN-4440] Syncing the feature tag filters on the left panel with the tag widgets in the header and styling the item delegates

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-09 17:18:35 +02:00
AMZN-nggieber 5b44ea9b9a Project Manager: Added Per Project Template Previews and Icon Overlays (#1994)
* Project Manager: Added Per Project Template Previews and Icon Overlays

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

* Remove template icon overlays and bake them into template preview

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

* Remove unused variables and headers

Signed-off-by: nggieber <nggieber@amazon.com>
2021-07-09 17:15:34 +02:00
lumberyard-employee-dm 097dc25424 Fixed the discovery of the dependencies of gem variant aliases which (#2013)
alias INTERFACE LIBRARY targets.

This was causing the dependent Atom_AtomBridge sub gems from not being
found when generating the cmake_dependencies.*.setreg file containing
the list of gem modules to load

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-09 00:41:25 -05:00
Esteban Papp d7c8c0192f SPEC-7503 Mac nightly run asset profile failed to process "Translation/scriptcanvas_en_us.ts" (#1742)
* copy frameworks to output for loose file case

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

* patching lrelease

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

* Fix for python in loose files and bundles

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

* found what the problem is, setting a version just in case

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

* fixup_bundle working with Python.framework and codesigning on AssetProcessor.app

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

* Trying to ignore other files to solve Jenkins

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

* Fix some qt stuff for mac

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

* removal of cstemp files to prevent signature failures

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

* Updating Qt with fixes to solve some qt framework issues with include paths

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-08 17:20:20 -07:00
sharmajs-amzn fcc327e1ed adding stl assetinfo rule (#1972)
Signed-off-by: sharmajs <sharmajs@amazon.com>
2021-07-08 15:21:31 -07:00
Chris Burel 8ef87dc998 Avoid looking for an entry in a map that doesn't exist (#1980)
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-08 12:11:31 -07: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
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
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
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
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
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
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
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
alexmontAmazon dae2ddaec2 fix for [LYN-4828], message box style changes (#1911)
* fix for [LYN-4828], message box style changes

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* now with missing .qss file! Friends don't let friends git add -u

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
2021-07-07 13:49:55 -07:00