Commit Graph

1055 Commits

Author SHA1 Message Date
Esteban Papp 5fa495380c Merge branch 'stabilization/2106' into redcode/SPEC-7563 2021-06-30 09:20:08 -07:00
Benjamin Jillich 3a5b8808a0 [LYN-4879] Incorrect colour UI issue on Gem Configure (#1678)
* Aligned the column headers to the elements
* Moved the styling of the gem column header labels to the qss
* Fixed the scrollbar for the gem list view

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-06-30 17:12:01 +02:00
Esteban Papp d6caff7842 Some sandbox references I was missing
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-29 16:54:30 -07:00
Gene Walters 9814e9dc6c Adding missing o3de copyright headers
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-06-29 16:31:06 -07:00
Gene Walters 6fb2558e44 Merge branch 'upstream/development' into genewalt/gitflow_210628
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-06-29 15:40:46 -07:00
Gene Walters f905b71844 Adding missing o3de copyright headers
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-06-29 13:48:45 -07:00
amzn-mike 598c890cbc Fix nodes being incorrectly treated as bones
Some nodes have aiBones created by AssImp even though they aren't bones.  Filter these out by looking through the node graph and only considering

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-06-29 15:14:33 -05:00
Terry Michaels 149863c527 Removed Amazon as Company for QSettings (#1649)
* Removed Amazon as Company for QSettings

Signed-off-by: Terry Michaels <miterenc@amazon.com>
2021-06-29 14:00:11 -05:00
John c145a9a74a Add missing files from addressing PR comments
Signed-off-by: John <jonawals@amazon.com>
2021-06-29 19:46:21 +01:00
jackalbe a9227e1962 {LYN-4456} FileIO hooks for LegacyTestAdapter (#1635)
* Could not reproduce the unit test fail for the m_app->BeforeRun() failure,
* so I am adding file IO hooks to listen for errors during the fixture setup

Tests: failed to repro the issue
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
2021-06-29 11:59:51 -05:00
Danilo Aimini a76a7291b5 Replace Asset Processor system tray icon with a more readable one. (#1639)
Signed-off-by: daimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-06-29 08:55:03 -07:00
AMZN-nggieber a5e66505a0 Fix issue moving and renaming projects at the same time (#1620) 2021-06-28 19:58:00 -07:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
AMZN-Phil a67ce87102 Merge pull request #1612 from aws-lumberyard-dev/LYN-4768
Fix gem name and author bounding rects and make headings readable
2021-06-28 17:28:25 -07:00
Terry Michaels 7a2a2dc0d7 Updated branding for application names (#1617) 2021-06-28 11:35:13 -05:00
jackalbe 580bd11715 {LYN-4372} fix for Python exit crash (#1600)
There is a crash when sys.exit() was being called since embedded Python
should not have control of the application lifetime. The Py_InspectFlag
puts the Python VM into 'inspection mode' which prevents the app
shutdown when any sys.exit() is invoked.

Notes:
* skips 'regset' extra command line in PythonBindingsExample
* added methods for handling PythonBindingsExample errors

Test: added Application_SystemExit_Blocked and
fixed up Application_Run_Fails now is Application_Run_Works
2021-06-28 10:28:49 -05:00
pconroy 196abb4af7 Fix gem name and author bounding rects and make headings readable 2021-06-25 20:53:41 -07:00
AMZN-nggieber ba0f1ad758 Updated Project Manager O3DE Logos with Rotated Squares Version (#1595) 2021-06-25 13:54:02 -07:00
Terry Michaels 21ebff5709 Updated help search and all docs.o3de.org links to o3de.org (#1594) 2021-06-25 15:23:57 -05:00
AMZN-Phil ce4bd9ffbe Merge pull request #1546 from aws-lumberyard-dev/LYN-4435
Show mouse cursor as busy when copying project
2021-06-25 09:06:27 -07:00
AMZN-Phil 514edf049f Merge pull request #1545 from aws-lumberyard-dev/LYN-4443
Show mouse cursor as busy when deleting project
2021-06-25 08:52:23 -07:00
AMZN-Phil 16c4fbfe10 Merge pull request #1576 from aws-lumberyard-dev/LYN-4566
Hide cart popup in project manager when going back to previous page
2021-06-25 08:52:05 -07:00
lumberyard-employee-dm 8530e783ca Setting the build timeout for the ProjectBuilder CMake commands to -1 (#1583)
This prevents Project build step from timing out

Moving the project build directory to be under the <project-path>/build/ folder to prevent two issues
1. The AssetProcessor from scanning that folder for assets.
   [Bb]uild is part of the excluded folders
2. To prevent git from seeing modified files in the build directory as
   the default .gitignore file ignores [Bb]uild
2021-06-24 22:23:51 -05:00
pconroy 875cd0c858 Hide cart popup when going back to previous page 2021-06-24 15:28:09 -07:00
jackalbe 143b8f1131 {SPEC-7465} Fix DeleteCachedAssets_AssetsReprocessed fails on Debug Nightly Builds (#1535)
* Fix for DeleteCachedAssets_AssetsReprocessed fails on Debug Nightly Builds
* added -ap_disableAssetTreeView=true to disable the Qt tree view for the asset tab to get the parts that want to be tested finish
* only shows up on Debug

Tests:
=== test session starts ===
AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py::TestsAssetProcessorBatch_AllPlatforms::test_AllSupportedPlatforms_FastScanWorks_FasterThanFullScan[windows-AutomatedTesting] PASSED [ 50%]
AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py::TestsAssetProcessorBatch_Windows::test_WindowsPlatforms_RunAPBatchAndConnectGui_RunsWithoutEditor[windows-AutomatedTesting] PASSED [100%]
--- generated xml file: F:\amazon\o3de\build\vs2019\Testing\Pytest\AssetPipelineTests.Batch_2_Sandbox.xml ---
=== 2 passed, 4 deselected in 18.32s ===
2021-06-24 06:47:59 -05:00
pconroy 5b277cc061 Show mouse cursor as busy when copying project 2021-06-23 20:51:55 -07:00
pconroy b9b55c3eed Show mouse cursor as busy when deleting project 2021-06-23 20:33:43 -07:00
amzn-mike 63dd82aed3 Merge pull request #1498 from aws-lumberyard-dev/Helios_LYN-3723-FixPBRNormalMapImport
[LYN-3723] Fix Stingray PBR normal map import
2021-06-23 21:15:35 -05:00
amzn-mike 8e98f7bb28 Merge pull request #1505 from aws-lumberyard-dev/Helios_LYN-4742-AssImpRootTransformFix
[LYN 4742] AssImp Root Transform Fix
2021-06-23 21:15:03 -05:00
AMZN-nggieber 10dcae90a4 Replaced editor logo with new project manager logo for Project Manager (#1531) 2021-06-23 17:23:06 -07:00
amzn-mike 03a6d1e0f5 Merge branch 'stabilization/2106' into Helios_LYN-4742-AssImpRootTransformFix 2021-06-23 18:06:36 -05:00
amzn-mike 0e8a2ca110 Merge branch 'stabilization/2106' into Helios_LYN-3723-FixPBRNormalMapImport 2021-06-23 17:36:04 -05:00
amzn-mike 3d0093307f Merge pull request #1490 from aws-lumberyard-dev/Helios_AssImpAnimationOnAllBones
[AssImp] Add placeholder animations for all bones
2021-06-23 16:39:14 -05:00
amzn-mike 56f250baaf Merge pull request #1457 from aws-lumberyard-dev/Helios_FixCacheCopyFailure
[LYN-4508] Fix AP cache copy failure
2021-06-23 15:35:59 -05:00
amzn-mike 64e139aa97 Merge branch 'stabilization/2106' into Helios_LYN-3723-FixPBRNormalMapImport 2021-06-23 14:57:38 -05:00
amzn-mike 09b7d57dc4 Merge branch 'stabilization/2106' into Helios_AssImpAnimationOnAllBones 2021-06-23 14:51:24 -05:00
amzn-mike 9e2f1aed91 Add comment 2021-06-23 14:47:47 -05:00
Terry Michaels 1e457928f5 Update help URLs and remove unneeded links (#1520) 2021-06-23 14:42:33 -05:00
amzn-mike fd6f68ce91 Merge branch 'stabilization/2106' into Helios_FixCacheCopyFailure 2021-06-23 14:13:42 -05:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
Alex Peterson aa885e5d0b Fix project creation (#1445)
* Add ability to change project name

* Fixed several issues where path types were changed

* Added PythonBindings CreateProject unit test

* Fix python warning format

* Validate new project name in CLI

* Fix issue creating pathview on linux

* Use better testing macros

* Refactored the unit_test_engine_template.py test to actually test
against the current engine_template.py commands

The commands of create-template, create-from-template, create-project
and create-gem is now being validated.

Registered the unit_test_engine_template.py script with CTest in the smoke test
suite so that it runs in Automated Review

Fixed issues in the engine_template.py script where the template_restricted_path parameter was required in the create_project and create_gem functions

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-06-23 09:19:17 -07:00
amzn-mike c27e0fe6e5 Merge branch 'stabilization/2106' into Helios_LYN-3723-FixPBRNormalMapImport 2021-06-23 10:00:55 -05:00
amzn-mike bacb612dd1 Merge branch 'stabilization/2106' into Helios_AssImpAnimationOnAllBones 2021-06-23 09:59:43 -05:00
amzn-mike 74022447dd Merge branch 'stabilization/2106' into Helios_FixCacheCopyFailure 2021-06-23 09:55:33 -05:00
amzn-mike feb58fac5e Fix calculation for root transform 2021-06-22 23:59:40 -05:00
AMZN-nggieber bc3aa45ed9 Prism Show Gem Requirements and Prompt when Adding Gems with Requirements (#1478)
* Added requirements section to gem inspector

* Added Dialog when configuring for gems with extra requirements
2021-06-22 19:44:33 -07:00
AMZN-nggieber e21443b5d6 Added Project Preview to Project Settings and Fixed Issues with Moving Projects (#1380)
* Updated Project Settings Screen with preview and fixed moving projects

* Tests for some Project Utils

* Remove old defined consts

* Update UX to use display name when avaliable where appropriate

* Use newPreviewImagePath for temp changing preview.png otherwise use iconPath for preview in UX

* Removed use of newPreviewImagePath in ProjectButton
2021-06-22 17:24:48 -07:00
amzn-mike 1137c2d09d Fix importing normals on PBR materials
Some normals are flagged as "NORMAL_CAMERA" by AssImp, so if we can't find NORMALS we fallback to looking for NORMAL_CAMERA
2021-06-22 18:09:06 -05:00
amzn-mike e4e5178261 Add in placeholder animations for all bones as some models require this for correct animations
Matches with previous FBX SDK behavior
2021-06-22 13:04:08 -05:00
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
2021-06-22 12:55:18 -05:00