Commit Graph

2740 Commits

Author SHA1 Message Date
pappeste eece07efd3 Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-28 08:29:29 -07:00
Mike Balfour 96905a26d7 Add support for AP-compliant relative paths (#998)
The method "PrefabLoader::GetRelativePathToProject" has been changed to "PrefabLoader::GenerateRelativePath", and reworked to get a correct relative path.  GetFullPath has also been modified to get correct relative paths too.  This requires an Asset Processor connection - if one isn't available (like during unit tests), the methods have fallback logic to produce project-relative paths.

With this change, SliceConverter can't use SaveTemplate() to save the file any more, because GetFullPath now expects to find an existing path, which doesn't work for not-yet-created files.  Instead, it now has to use the same technique as the Editor and call SaveTemplateToString then save the string out as a file.
2021-05-28 09:57:17 -05:00
Tom Hulton-Harrop 36ceff84c9 Support mesh intersection for camera orbit (#982)
* wip support for mesh intersection with intersector bus

* WIP camera mesh intersection orbit logic

* remove unneeded template argument

* add bus connect/disconnect

* fix intersection logic

* small updates, additional comments, some tidy-up

* update formatting options slightly

* use aznumeric_cast

* temp workaround for negative distances with RayIntersection
2021-05-28 14:37:17 +01:00
Aaron Ruiz Mora c9f7cd03bb Limit convex and primitive methods of export physx asset to one material 2021-05-28 12:26:53 +01:00
balibhan f6643d6d24 Merge pull request #945 from aws-lumberyard-dev/sc_automation_balibhan3
Add all datatype parameters script
2021-05-28 14:35:25 +05:30
lumberyard-employee-dm 3c0c066f88 Updating the ProjectManager Gem validation check to make sure the name isn't empty either 2021-05-28 02:54:54 -05:00
pappeste 58bad80ffa changing paths for the install location in Jenkins 2021-05-28 00:17:20 -07:00
pappeste 8b9f5230f6 Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-28 00:16:26 -07:00
phistere f80f87a4d1 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-28 01:22:26 -05:00
phistere b73bc09ce7 Fixes a name comparison issue during module load
A name like Camera.dll was matching against
Atom_Component_DebugCamera.dll so it thought the module was already seen
and wouldn't add it to the list of dynamic modules to load.
2021-05-28 01:20:24 -05:00
lumberyard-employee-dm 3b349e72a0 Adding QtForPython gem to the AutomatedTesting project 2021-05-28 01:17:57 -05:00
Benjamin Jillich 5bb55ac1c7 [LYN-2514] Optimizing for new window dimensions (#990) 2021-05-28 07:38:05 +02:00
balibhan 5e13c79bc6 Merge branch 'main' into sc_automation_balibhan3 2021-05-28 11:05:49 +05:30
Guthrie Adams fffbd242c1 Merge pull request #999 from aws-lumberyard-dev/Atom/guthadam/ATOM-15649
ATOM-15649 sorting material types in create material dialog
2021-05-28 00:01:31 -05:00
lumberyard-employee-dm 23a5afeefb Renaming the unit_global_project.py to unit_test_global_project.py. This fixes the unit test not being found 2021-05-27 23:47:51 -05:00
Steve Pham 051384e9a7 Remove AZ_TRAIT_DISABLE_ASSET_JOB_PARALLEL_TESTS from Linux traits (#1018) 2021-05-27 20:13:45 -07:00
pappeste 7cdcd06824 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 20:13:24 -07:00
pappeste 69e79867be Making imported targets global, fixing identiation of the enabled_gems.cmake file 2021-05-27 20:12:48 -07:00
galibzon 25dc42e298 [ATOM-15600] Fix cpu over usage when loading shader variant assets. (#1014)
This is a temporary fix, in the future ShaderVariantAsyncLoader will use
OnCatalogAssetRemoved()/ OnCatalogAssetAdded().

Signed-off-by: garrieta <garrieta@amazon.com>
2021-05-27 21:45:19 -05:00
lumberyard-employee-dm 5bc772e126 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 21:22:07 -05:00
lumberyard-employee-dm 74464afbf3 Updated the global_project.py script to be able to specify and output
path when setting the global project path
Also updated that script to support an input path when reading the
global project path.
Added a unit test for the global_projecy.py "set-global-project" command
2021-05-27 21:20:19 -05:00
pappeste 425cb3e2fa Aaaaannnddd another dependency fix 2021-05-27 19:18:42 -07:00
lumberyard-employee-dm fc61ca2d0c Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 20:56:14 -05:00
lumberyard-employee-dm 87721cae55 Removed the ability to run download command from the o3de python package without user intervention 2021-05-27 20:56:03 -05:00
pappeste 68e2fb83dd More dependency fixes for linux builds 2021-05-27 18:54:22 -07:00
pappeste 639240576f Adding alias for the project gem so it gets loaded 2021-05-27 18:37:34 -07:00
pappeste 32b620501d Fix some cross dependencies between client and non-client gems 2021-05-27 18:33:28 -07:00
Jonny Galloway 6485ac8ea1 Merge pull request #1013 from aws-lumberyard-dev/gallowj/main/SponzaLicense
Added a required CC license for Sponza content
2021-05-27 20:28:41 -05:00
pappeste 4a15f55f78 Updating AutomatedTesting/EngineFinder.cmake 2021-05-27 17:37:59 -07:00
Terry Michaels 9435305f01 Make entity creation via asset drag and drop properly create an entity so it works with prefabs correctly (#1010) 2021-05-27 19:31:32 -05:00
pappeste d1a2eed40c Fix identiation issues 2021-05-27 17:26:25 -07:00
guthadam a11c4e9106 Merge branch 'main' into Atom/guthadam/ATOM-15649 2021-05-27 19:02:29 -05:00
Chris Santora b8578a4dc5 Merge pull request #979 from aws-lumberyard-dev/Atom/santorac/MaterialTypeCleanup
Various Cleanup of Core Material Types

Did a bunch of general cleanup on Atom's core material types. This gives us much better alignment of configuration between StandardPBR, EnhancedPBR, and Skin material types where they have common functionality. Also made some quality of life improvements for the user like making parallax mapping and UV transforms easier to set up.

ATOM-14838 Make Parallax Look Decent By Default
ATOM-13828 UV Transform Center Default Middle
ATOM-15133 Clean Up EnhancedPBR
ATOM-13216 Delete Deprecated Functors
ATOM-14037 StandardPBR TintedTransparent Opacity
ATOM-15295 Remove Unnecessary Enable Material Properties
2021-05-27 17:01:35 -07:00
pappeste 62b6cfac42 letting users pass CMAKE_MODULE_PATH to find the engine 2021-05-27 16:58:06 -07:00
lumberyard-employee-dm fee4bbdd5f Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 18:41:42 -05:00
lumberyard-employee-dm da147f273d Adding VERBOSE messages to the SettingsRegistry.cmake 'ly_get_gem_load_dependencies()' function which logs the gem target to it's load dependencies 2021-05-27 18:41:28 -05:00
Nicholas Van Sickle 5e87250f67 Fix viewport icon rendering on high DPI devices (#1006)
* Clarify ViewportWorldToScreen being in widget space and add DeviceScalingFactor

* -Fix viewport icons being draw wrong on high DPI displays
-Fix loading viewport icons from absolute paths, which

* Address review feedback, fix build
2021-05-27 16:31:30 -07:00
pappeste 0e0e7591c5 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 16:09:52 -07:00
pappeste 166db0b0c6 Android fix for FastNoise 2021-05-27 16:09:12 -07:00
guthadam a4e128b5b6 Merge branch 'main' into Atom/guthadam/ATOM-15649 2021-05-27 17:52:10 -05:00
lumberyard-employee-dm c67cd2dc4e Renaming the TargetCMakeLists.txt.in to InstalledTarget.in to get avoid it being picked up by the CopyrightValidator 2021-05-27 17:35:08 -05:00
Chris Santora ed56635c3e Merge remote-tracking branch 'upstream/main' into Atom/santorac/MaterialTypeCleanup 2021-05-27 15:12:56 -07:00
lumberyard-employee-dm 8ed351018f Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 17:12:51 -05:00
lumberyard-employee-dm 1c52147c3a Fixed path case issue in the declaration of the path to the UiBasics gem 2021-05-27 17:12:28 -05:00
pappeste 0d80d5ead3 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 15:04:40 -07:00
gallowj be54df8c1e Added a required CC license for Sponza content 2021-05-27 17:04:23 -05:00
pappeste d6cfa68333 Reverting error check and comment 2021-05-27 15:04:17 -07:00
AMZN-tpeng 16286fb43b Merge pull request #869 from aws-lumberyard-dev/ATOM/tonypeng/ATOM-15576
Atom/tonypeng/atom-15576
2021-05-27 15:01:43 -07:00
lumberyard-employee-dm 394ac7ab6a Updated the enable gem and disable gem API (#54)
* Updated the enable gem and disable gem API
Renamed remove_gem_project.py -> disable_gem.py
Renamed add_gem_project.py -> enable_gem.py
Renamed the "add-gem-to-project" command -> "enable-gem"
Renamed the "remove-gem-from-project" command -> "disable-gem"

Fixed the parsing of the enabled gems from the enabled_gems.cmake file

* Adding newline to the end of the CMakeLists.txt
2021-05-27 16:44:50 -05:00
pappeste f9b2517ea3 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 14:43:22 -07:00