Commit Graph

119 Commits (8bbd8f9807f53130d271f59373f8b2c0b725967d)

Author SHA1 Message Date
Michael Pollind a33ab67125
bugfix: handle moving files for inode-watch for AssetProcessor (#4656) (#4809)
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
amzn-phist 714f5357b2
Add an error message to AP when the project path is invalid (#4801)
* Add an error message to AP when bad project path

Produce a log error or a dialog box error when the project path for AP
does not have a project.json and is invalid.

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

* Fix a failing unit test - AssetProcessorMessages

Adding a check for 'project.json' caused BeforeRun() in a test fixture
to fail.  Teardown of the fixture was also broken if the test failed to
fully startup the application manager, so added null checks there.

Added an assert to the fixture's Setup to check the status of BeforeRun().
Added additional settings registry setup to the fixture to make sure the
project path and branch token are configured before BeforeRun() is
called.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
amzn-mike c1335f69c6
Convert resolved wildcard paths to relative path before saving in database (#4574)
* Convert resolved wildcard paths to relative path before saving in database.

Warn if file could not be converted to a relative path.
Fix FindWildcardMatches path handling that could result in pathMatch missing the first character

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Handle abs path wildcard dependencies

Remove dependencies outside of scan folder

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Switch to AZ::IO::PathView for abs path check

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Made code a little more clear

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Esteban Papp 721d92b4f9 adding exception handling for tests that are not going through AzTestRunner
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
amzn-phist 80dcc34e6f
Add "Registry" folders as scan folders (#4583)
* Add "Registry" folders as scan folders

For projects, Gems, and Engine, add the "Registry" folder as scan
folders.

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

* Change params for adding scan folder

Also add trailing newlines to setreg files.

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

* Adjust the priority order for project templates

Scan folder orders were way too high, they should be very low to become
highest priority order.

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

* Removes change of default assets folder to Assets

Need to revert this change so it can be done separately.
Renamed the scan folder to 'Project/Assets' to prep for Assets folder
change later on.

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

* Update platform configuration test to pass

Adjusted expectation of scan folder count from 1 to 2 per Gem for
'Assets' and 'Registry' now.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
amzn-mike 5cee9b43b7
Squashed commit of Procedural Prefab work (#4481)
* Squashed commit of the following:

commit 964a45ead662f502ff0d63ae3528a9aa18a760f4
Merge: 8d4c1dee78 799ab8585b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Oct 1 16:16:47 2021 -0500

    Merge branch 'development' into Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h

commit 8d4c1dee782a1b82ded14d11f7fe879c865980a7
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 15:49:22 2021 -0500

    fixing non-unity build

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit e83431b3be58f36a875b5187c03cd67368d91726
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 12:42:38 2021 -0500

    fixing Gems/Multiplayer/Code/Source/Components/NetworkCharacterComponent.cpp:172:28: error: member access into incomplete type 'AZ::BehaviorContext'

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit b0523867d9605aff67710f4ab6030f327cd5558f
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 10:23:56 2021 -0500

    fix for error: unused variable 'targetInstanceRef'

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 387c42ac1a4268ff8b2701c0c914e384b355e629
Merge: d87b41997e 0fb821a44b
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 10:00:46 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' of https://github.com/aws-lumberyard-dev/o3de into Feature_LY-5384_ProceduralPrefabs

commit d87b41997eec9a6b0d03c1040901904d68b873fb
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 30 18:03:38 2021 -0500

    fixing non-unity build

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 0fb821a44b788ab1cca61dce7c1fbdbedc2f37c0
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 30 15:43:50 2021 -0500

    adding header for validation

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 30f5135f63286ce8f752df5787937f9543589cb5
Merge: 2d9e1b9f16 103dc6cfcf
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 30 11:20:15 2021 -0500

    Merge branch 'development' into Feature_LY-5384_ProceduralPrefabs
    added a few headers as well

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 2d9e1b9f16f8861df92c58f0f83974859e615b1f
Merge: 39ee7a8a80 af84e71638
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 14:22:39 2021 -0500

    Merge pull request #244 from aws-lumberyard-dev/feature_lyn5880_procprefab_tooling_updates

    {lyn5880} adding Instantiate Procedural Prefab to the Editor

commit af84e716384de048c8555fe5ccdc293e885896f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 14:21:09 2021 -0500

    updated based on feeback

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 9c83f6086203e14becb60af5ae937e8e609eb9ed
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 11:35:30 2021 -0500

    small include tweak

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 11ac99a87097621796af79329bf9d9344155049e
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 10:08:53 2021 -0500

    moved the seg reg key to the CPP file
    removed the Queue Load

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 39ee7a8a803a032652b122b73fba7007abbdbf88
Merge: 0fc7d5f361 8b4f5ded51
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 29 08:24:57 2021 -0500

    Merge pull request #241 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonExample

    Add example prefab script and FBX with 2 meshes to test it

commit 941f6a00d1a6222f10acfcd55a2017be6352f723
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 28 16:07:47 2021 -0500

    make sure the AZ::IO::SystemFile::Exists() before returning fullPath

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 8b4f5ded510d8c6ef47a2d2380fa49c7f6e1fd4e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 28 14:03:11 2021 -0500

    Move sceneJobHandler reset out of exception block.  Add more info to error messages

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 0c82937fcd90d0c606c330f6d3e4cec8eca7edb3
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 28 13:04:37 2021 -0500

    {lyn5880} adding Instantiate Procedural Prefab to the Editor

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 0fc7d5f3610f95dcdd97614a282b9f4eabfc93dc
Merge: ea90e321d7 8ca6acc67d
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 28 09:23:54 2021 -0500

    Merge pull request #235 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset

     {ly5395} adding asset loading logic for procedural prefabs

commit 8ca6acc67dcbd375df9813acbf0062a8a5c7809a
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Mon Sep 27 13:52:21 2021 -0500

    added AZ::Prefab::PrefabGroupAssetHandler::s_Extension
    optimized headers

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit e446aaa4e9951e474f832299f8149142dbf6e85f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 27 09:12:40 2021 -0500

    Remove some whitespace

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ea90e321d737cd7bafbe617f9b5fbbeae3c4a7e9
Merge: f4c9fc50c3 5ae3c67cc7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 27 09:04:58 2021 -0500

    Merge pull request #238 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonScript

    Fixes to support writing a python script to generate a prefab

commit b69ebbae17826b59f3f4fb675c57be5582acf628
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 17:51:17 2021 -0500

    Use raise_error instead of print

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 407b8d804841f0ba87a0c82405c9d1319435e2da
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 17:47:20 2021 -0500

    Add scene_mesh_to_prefab.py example ProceduralPrefab script and multiple_mesh_one_material FBX which uses the script

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 5ae3c67cc70603ec70f53c03ee716982b55b759a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 14:50:47 2021 -0500

    Test entity cleanup

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 55da78dda5ef9bc558b65bf99d551ffebd38acef
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 14:50:28 2021 -0500

    Make CastWithTypeName only return true if the object can be successfully cast

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 9f2e85bb691a86910d14477f94b9e631ee343e0b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 14:49:28 2021 -0500

    Remove RemoveAllTemplates API from scripting API and use prefab system interface version instead

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 41d46d1f00a16243d3fffda32186fcd7964db78a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 13:19:51 2021 -0500

    Store watch folder in scene so source relative path can be calculated

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f4c9fc50c3ac4c3fc68e98d78b72c4f1f571b516
Merge: de2612b3b9 8bd3c0acdd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 23 14:10:31 2021 -0500

    Merge pull request #239 from aws-lumberyard-dev/fix_LY5384_script_processing_rule

    {ly5384} script processing rule behavior more stateless

commit 8bd3c0acdd874d6421d25cc77c80da9906afefc2
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 22 15:19:30 2021 -0500

    {ly5384} script processing rule beahvior more stateless

    Made the script processing rule beahvior more stateless so that the
    script name needs to be discovered each time.

    Disconnet from the bus after each scene script builder usage.

    Before it would be possible that the same script can be run more than
    once for each asset.

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 7afd9d4a9911adb1dc665361a09486e6852ba4f8
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 22 13:27:12 2021 -0500

    Update scene_data.py to latest PrefabGroup format

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 74d1ba8853d62b75786d68a6bdeb1bfb2ca52346
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 22 13:26:27 2021 -0500

    Fix GetNodeContent to return a GraphObjectProxy wrapping a nullptr instead of just returning a nullptr which causes issues for python

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ca4127353e139f9d853784ca6a74e5deeb82d6f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 17:48:15 2021 -0500

    AZ::JsonSerializationUtils update

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 30a76be51c37c1718e9b215f33b172a10bd74f08
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 17:21:52 2021 -0500

    revert odd README.md merge issue
    added alias for PrefabBuilder.Tools

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 6c83d47d51898bcdc17c10578f0198bccd09c834
Merge: 46cb4c2a87 de2612b3b9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:52:58 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset

    # Conflicts:
    #	Gems/Prefab/PrefabBuilder/CMakeLists.txt

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 46cb4c2a8711f1adad22be24420922365707c409
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:43:19 2021 -0500

    added ProceduralPrefabAssetTest to cover basics for ProceduralPrefabAsset

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit de2612b3b9a28ef130fc92d1c9d68c90790cf132
Merge: f03bbb236e 3117c54657
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:28:59 2021 -0500

    Merge pull request #232 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_linux_compile

    {ly5384} Fixing Linux build issues.

commit 3117c54657cb21ae2ef200dbfd1cd046c617089d
Merge: 15fddd1795 f03bbb236e
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:28:48 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into fix_ly5384_ProceduralPrefabs_linux_compile

commit f03bbb236eab3458fc433d35f9fb84dae88922d6
Merge: f297aa232a fccf900982
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 15:52:07 2021 -0500

    Merge pull request #233 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_merge_fix

    fixing an API merge compile error

commit fccf9009829b182254064ba17ab3b6e7d44919fa
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 15:50:58 2021 -0500

    fixing an API merge compile error

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 762743b54744258007d8f124be95654ee6f18533
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:10:46 2021 -0500

    Make sure EntityUtilityComponent is loaded in AssetBuilderApplication

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 8c4ab65598e3ebb3a0ae621feb22ef5b57e7de27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:09:03 2021 -0500

    Clean up entities and templates after python script is done

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 50a1f2a1a4f09cbd3e6256a210cd14a0fdb5b815
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 20 14:05:12 2021 -0500

    ScriptProcessorRuleBehavior resets entity context

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 51a6af053d95e90e582a25ae51c5730a7e2b0973
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:40:37 2021 -0500

    Add add_prefab_group

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f297aa232a2cd9ad5583b3e2b4aa1ce793c07d92
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 11:53:25 2021 -0500

    Fix merge compile issue

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit fc40f5e75efbb87382bf6227966f2f905ccf6d75
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 11:18:44 2021 -0500

    {ly5395} adding asset loading logic for procedural prefabs

    * enabling the Prefab gem for tool work
    * enabling prefab gem for AutomatedTesting
    * AssetTypeInfoHandler for procedural prefab
    * EnableCatalogForAsset for procedural prefab
    * RegisterHandler for AssetManager

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 7a2250db337fbfc693e3cf57458eb56f419b32d6
Merge: c1f3e14304 751a0fab4f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:32:37 2021 -0500

    Merge remote-tracking branch 'origin/Feature_LY-5384_ProceduralPrefabs' into origin_Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 12440233ccd987d41c248df57cee913ebb2ae2f6
Merge: 751a0fab4f f8d39e2671
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 10:25:50 2021 -0500

    Merge remote-tracking branch 'origin' into feature_lyn5394_procprefab_asset

commit c1f3e143048a914ab2d89146685ca5fe409dda27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 20 14:03:53 2021 -0500

    Fix merge issue

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 1990ec370df81d4b77b4646553c2b13dce18c638
Merge: 23d02ed416 fc8697edd5
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:21:10 2021 -0500

    Merge branch 'development' into origin_Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp

commit 751a0fab4f932ec3d7683e2d46a187eefc7addbf
Merge: 23d02ed416 7b8d5629dd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 10:10:06 2021 -0500

    Merge pull request #229 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset

    {lyn5394} adding ProceduralPrefabAsset to AZ Tools Framework

commit 15fddd1795ff07e8d6ce8840a2d675713b63655c
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 10:04:06 2021 -0500

    {ly5384} Fixing Linux build issues.

    * symbols "struct FindComponent" and "AZ::Component* FindComponent()" defined in the same scope, renamed function to FindComponentHelper
    * wrapped the AZ::ComponentId return for both cases

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 23d02ed4165a1db9e738057aad0b7613be8105da
Merge: 0a31e39a25 0f3680a996
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 09:44:30 2021 -0500

    Merge pull request #228 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_Misc

    Reflect Prefab/Entity constants and add failure unit tests

commit 7b8d5629dd04ca1ed75c9828dbb0949f12eb2ca3
Merge: 78fe2cec6f 0a31e39a25
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 17:37:29 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset

commit 78fe2cec6fbcea9217d0b23ec056e19f144fc9a9
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 17:27:57 2021 -0500

    Updated PrefabBuilder to point to new asset type for the procedural prefab

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 4da4e026582c8e7bf0fe9c7c7b39f15189c67b78
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 16:56:13 2021 -0500

    {lyn5394} adding Prefab/Procedural/ProceduralPrefabAsset to AZ Tools Framework

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit c2fb7b9ccb4b7d4e8080b8830d4ceeb66cd3972c
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 16:45:03 2021 -0500

    Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior

    {LYN5393} Adding Prefab Group Behavior to output Procedural Prefab

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 0a31e39a25d36c63827424adc883e873aee20b71
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 16:45:03 2021 -0500

    Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior

    {LYN5393} Adding Prefab Group Behavior to output Procedural Prefab

commit 0f3680a9968cbbbcb9558811f8dbd287a97447ae
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 13:53:22 2021 -0500

    Add failure tests and some test cleanup

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 834eab4c4bf151dfb9e49eb0a5e1f20486b6c05c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 13:34:03 2021 -0500

    Reflect InvalidTemplateId, fix reflection for InvalidComponentId

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 30de326dfbc28bbb9481bf282eb35c427469c847
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:55:16 2021 -0500

    Fix merge issues

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 4bcf6b7b4f2d6285f244226b065bff65ba565094
Merge: 20c5cd7259 28fec42242
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:28:26 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs_EntityManagement' into Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 20c5cd7259235d26f1aa11e2d61ac6b8a57b8638
Merge: 050e26d609 6845942fa4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:24:44 2021 -0500

    Merge pull request #200 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_CreatePrefab

    API Update: Wrap PrefabSystemComponentInterface behavior

commit 6845942fa419b2b6d5a0103f8d30e6515948310e
Merge: 58a51c738e 65da78dcc2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:07:33 2021 -0500

    Merge pull request #208 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_SavePrefabToString

    API Update: AzToolsFramework::Prefab::PrefabLoaderInterface

commit 65da78dcc22c4251696ebb75680928ecf83d6733
Merge: e0c5e060ab 58a51c738e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:07:06 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs_CreatePrefab' into Feature_LY-5384_ProceduralPrefabs_SavePrefabToString

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
    #	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabScriptingTests.cpp

commit 28fec422426640540bd21b2275c7b7a90e4f8e71
Merge: c1b8b5190f d825305202
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 09:58:36 2021 -0500

    Merge pull request #212 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentManagement

    API Update: Editor Entity Component Functions

commit d825305202d5a02d60dd20fb5d0cc0ecb73f562a
Merge: c280964b98 88fa6983d1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 09:58:09 2021 -0500

    Merge pull request #218 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentExplore

    API Update: Editor Component JSON Helper Functions

commit a56daadc45e5ad8511aa5160c3afc245ca10fb83
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 16:48:41 2021 -0500

    m_prefabGroupBehavior.release() -> m_prefabGroupBehavior.reset()
    adding error messages for the prefab processing
    fixed typo

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit c1a03351f55f9e8f5161c0ef0288c8e64050e399
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 16:32:42 2021 -0500

    reduced the JSON for the testing framework to tree types only

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 0008866baa7882ec106e134049e2bd7b95113796
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 16:25:00 2021 -0500

    enable ProceduralPrefabAsset JsonRegistrationContext

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 58a51c738e1bbd5bcad27cf1c0add4760bb8cffa
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 15 14:31:59 2021 -0500

    Remove unneeded include

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit e0c5e060ab8a9cb2cfce4c083f276ab064aa08ea
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 15 14:20:04 2021 -0500

    Cleanup whitespace

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 88fa6983d19ac3a0d7c4073ea390c36794d2603b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 15 13:49:20 2021 -0500

    FindMatchingComponents now returns a vector of ComponentDetails which includes base class info (non-recursive)

    Fixed a memory leak
    Moved const to header

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit b57a9d4261aea85a8ddb1036307d8ad296cac859
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 10:49:32 2021 -0500

    updated the DOM logic for the asset loading sake

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit f55ee9f5eabbeac998028f027e1c8adf55419a9d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 14 13:23:13 2021 -0500

    Update CreateStringPermissive to stop when enough data has been collected.

    Update unit tests.
    Fixed out of bounds behavior in EntityUtilityComponent usage of CreateStringPermissive.
    Updated AssetTreeFilterModel to cap the string length

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 6d6707dea8cd072261d65e0a508d1179df3892d4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 14 10:55:38 2021 -0500

    Rename GetComponentJson to GetComponentDefaultJson.

    Clean up GetComponentTypeIdFromName

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f4380d37a40ada353f7156b0d06b7ab60b72a151
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 14 10:29:04 2021 -0500

    Move scripting ebus and handler into separate files

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 572cb58f854aa2368b18f8cf70154d471dfac047
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 10 20:27:41 2021 -0400

    Renamed SearchComponents to FindMatchingComponents

    Added missing printf formatting

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 050e26d60931700e226a4d1a5d02d6a1d4c69915
Merge: 542bdfc5d7 c1b8b5190f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 10 09:31:08 2021 -0400

    Merge pull request #201 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement

    API Update: Editor Entity Management - Add some comments and error handling

commit 875d5dc466b65d893a44e11aa9467c45cf7994e9
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 10 09:13:43 2021 -0400

    Move bus and handler code into separate files

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit a2d94e24fb2cd1993835f17e7129000c00926cf7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 17:25:35 2021 -0400

    Add comments

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 16f507377f4f04c88028833f69327bd11b401b87
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 17:16:33 2021 -0400

    Add error messages

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 2e6d7d40dc731989128fbe829141057b3558c88b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 16:54:20 2021 -0400

    Cleanup code

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 963891eaeb8d616bb071f2a7b50cdabd994241a2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 3 10:48:40 2021 -0500

    Add and update unit tests

    Reflect APIs to behavior context

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 664be8eca54293407e5ce2d631375d907c1bb2f6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 2 13:00:02 2021 -0500

    Add Search and Component json output APIs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit e94fe64f366009d06b889954d292c37ea4f96fe2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 13:37:44 2021 -0400

    Make bus handler private

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 345a1b0d5edef99d5a8ea2bce2f4f3478652a4f1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 12:30:13 2021 -0400

    Address feedback

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit c280964b983635bed9e8bbfb94b2188403287d4c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 10:12:49 2021 -0500

    Address feedback

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 3b819ee827fc4c19312f2d2bc5788e2cc36de4f4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 3 16:06:10 2021 -0500

    Update unit test to verify components on saved prefab

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 0b63c0e316ec621ed17edf36109b7cd1d50ef606
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 3 12:52:46 2021 -0500

    Expand test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ea59416626d9b43599cf8847585e599f8fa5fd22
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 17:32:14 2021 -0500

    Add error handling

    Add component creation
    Add error testing

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 9d0f2ae33eadba0216bd245157b94692792b1a86
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:31:28 2021 -0500

    enabling ProductDependencies test again

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 15d1e4730df31e71e7e3ee6d4914f19b233c1b7f
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:23:26 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior

    # Conflicts:
    #	Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit ce2e4602bde26fbb34b43c73f820a97b9e229b5a
Merge: 5ad0aac747 542bdfc5d7
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:14:07 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior

    # Conflicts:
    #	Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 542bdfc5d762c07938f9a0f8e729070f1df9edfc
Merge: 3e7564c944 4899f67986
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:09:10 2021 -0500

    Merge pull request #207 from aws-lumberyard-dev/feature_lyn5392_proc_prefab_group

    {lyn5392} Adding PrefabGroup scene manifest rule

commit 4899f67986992b7eeb5cc3b750493ed21ec7b4f3
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 16:33:24 2021 -0500

    removing unneeded AZStd::move() calls

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 5ad0aac7472d24bb85990d36399a466288ecfdbc
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 16:17:52 2021 -0500

    cleaned up the code
    finalized the unit tests
    fixed the code based on the tests... FTW!

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 24f289dd31292c4b9f5e5848ddc94efd986b4341
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 13:06:20 2021 -0500

    Add FindComponentByTypeName and UpdateComponentForEntity APIs

    Add unit tests

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit c1b8b5190f973d2429731308f50c7c962d64301e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 14:02:17 2021 -0500

    Fix bus connect that should have been a bus disconnect

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit fde870d6c92e131875ec6aadda2365203a538379
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 12:57:04 2021 -0500

    Fix up includes

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 8ceddd0efc90d33bc34b5287176497356e57abf9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 08:43:23 2021 -0500

    WIP

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 3cc9135d87efde24430dbf1cd112bcf9b95ecaa0
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Aug 31 14:44:37 2021 -0500

    Rename files

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f056b3d9578ae2f49dbc172a5929306047620be6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Aug 31 14:14:34 2021 -0500

    Remove 'editor' from bus/component name

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 0fb7a0788e879eb9dc241291f05f0acffc0b0156
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Aug 31 09:18:37 2021 -0500

    {lyn5392} Adding PrefabGroup scene manifest rule

    * Adding PrefabGroup abstraction and concrete classes to fill out in a scene manifest
    * has reflections for serialization & behavior
    * testing the behavior using Lua
    * testing the serialization using JSON

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit b1756307bff9f86ae0ae1354bae8f470d19b4487
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 17:52:18 2021 -0500

    Reflect SaveTemplateToString

    Add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ddd2bb89041c5fb8b6add2cfc02c454baab9a7d6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 12:46:17 2021 -0500

    Add warning/error messages, update module

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit e839c1cbcc340859fc6ee5cff2d802660944194b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 11:17:25 2021 -0500

    Add some comments and error handling

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 347f787cc88405541889e842151de81a70598dd1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 17:16:45 2021 -0500

    Fix line endings

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit be26ab1cb16221ba879c10652b430ea31547d868
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 15:28:00 2021 -0500

    Add CreatePrefabTemplate

    Add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 3e7564c944497b7b6cce94dbce486ed8c4561f33
Merge: 5a3c289fac 07841ee749
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 10:20:20 2021 -0500

    Merge pull request #199 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement

    Add editor entity creation and unit test

commit 07841ee749d2a1bc22352cbec3076ac087348676
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 16:44:57 2021 -0500

    Fix line endings

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 35bc3b89cd1fcc126114ea7d61cdd21e88699080
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 15:03:35 2021 -0500

    Setup CreateEditorReadyEntity to use a custom entity context

    Add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 82519b15510a4ec1b2daf4d883a2c4c3d9c0a347
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 09:29:20 2021 -0500

    Add EditorEntityUtilityComponent for managing entities from the behavior context

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f8d39e2671
Merge: 43603cad5e 575faa4443
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Wed Aug 11 15:29:33 2021 -0500

    Merge pull request #3049 from aws-lumberyard-dev/cgalvan/gitflow_210811

    Merged stabilization/2106 to main

commit 575faa4443
Merge: 43603cad5e 4b817a6483
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Wed Aug 11 14:13:27 2021 -0500

    Merge remote-tracking branch 'upstream/stabilization/2106' into cgalvan/gitflow_210811

    Signed-off-by: Chris Galvan <chgalvan@amazon.com>

commit 43603cad5e
Merge: d9cce28a53 bb52475ce8
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:55:51 2021 -0500

    Merge pull request #2271 from aws-lumberyard-dev/Foundation/miterenc/ContributingUpdate

    Updating CONTRIBUTING.md

commit bb52475ce8
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:55:14 2021 -0500

    Updated text to be more descriptive

    Signed-off-by: Terry Michaels <miterenc@amazon.com>

commit 697dfad486
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:27:24 2021 -0500

    Fixed typo

    Signed-off-by: Terry Michaels <miterenc@amazon.com>

commit 650e1ab44d
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:19:46 2021 -0500

    Updating CONTRIBUTING.md

    Signed-off-by: Terry Michaels <miterenc@amazon.com>

commit d9cce28a53
Merge: e7f787572e 486ba58628
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Mon Jul 12 14:06:57 2021 -0500

    Merge pull request #2096 from aws-lumberyard-dev/cgalvan/gitflow_210712_main

    Merged stabilization/2106 to main

commit 486ba58628
Merge: e7f787572e 7cfde884d9
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Mon Jul 12 11:12:41 2021 -0500

    Merged stabilization/2106 to development; Resolved merge conflicts

    Signed-off-by: Chris Galvan <chgalvan@amazon.com>

commit e7f787572e
Author: Nicholas Lawson <70027408+lawsonamzn@users.noreply.github.com>
Date:   Tue Jul 6 08:03:35 2021 -0700

    Updates licenses to APACHE-2.0 OR MIT (#1685)

    Not to be committed before 7/6/2021

    Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>

commit 837e1c7370
Merge: d30de01752 efcbe2c4a1
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Fri Jul 2 12:11:27 2021 -0500

    Merge pull request #1764 from aws-lumberyard-dev/cgalvan/gitflow_210702

    Merged stabilization/2106 to main

commit efcbe2c4a1
Merge: d30de01752 0c43493e29
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Fri Jul 2 10:20:42 2021 -0500

    Merge remote-tracking branch 'upstream/stabilization/2106' into cgalvan/gitflow_210702

    Signed-off-by: Chris Galvan <chgalvan@amazon.com>

commit d30de01752
Author: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Date:   Mon Jun 28 11:20:36 2021 -0700

    Updating LFS config to new endpoint (#1624)

    Signed-off-by: AMZN-alexpete

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* fix for "warning C4100: 'outputValueTypeId': unreferenced formal"

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* Material Editor: Added alternate skybox toggle to the toolbar

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* Squashed commit of the following:

commit 964a45ead662f502ff0d63ae3528a9aa18a760f4
Merge: 8d4c1dee78 799ab8585b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Oct 1 16:16:47 2021 -0500

    Merge branch 'development' into Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h

commit 8d4c1dee782a1b82ded14d11f7fe879c865980a7
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 15:49:22 2021 -0500

    fixing non-unity build

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit e83431b3be58f36a875b5187c03cd67368d91726
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 12:42:38 2021 -0500

    fixing Gems/Multiplayer/Code/Source/Components/NetworkCharacterComponent.cpp:172:28: error: member access into incomplete type 'AZ::BehaviorContext'

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit b0523867d9605aff67710f4ab6030f327cd5558f
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 10:23:56 2021 -0500

    fix for error: unused variable 'targetInstanceRef'

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 387c42ac1a4268ff8b2701c0c914e384b355e629
Merge: d87b41997e 0fb821a44b
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 10:00:46 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' of https://github.com/aws-lumberyard-dev/o3de into Feature_LY-5384_ProceduralPrefabs

commit d87b41997eec9a6b0d03c1040901904d68b873fb
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 30 18:03:38 2021 -0500

    fixing non-unity build

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 0fb821a44b788ab1cca61dce7c1fbdbedc2f37c0
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 30 15:43:50 2021 -0500

    adding header for validation

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 30f5135f63286ce8f752df5787937f9543589cb5
Merge: 2d9e1b9f16 103dc6cfcf
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 30 11:20:15 2021 -0500

    Merge branch 'development' into Feature_LY-5384_ProceduralPrefabs
    added a few headers as well

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 2d9e1b9f16f8861df92c58f0f83974859e615b1f
Merge: 39ee7a8a80 af84e71638
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 14:22:39 2021 -0500

    Merge pull request #244 from aws-lumberyard-dev/feature_lyn5880_procprefab_tooling_updates

    {lyn5880} adding Instantiate Procedural Prefab to the Editor

commit af84e716384de048c8555fe5ccdc293e885896f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 14:21:09 2021 -0500

    updated based on feeback

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 9c83f6086203e14becb60af5ae937e8e609eb9ed
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 11:35:30 2021 -0500

    small include tweak

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 11ac99a87097621796af79329bf9d9344155049e
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 10:08:53 2021 -0500

    moved the seg reg key to the CPP file
    removed the Queue Load

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 39ee7a8a803a032652b122b73fba7007abbdbf88
Merge: 0fc7d5f361 8b4f5ded51
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 29 08:24:57 2021 -0500

    Merge pull request #241 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonExample

    Add example prefab script and FBX with 2 meshes to test it

commit 941f6a00d1a6222f10acfcd55a2017be6352f723
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 28 16:07:47 2021 -0500

    make sure the AZ::IO::SystemFile::Exists() before returning fullPath

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 8b4f5ded510d8c6ef47a2d2380fa49c7f6e1fd4e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 28 14:03:11 2021 -0500

    Move sceneJobHandler reset out of exception block.  Add more info to error messages

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 0c82937fcd90d0c606c330f6d3e4cec8eca7edb3
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 28 13:04:37 2021 -0500

    {lyn5880} adding Instantiate Procedural Prefab to the Editor

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 0fc7d5f3610f95dcdd97614a282b9f4eabfc93dc
Merge: ea90e321d7 8ca6acc67d
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 28 09:23:54 2021 -0500

    Merge pull request #235 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset

     {ly5395} adding asset loading logic for procedural prefabs

commit 8ca6acc67dcbd375df9813acbf0062a8a5c7809a
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Mon Sep 27 13:52:21 2021 -0500

    added AZ::Prefab::PrefabGroupAssetHandler::s_Extension
    optimized headers

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit e446aaa4e9951e474f832299f8149142dbf6e85f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 27 09:12:40 2021 -0500

    Remove some whitespace

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ea90e321d737cd7bafbe617f9b5fbbeae3c4a7e9
Merge: f4c9fc50c3 5ae3c67cc7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 27 09:04:58 2021 -0500

    Merge pull request #238 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonScript

    Fixes to support writing a python script to generate a prefab

commit b69ebbae17826b59f3f4fb675c57be5582acf628
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 17:51:17 2021 -0500

    Use raise_error instead of print

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 407b8d804841f0ba87a0c82405c9d1319435e2da
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 17:47:20 2021 -0500

    Add scene_mesh_to_prefab.py example ProceduralPrefab script and multiple_mesh_one_material FBX which uses the script

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 5ae3c67cc70603ec70f53c03ee716982b55b759a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 14:50:47 2021 -0500

    Test entity cleanup

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 55da78dda5ef9bc558b65bf99d551ffebd38acef
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 14:50:28 2021 -0500

    Make CastWithTypeName only return true if the object can be successfully cast

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 9f2e85bb691a86910d14477f94b9e631ee343e0b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 14:49:28 2021 -0500

    Remove RemoveAllTemplates API from scripting API and use prefab system interface version instead

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 41d46d1f00a16243d3fffda32186fcd7964db78a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 13:19:51 2021 -0500

    Store watch folder in scene so source relative path can be calculated

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f4c9fc50c3ac4c3fc68e98d78b72c4f1f571b516
Merge: de2612b3b9 8bd3c0acdd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 23 14:10:31 2021 -0500

    Merge pull request #239 from aws-lumberyard-dev/fix_LY5384_script_processing_rule

    {ly5384} script processing rule behavior more stateless

commit 8bd3c0acdd874d6421d25cc77c80da9906afefc2
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 22 15:19:30 2021 -0500

    {ly5384} script processing rule beahvior more stateless

    Made the script processing rule beahvior more stateless so that the
    script name needs to be discovered each time.

    Disconnet from the bus after each scene script builder usage.

    Before it would be possible that the same script can be run more than
    once for each asset.

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 7afd9d4a9911adb1dc665361a09486e6852ba4f8
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 22 13:27:12 2021 -0500

    Update scene_data.py to latest PrefabGroup format

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 74d1ba8853d62b75786d68a6bdeb1bfb2ca52346
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 22 13:26:27 2021 -0500

    Fix GetNodeContent to return a GraphObjectProxy wrapping a nullptr instead of just returning a nullptr which causes issues for python

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ca4127353e139f9d853784ca6a74e5deeb82d6f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 17:48:15 2021 -0500

    AZ::JsonSerializationUtils update

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 30a76be51c37c1718e9b215f33b172a10bd74f08
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 17:21:52 2021 -0500

    revert odd README.md merge issue
    added alias for PrefabBuilder.Tools

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 6c83d47d51898bcdc17c10578f0198bccd09c834
Merge: 46cb4c2a87 de2612b3b9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:52:58 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset

    # Conflicts:
    #	Gems/Prefab/PrefabBuilder/CMakeLists.txt

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 46cb4c2a8711f1adad22be24420922365707c409
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:43:19 2021 -0500

    added ProceduralPrefabAssetTest to cover basics for ProceduralPrefabAsset

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit de2612b3b9a28ef130fc92d1c9d68c90790cf132
Merge: f03bbb236e 3117c54657
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:28:59 2021 -0500

    Merge pull request #232 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_linux_compile

    {ly5384} Fixing Linux build issues.

commit 3117c54657cb21ae2ef200dbfd1cd046c617089d
Merge: 15fddd1795 f03bbb236e
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:28:48 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into fix_ly5384_ProceduralPrefabs_linux_compile

commit f03bbb236eab3458fc433d35f9fb84dae88922d6
Merge: f297aa232a fccf900982
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 15:52:07 2021 -0500

    Merge pull request #233 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_merge_fix

    fixing an API merge compile error

commit fccf9009829b182254064ba17ab3b6e7d44919fa
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 15:50:58 2021 -0500

    fixing an API merge compile error

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 762743b54744258007d8f124be95654ee6f18533
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:10:46 2021 -0500

    Make sure EntityUtilityComponent is loaded in AssetBuilderApplication

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 8c4ab65598e3ebb3a0ae621feb22ef5b57e7de27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:09:03 2021 -0500

    Clean up entities and templates after python script is done

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 50a1f2a1a4f09cbd3e6256a210cd14a0fdb5b815
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 20 14:05:12 2021 -0500

    ScriptProcessorRuleBehavior resets entity context

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 51a6af053d95e90e582a25ae51c5730a7e2b0973
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:40:37 2021 -0500

    Add add_prefab_group

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f297aa232a2cd9ad5583b3e2b4aa1ce793c07d92
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 11:53:25 2021 -0500

    Fix merge compile issue

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit fc40f5e75efbb87382bf6227966f2f905ccf6d75
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 11:18:44 2021 -0500

    {ly5395} adding asset loading logic for procedural prefabs

    * enabling the Prefab gem for tool work
    * enabling prefab gem for AutomatedTesting
    * AssetTypeInfoHandler for procedural prefab
    * EnableCatalogForAsset for procedural prefab
    * RegisterHandler for AssetManager

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 7a2250db337fbfc693e3cf57458eb56f419b32d6
Merge: c1f3e14304 751a0fab4f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:32:37 2021 -0500

    Merge remote-tracking branch 'origin/Feature_LY-5384_ProceduralPrefabs' into origin_Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 12440233ccd987d41c248df57cee913ebb2ae2f6
Merge: 751a0fab4f f8d39e2671
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 10:25:50 2021 -0500

    Merge remote-tracking branch 'origin' into feature_lyn5394_procprefab_asset

commit c1f3e143048a914ab2d89146685ca5fe409dda27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 20 14:03:53 2021 -0500

    Fix merge issue

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 1990ec370df81d4b77b4646553c2b13dce18c638
Merge: 23d02ed416 fc8697edd5
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:21:10 2021 -0500

    Merge branch 'development' into origin_Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp

commit 751a0fab4f932ec3d7683e2d46a187eefc7addbf
Merge: 23d02ed416 7b8d5629dd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 10:10:06 2021 -0500

    Merge pull request #229 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset

    {lyn5394} adding ProceduralPrefabAsset to AZ Tools Framework

commit 15fddd1795ff07e8d6ce8840a2d675713b63655c
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 10:04:06 2021 -0500

    {ly5384} Fixing Linux build issues.

    * symbols "struct FindComponent" and "AZ::Component* FindComponent()" defined in the same scope, renamed function to FindComponentHelper
    * wrapped the AZ::ComponentId return for both cases

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 23d02ed4165a1db9e738057aad0b7613be8105da
Merge: 0a31e39a25 0f3680a996
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 09:44:30 2021 -0500

    Merge pull request #228 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_Misc

    Reflect Prefab/Entity constants and add failure unit tests

commit 7b8d5629dd04ca1ed75c9828dbb0949f12eb2ca3
Merge: 78fe2cec6f 0a31e39a25
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 17:37:29 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset

commit 78fe2cec6fbcea9217d0b23ec056e19f144fc9a9
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 17:27:57 2021 -0500

    Updated PrefabBuilder to point to new asset type for the procedural prefab

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 4da4e026582c8e7bf0fe9c7c7b39f15189c67b78
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 16:56:13 2021 -0500

    {lyn5394} adding Prefab/Procedural/ProceduralPrefabAsset to AZ Tools Framework

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit c2fb7b9ccb4b7d4e8080b8830d4ceeb66cd3972c
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 16:45:03 2021 -0500

    Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior

    {LYN5393} Adding Prefab Group Behavior to output Procedural Prefab

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 0a31e39a25d36c63827424adc883e873aee20b71
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 16:45:03 2021 -0500

    Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior

    {LYN5393} Adding Prefab Group Behavior to output Procedural Prefab

commit 0f3680a9968cbbbcb9558811f8dbd287a97447ae
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 13:53:22 2021 -0500

    Add failure tests and some test cleanup

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 834eab4c4bf151dfb9e49eb0a5e1f20486b6c05c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 13:34:03 2021 -0500

    Reflect InvalidTemplateId, fix reflection for InvalidComponentId

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 30de326dfbc28bbb9481bf282eb35c427469c847
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:55:16 2021 -0500

    Fix merge issues

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 4bcf6b7b4f2d6285f244226b065bff65ba565094
Merge: 20c5cd7259 28fec42242
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:28:26 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs_EntityManagement' into Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 20c5cd7259235d26f1aa11e2d61ac6b8a57b8638
Merge: 050e26d609 6845942fa4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:24:44 2021 -0500

    Merge pull request #200 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_CreatePrefab

    API Update: Wrap PrefabSystemComponentInterface behavior

commit 6845942fa419b2b6d5a0103f8d30e6515948310e
Merge: 58a51c738e 65da78dcc2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:07:33 2021 -0500

    Merge pull request #208 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_SavePrefabToString

    API Update: AzToolsFramework::Prefab::PrefabLoaderInterface

commit 65da78dcc22c4251696ebb75680928ecf83d6733
Merge: e0c5e060ab 58a51c738e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:07:06 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs_CreatePrefab' into Feature_LY-5384_ProceduralPrefabs_SavePrefabToString

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
    #	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabScriptingTests.cpp

commit 28fec422426640540bd21b2275c7b7a90e4f8e71
Merge: c1b8b5190f d825305202
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 09:58:36 2021 -0500

    Merge pull request #212 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentManagement

    API Update: Editor Entity Component Functions

commit d825305202d5a02d60dd20fb5d0cc0ecb73f562a
Merge: c280964b98 88fa6983d1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 09:58:09 2021 -0500

    Merge pull request #218 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentExplore

    API Update: Editor Component JSON Helper Functions

commit a56daadc45e5ad8511aa5160c3afc245ca10fb83
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 16:48:41 2021 -0500

    m_prefabGroupBehavior.release() -> m_prefabGroupBehavior.reset()
    adding error messages for the prefab processing
    fixed typo

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit c1a03351f55f9e8f5161c0ef0288c8e64050e399
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 16:32:42 2021 -0500

    reduced the JSON for the testing framework to tree types only

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 0008866baa7882ec106e134049e2bd7b95113796
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 16:25:00 2021 -0500

    enable ProceduralPrefabAsset JsonRegistrationContext

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 58a51c738e1bbd5bcad27cf1c0add4760bb8cffa
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 15 14:31:59 2021 -0500

    Remove unneeded include

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit e0c5e060ab8a9cb2cfce4c083f276ab064aa08ea
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 15 14:20:04 2021 -0500

    Cleanup whitespace

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 88fa6983d19ac3a0d7c4073ea390c36794d2603b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 15 13:49:20 2021 -0500

    FindMatchingComponents now returns a vector of ComponentDetails which includes base class info (non-recursive)

    Fixed a memory leak
    Moved const to header

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit b57a9d4261aea85a8ddb1036307d8ad296cac859
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 10:49:32 2021 -0500

    updated the DOM logic for the asset loading sake

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit f55ee9f5eabbeac998028f027e1c8adf55419a9d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 14 13:23:13 2021 -0500

    Update CreateStringPermissive to stop when enough data has been collected.

    Update unit tests.
    Fixed out of bounds behavior in EntityUtilityComponent usage of CreateStringPermissive.
    Updated AssetTreeFilterModel to cap the string length

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 6d6707dea8cd072261d65e0a508d1179df3892d4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 14 10:55:38 2021 -0500

    Rename GetComponentJson to GetComponentDefaultJson.

    Clean up GetComponentTypeIdFromName

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f4380d37a40ada353f7156b0d06b7ab60b72a151
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 14 10:29:04 2021 -0500

    Move scripting ebus and handler into separate files

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 572cb58f854aa2368b18f8cf70154d471dfac047
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 10 20:27:41 2021 -0400

    Renamed SearchComponents to FindMatchingComponents

    Added missing printf formatting

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 050e26d60931700e226a4d1a5d02d6a1d4c69915
Merge: 542bdfc5d7 c1b8b5190f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 10 09:31:08 2021 -0400

    Merge pull request #201 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement

    API Update: Editor Entity Management - Add some comments and error handling

commit 875d5dc466b65d893a44e11aa9467c45cf7994e9
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 10 09:13:43 2021 -0400

    Move bus and handler code into separate files

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit a2d94e24fb2cd1993835f17e7129000c00926cf7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 17:25:35 2021 -0400

    Add comments

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 16f507377f4f04c88028833f69327bd11b401b87
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 17:16:33 2021 -0400

    Add error messages

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 2e6d7d40dc731989128fbe829141057b3558c88b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 16:54:20 2021 -0400

    Cleanup code

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 963891eaeb8d616bb071f2a7b50cdabd994241a2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 3 10:48:40 2021 -0500

    Add and update unit tests

    Reflect APIs to behavior context

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 664be8eca54293407e5ce2d631375d907c1bb2f6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 2 13:00:02 2021 -0500

    Add Search and Component json output APIs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit e94fe64f366009d06b889954d292c37ea4f96fe2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 13:37:44 2021 -0400

    Make bus handler private

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 345a1b0d5edef99d5a8ea2bce2f4f3478652a4f1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 12:30:13 2021 -0400

    Address feedback

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit c280964b983635bed9e8bbfb94b2188403287d4c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 10:12:49 2021 -0500

    Address feedback

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 3b819ee827fc4c19312f2d2bc5788e2cc36de4f4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 3 16:06:10 2021 -0500

    Update unit test to verify components on saved prefab

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 0b63c0e316ec621ed17edf36109b7cd1d50ef606
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 3 12:52:46 2021 -0500

    Expand test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ea59416626d9b43599cf8847585e599f8fa5fd22
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 17:32:14 2021 -0500

    Add error handling

    Add component creation
    Add error testing

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 9d0f2ae33eadba0216bd245157b94692792b1a86
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:31:28 2021 -0500

    enabling ProductDependencies test again

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 15d1e4730df31e71e7e3ee6d4914f19b233c1b7f
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:23:26 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior

    # Conflicts:
    #	Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit ce2e4602bde26fbb34b43c73f820a97b9e229b5a
Merge: 5ad0aac747 542bdfc5d7
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:14:07 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior

    # Conflicts:
    #	Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 542bdfc5d762c07938f9a0f8e729070f1df9edfc
Merge: 3e7564c944 4899f67986
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:09:10 2021 -0500

    Merge pull request #207 from aws-lumberyard-dev/feature_lyn5392_proc_prefab_group

    {lyn5392} Adding PrefabGroup scene manifest rule

commit 4899f67986992b7eeb5cc3b750493ed21ec7b4f3
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 16:33:24 2021 -0500

    removing unneeded AZStd::move() calls

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 5ad0aac7472d24bb85990d36399a466288ecfdbc
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 16:17:52 2021 -0500

    cleaned up the code
    finalized the unit tests
    fixed the code based on the tests... FTW!

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 24f289dd31292c4b9f5e5848ddc94efd986b4341
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 13:06:20 2021 -0500

    Add FindComponentByTypeName and UpdateComponentForEntity APIs

    Add unit tests

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit c1b8b5190f973d2429731308f50c7c962d64301e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 14:02:17 2021 -0500

    Fix bus connect that should have been a bus disconnect

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit fde870d6c92e131875ec6aadda2365203a538379
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 12:57:04 2021 -0500

    Fix up includes

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 8ceddd0efc90d33bc34b5287176497356e57abf9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 08:43:23 2021 -0500

    WIP

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 3cc9135d87efde24430dbf1cd112bcf9b95ecaa0
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Aug 31 14:44:37 2021 -0500

    Rename files

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f056b3d9578ae2f49dbc172a5929306047620be6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Aug 31 14:14:34 2021 -0500

    Remove 'editor' from bus/component name

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 0fb7a0788e879eb9dc241291f05f0acffc0b0156
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Aug 31 09:18:37 2021 -0500

    {lyn5392} Adding PrefabGroup scene manifest rule

    * Adding PrefabGroup abstraction and concrete classes to fill out in a scene manifest
    * has reflections for serialization & behavior
    * testing the behavior using Lua
    * testing the serialization using JSON

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit b1756307bff9f86ae0ae1354bae8f470d19b4487
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 17:52:18 2021 -0500

    Reflect SaveTemplateToString

    Add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ddd2bb89041c5fb8b6add2cfc02c454baab9a7d6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 12:46:17 2021 -0500

    Add warning/error messages, update module

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit e839c1cbcc340859fc6ee5cff2d802660944194b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 11:17:25 2021 -0500

    Add some comments and error handling

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 347f787cc88405541889e842151de81a70598dd1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 17:16:45 2021 -0500

    Fix line endings

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit be26ab1cb16221ba879c10652b430ea31547d868
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 15:28:00 2021 -0500

    Add CreatePrefabTemplate

    Add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 3e7564c944497b7b6cce94dbce486ed8c4561f33
Merge: 5a3c289fac 07841ee749
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 10:20:20 2021 -0500

    Merge pull request #199 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement

    Add editor entity creation and unit test

commit 07841ee749d2a1bc22352cbec3076ac087348676
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 16:44:57 2021 -0500

    Fix line endings

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 35bc3b89cd1fcc126114ea7d61cdd21e88699080
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 15:03:35 2021 -0500

    Setup CreateEditorReadyEntity to use a custom entity context

    Add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 82519b15510a4ec1b2daf4d883a2c4c3d9c0a347
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 09:29:20 2021 -0500

    Add EditorEntityUtilityComponent for managing entities from the behavior context

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f8d39e2671
Merge: 43603cad5e 575faa4443
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Wed Aug 11 15:29:33 2021 -0500

    Merge pull request #3049 from aws-lumberyard-dev/cgalvan/gitflow_210811

    Merged stabilization/2106 to main

commit 575faa4443
Merge: 43603cad5e 4b817a6483
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Wed Aug 11 14:13:27 2021 -0500

    Merge remote-tracking branch 'upstream/stabilization/2106' into cgalvan/gitflow_210811

    Signed-off-by: Chris Galvan <chgalvan@amazon.com>

commit 43603cad5e
Merge: d9cce28a53 bb52475ce8
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:55:51 2021 -0500

    Merge pull request #2271 from aws-lumberyard-dev/Foundation/miterenc/ContributingUpdate

    Updating CONTRIBUTING.md

commit bb52475ce8
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:55:14 2021 -0500

    Updated text to be more descriptive

    Signed-off-by: Terry Michaels <miterenc@amazon.com>

commit 697dfad486
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:27:24 2021 -0500

    Fixed typo

    Signed-off-by: Terry Michaels <miterenc@amazon.com>

commit 650e1ab44d
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:19:46 2021 -0500

    Updating CONTRIBUTING.md

    Signed-off-by: Terry Michaels <miterenc@amazon.com>

commit d9cce28a53
Merge: e7f787572e 486ba58628
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Mon Jul 12 14:06:57 2021 -0500

    Merge pull request #2096 from aws-lumberyard-dev/cgalvan/gitflow_210712_main

    Merged stabilization/2106 to main

commit 486ba58628
Merge: e7f787572e 7cfde884d9
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Mon Jul 12 11:12:41 2021 -0500

    Merged stabilization/2106 to development; Resolved merge conflicts

    Signed-off-by: Chris Galvan <chgalvan@amazon.com>

commit e7f787572e
Author: Nicholas Lawson <70027408+lawsonamzn@users.noreply.github.com>
Date:   Tue Jul 6 08:03:35 2021 -0700

    Updates licenses to APACHE-2.0 OR MIT (#1685)

    Not to be committed before 7/6/2021

    Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>

commit 837e1c7370
Merge: d30de01752 efcbe2c4a1
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Fri Jul 2 12:11:27 2021 -0500

    Merge pull request #1764 from aws-lumberyard-dev/cgalvan/gitflow_210702

    Merged stabilization/2106 to main

commit efcbe2c4a1
Merge: d30de01752 0c43493e29
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Fri Jul 2 10:20:42 2021 -0500

    Merge remote-tracking branch 'upstream/stabilization/2106' into cgalvan/gitflow_210702

    Signed-off-by: Chris Galvan <chgalvan@amazon.com>

commit d30de01752
Author: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Date:   Mon Jun 28 11:20:36 2021 -0700

    Updating LFS config to new endpoint (#1624)

    Signed-off-by: AMZN-alexpete

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* fix for "warning C4100: 'outputValueTypeId': unreferenced formal"

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* Squashed commit of the following:

commit dbd3526517bcb6553402cbc0af1f02e1f68e0707
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Oct 4 14:30:56 2021 -0500

    Increased scene manifest max size to size_t::max to match default json size limit

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ea4a9ffd23feb3beeadc9bf6ca765c96980e9e6d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Oct 1 19:15:25 2021 -0500

    Switch to querying cache location from Settings Registry

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 1c197996132625b8e26856fc92a30f9862d9dfdb
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Oct 1 14:42:32 2021 -0500

    Update to look in cache for generated manifest instead of source folder

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit cf3c32791fd71dc48066f9783c8859d386370b95
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 30 11:09:40 2021 -0500

    Added generated manifest to dependency tracking.  Updated unit tests

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 56cb0d27982e61c2cf123b765def8b5c9e21b021
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 29 15:51:52 2021 -0500

    Moved manifest size const to header and used that in scene builder

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 7c8016a0ba6000090b29371f253b7906c9f3d141
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 29 15:21:06 2021 -0500

    Add doc comment

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 45fd5473f5ed6fe4fe93f8d629857852bcbe5e03
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 29 15:11:36 2021 -0500

    Clean up code and add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit d0e610cad380e2278bc18552a4d1c71c64a5d339
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 29 13:21:58 2021 -0500

    Source dependency reporting WIP

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp

(cherry picked from commit d6464dcee20ea4e6f2d40f0d3301f24be5f4dee6)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add comment on unit test globals, fix indentation

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Cleaned up scene_mesh_to_prefab.py

Added comments
Removed raise_error function
Made mesh_group_name cleanup more comprehensive

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* fix for "warning C4100: 'message': unreferenced formal"

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
Co-authored-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
lumberyard-employee-dm f648cb1fd8
Update the FileIO Aliases (#4186)
* Update the FileIOAlias naming to make the cache, project root and engine
root paths more clear

The alias of `@root@`, `@assets@`, and `@projectplatformcache@` has been
collapsed to `@projectproductassets@`

The alias of `@devroot@` and `@engroot@` has been collapsed to
`@engroot@`

The alias of `@devassets@` and `@projectroot@` has been collapsed to
`@projectroot@`

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated use of devassets and devroot properties in python

Those properties now use projectroot and engroot

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updating the alias @engroot@ alias path comment in each platform specific LocalFileIO_*.cpp file

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed hardcoded size of 9 for the product asset alias.

The ResolvePath function now just appends the @projectproductassets@
alias with the input path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Remove duplicate @projectproductassets@ check in ProcessFileTreeRequest

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix for typos in Hydra python test

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated LocalFileIO::Copy call on Windows to use the Unicode aware CopyFileW API

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AWSMetreicsGemAllocatorFixture to properly suppress asset
cache write errors for Test file creation.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed unneeded call to set the @projectproductasstes@ alias at the bottom of the AssetSeedManagerTest SetUp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a deprecated alias map to the FileIO System

When a deprecated alias is accessed, the FileIO System logs an AZ_Error and indicates the alias that should be used

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated python test scripts to use the projectroot binding

Retrieving the AutomatedTesting project path based on "<devroot>/AutomatedTesting" has been removed.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated references to devroot and devgame within the codebase

The GetAbsoluteDevGameFolderPath functions has been replaced with direct call to AZ::Utils::GetProjectPath
The GetAbsoluteDevRootFolderPath functions has been replaced with direct calls to AZ::Utils::GetEnginePath

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated <engroot>/AutomatedTesting references to projectroot


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Replaced references that assumes the project path is <engroot>/AutomatedTesting with <projectroot> in the AutomatedTesting python test

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Correct casing in emfxworkspace file


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed newly added AppendPathParts function
Removed the Path constructors which accepts a PathIterable instance

The PathIterable isn't safe to return to a user of the Path class as it might be referencing temporary paths supplied via PathView arguments

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed unused parameter warning

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Undid change to the LexicallyProximate function to set the path result to the base path.

It needs to return the *this path if the pathResult is empty

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Moved the LocalFileIO ConvertToAbsolutePath implementations to AZ::Utils

Fixed the ConvertToAbsolutePath implementation for Unix platforms to use a buffer that is size PATH_MAX(4096 on all our supported Unix platforms).
Because the buffer before was AZ::IO::MaxPathLength which as a size of 1024, this was resulting in the Unix `realpath` function smashing the stack when it converts a path to an absolute path that is longer than 1024 characters

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the EditorCore.Tests to attach the AZ Environment to the EditorCore shared library that is statically loaded on launch.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed for DeprecatedAlaisesKeyVisitor Visit function causing the non string_view overloads being hidden causing a hidden base class function warning

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Changed the AWSMetricsGemMock to use a temporary for writing test assets

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the LocalFileIO::ResolvePath function to use HasRootPath to determine if a path starts with a root path such as "D:", "D:/" or "/"

IsAbsolute was not the corect check as the path of "D:" is a relative
path.
To be absolute according to the Windows the path must have a root
directory. i.e "D:/" or "D:\"

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed absolute path comment from LocalFile_UnixLike.cpp and LocalFile_Android.cpp FindFiles implementations
Updated the ConvertToAlias to supply an AZ::IO::FixedMaxPath

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Replaced usage of the @projectproductassets@ alias with @engroot@ when referring to the LmbrCentral source folder in the CopyDependencyBuilderTest and the SeedBuilderTests

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the ScriptCanvas Upgrade Tool to output backed up files to the
Project User Path instead of the engine root

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed whitespacing issues in Application.cpp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Remove unnecessary creation of a FixedMaxPath in the UpgradeTool.cpp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Modified testSeedFolder variable in the SeedBuilderTests to use the
@engroot@ alias instead of @projectproductassets@/.. alias when
referring to the LmbrCentral Gem source path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated references to the Project Asset Cache in the PythonTests.

Those tests no longer use the logic `azlmbr.paths.projectroot / "Cache" / "pc"` to retrieve a path to the cache root but instead the `azlmbr.paths.projectproductassets` constant

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed the FileIO Deprecated Alias test on Windows

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing @projectsourceassets@ alias, as it is only used once.

Updated the PhysX EditorSystemComponent.cpp to query the ProjectPath
form the SettingsRegistry.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Replaced @projectproductassets@ alias with @products@

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Rollback changes to the PhysX EditorSystemComponent.cpp

The changes to use the ProjectPath from the SettingsRegistry has been implemented in PR #4497

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Dennis Brakhane 7f75dc6dee
Fix "index out of range" error in AssetProcessor (#4324)
* Fix "index out of range" error

When the parent is the tree root element, beginInsertRows must be
called with an invalid (but legal) index. A QModelIndex with a row
index of zero when the parent has no children is an illegal index
and will result in "undefined behavior", like the "index out of
range" one.

Therefore, if our parent is the tree root element, we use QModelIndex()
instead.

Fixes #2343

Signed-off-by: Dennis Brakhane <brakhane@gmail.com>

* Use QModelIndex() instead of createIndex(-1, -1)

Both do the same, but the former is Qt best practise.

Signed-off-by: Dennis Brakhane <brakhane@gmail.com>

* add some sanity checks in debug mode

Using illegal ModelIndices can result in hard to debug problems later
on, so add a few checks to help spotting them sooner.

Signed-off-by: Dennis Brakhane <brakhane@gmail.com>
4 years ago
lumberyard-employee-dm c9608846a1
Updated the AssetProcessorManagerTest LockFileTest to check the Source… (#4459)
* Updated the AsetProcessorManagerTest LockFileTest to check the SourceFileNotificationMessage

If the SourceFileNotificationMessage indicates that the source file was
removed, it triggers the callback to spin off a thread to remove the
product file.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Changed SourceFileNotificationMessage cast to use azrtti_cast

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp f3e6adce7f
LYN-6882 release builds are executing code in asserts (#4305)
* adding Windows/release to PR-validation builds

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

* changing trace back to expand to nothing for release

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

* typo

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

* more fixes

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

* fixing some more unused variable cases

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

* renaming file in ScriptCanvas that causes a msbuild warning

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

* reverting a previous change

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
amzn-phist fec77632ef
Archive Component - Rewrite and additional work on Archive and Asset Bundler (#4332)
* Fix issues with seedlist for AutomatedTesting

Fixes error reporting so it will show the file hint in the tool.
Removes any missing assets from the .seed file.
Remove an unnecessary dependency from AutomatedTesting dependencies
file.

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

* Make ArchiveComponent use AZ::IO::IArchive

Initial changes that will get the sychronous calls in ArchiveComponent
to use IArchive interface rather than external zip/7z tools.

Some of the asynchronous api are still in place, anything that wasn't
being used has been removed for now.  This may change later if we move
towards all the api being asynchronous.  Until then, we can't remove the
reliance upon the external archive tools completely.

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

* Updates AZStd::thread constructors

Adds a variadic constructor which forwards args to the functor.
Because of our thread_desc extension, there was confusion on the
arugments, so the args were reordered to take the thread_desc first,
before the functor and args.
Also the thread_desc is taken as reference rather than by pointer.
Update callsites to account for this change.

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

* Async operation of ArchiveComponent api

This sets up the ArchiveComponent to operate asynchronously.  It uses
promise/future to transfer results to caller.

This is still broken, there's a few things that need to get fixed up,
but this is a good checkpoint for the work as it solidifies the api,
cleans up a bunch of unused code, and compiles.

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

* Removes the platform-specific ArchiveComponen

These are no longer needed, as they control the direct interaction with
host OS tools like 7za.exe or /bin/zip.

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

* Removes the platform-specific files from cmake

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

* Removes the 7za.exe (and legal notice)

This tool is no longer needed in the repo.

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

* Fixes usage of IArchive::GetFullPath()

This changed to return a PathView, updated to reflect that.

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

* Fix promises and threads

Make sure promises are only set exactly once.  This meant reworking some
of the initial error checking.
Detach threads when created.  Adds [[nodiscard]] to the functions that
return a future.  Since threads are detached, the future is the main way
to get communication from the thread.
Clean up interface, add comments.

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

* More edits to thread creation

Changes to thread construction to account for parameter change.

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

* Fix some remaining issues with ArchiveComponent

Put created threads inside a container, then join them at Deactivate.
Fix asset bundler case when injecting a file with no working directory.
Fix thread constructor that applies args to a function.
Fix lambdas to take string args by value rather than reference.

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

* Fixes some remaining bugs in ArchiveComponent

Open archive as read-only during extract & list operations.
Fixes paths issues.

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

* Fix initialize of opaque thread handle in thread_UnixLike.h

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed unused variable in AssetBundleComponent.cpp to fix compiler warning

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix some issues with archives

File paths in the CDR and the local headers need to match, but there
were issues with path separators and case that made it possible to get
invalid headers errors in some archives.

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

* Adds some new ArchiveComponent unit tests

Adds new tests for extraction of archive and adding files from a file
list to an archive.

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

* Fix file data offset issues when opening archives

When opening an INestedArchive it would run through the CDR headers to
create file entries in the zip cache.  The offsets to the compressed
data were being calculated incorrectly because they were using the CDR
headers rather than jumping to the local file headers and getting
offsets from those sizes.

Removed and refactored some archive validation flow and zip cache
factory init methods to either init default or init w/ additional
validation checks.

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

* Addresses PR feedback

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

* Address more points of feedback in PR

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

* Address additional PR feedback

 Fixes up some error checks and uses of strings vs paths.
 Enable archive component tests on Linux so we can see if they will
 pass.

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

* Address PR feedback

Change the INestedArchive interface to list files as AZ::IO::Path.

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

* Disabling the ArchiveComponent tests on Linux

They failed so we will revisit them to attempt a fix.

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

* Rename a member variable to be more accurate

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

* Address feedback on PR

Bump version of Archive Components for serialize context.
Improve error messages during archive open and validation.

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

* Revert recent changes

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

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 090aa8f053
Removed ununeeded includes from EBus EBus.h and Policies.h (#4256)
* Removed ununeeded includes from EBus EBus.h and Policies.h

Updated the locations which needed those includes

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding missing include for <memory> to AWsClientAuthBus.h

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Remove the while true loop in the EBusQueuePolicy Execute() function

The while true loop in Execute was for allowing additional functions to be queued in the middle of execution of current list of functions.
That functionality was dangerous, because if a queued function added itself during execution unconditionally, then it would result in an infinite loop

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AssetManager::DispatchEvents function to pump the AssetBus event queue until empty

Queued Events on the AssetBus is able to queue additional events on that Bus during execution of those events.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Changed the AssetManager::DispatchEvents function to only execute the
AssetBus queued events once

Changed the AssetJobsFloodTest.AssetWithNoLoadReference_LoadDependencies_BehaviorObeyed test to dispatch events until the OnAssetContainerReady callback is signaled.

This happens after every asset load to make sure that the
expiring AssetContainer instances are removed from `AssetManager::m_ownedAssetContainer` container before retrying to load the same asset.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a MaxTimeoutSeconds constant for the maximum amount of the time to run a single DispatchEvents loop

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Artur K f44169f7fa
Cleanup SerializeContext.h pt.1 (#4264)
* Remove AssetSerializer inclusion from SerializeContext header

Moved a few Reflect methods to new cpp files.

In addition, some preparations for further header dependency reductions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix smoke test lua failures.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Windows build fixes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Missing license headers

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix white-space issues.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix inheritance list wrapping broken by older clang-format

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
SJ 1f542838bb
[Mac] Generate O3DE SDK app bundle that can be notarized and distributed (#4150)
* [Mac] Initial support for building with hardened runtime enabled and code signing the binaries and bundles generated by the CMake install process.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Move call to ly_post_install_step
2. Entitlements should only be added for executables
3. Change use of CMake exec_program to newer execute_process
4. Remove broken symlinks from embedded Python frameworks
5. Run post install code signing only if hardened runtime is enabled

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove unnecessary flag

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove unnecessary additional call to condesign python inside a bundle

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Move commonly used install functions for codesigning, copying files, and fixing frameworks to a utility script
2. Remove unnecessary wait in the Editor/AP launchers I added earlier.
3. Codesign 3rd party libraries for distribution.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Codesigning on 3rd party libs should only happen when hardened runtime is enabled.
2. Change the order of the if blocks in Editor's main_dummy.cpp. This was causing strange notarization issues because it wass too similar to AP's main executable.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add new line to end of file

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Move architecture specification to PAL_mac cmake file. 2. Codesign failure should be fatal.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Address some PR feedback

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove unnecessary comment. Change if to use IN_LIST.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* HOME may not always be defined. Adding alternate POSIX way of determining HOME.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Checking in partial work to get O3DE SDK built as an app bundle. Has a bunch of debug code that needs to be cleaned up.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove this and add it back later with fixed casing.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Adding file back with fixed case

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Add entitlements sparingly(only when necessary)
2. Convert entitlements to plist files which we can directly pass to codesign
3. Install python site-packages in the o3de_sdk launcher and then launch the project manger.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Move hardened runtime check to codesigning functions only. This way, non-hardened runtime install is identical to the former except for codesign. Makes it easy for QA to test internally.
2. Move cmake min version for install to the pre-install steps.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Remove the dummy launchers for AssetProcessor and Editor
2. Add loader_path to the rpaths of binaries outside an app bundle so that the dynamic loader can load their dependencies if any.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove file named main_dummy.cpp

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add O3DE SDK launcher

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add missing runtime dependencies to gems

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Update the path to binaries when codesigning to the correct one.
2. Remove some debug messages.
3. Move installed binary path setreg generation to the target install function. This way, we get the correct path to the bundle accounting for different configs and subdirectories.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add explanatory comments.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. ly_install_add_install_path_setreg cannot be called during install target because the runtime dependencies are already processed by then.
2. The SDK launcher now uses the ProjectManager's bundle setreg to find the path to the installed binaries

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Update path to install relative binaries after merge from dev

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Only one config of the SDK launcher needs to be installed. Preinstall steps should not be run per config, but only once.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Install python dependencies using the get_python.sh script.
2. Replace any reference to hard-coded package name/version numbers with variables.
3. Add one more missing runtime dependency.
4. Misc. PR feedback.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Remove the need for setreg files in all tool bundle. Project binary path can be used instead.
2. Move O3DE_SDK_Launcher to Code/Tools/BundleLauncher
3. Add ly_install_run_script() function for install(SCRIPT) functionality.
4. Address some other PR feedback.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add source permission when installing O3DE_SDK executable.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Rename setreg file to add specialization tag.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove LY_BUILD_PERMUTATION that's not needed

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Add BinariesInstallPath.setreg to all our bundles like before. This is now only added during the install process though.
2. Fix path in Install_common.cmake

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Fix comment

Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
lumberyard-employee-dm 447832dd81
Updated the GameApplication to mount the engine.pak (#4128)
* Updated the GameApplication to mount the engine.pak

This allows loading the autoexec.cfg and bootstrap.game.<config>.<platform>.setreg from the engine.pak files
The engine.pak is searched for in the following order: <ExecutableDirectory>/engine.pak, followed by <ProjectCacheRoot>/engine.pak

Removed a lot of unused APIs from the AZ::IO::Archive feature suite
Updated many of the AZ::IO::Archive classes to use AZ::IO::Path internally.
The logic to search for files within an Archive has been updated to use AZ::IO::Path and to remove case-insensitve string comparisons
Somehow removed the CryFile dependency on anything Cry

Updated the Settings Registry to support reading from the FileIOBase and therefore Archive files in the GameLauncher via the `SetUseFileIO` function

Removed AzFramework Dependency on md5 3rdParty library

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Linux build fix

Added an include of <stdio.h> before the <rapidxml/rapidxml.h> include as it usesnprintf.

Added `static` to the constexpr constants in ExtractFileDescription in SettingsRegistryImpl.cpp to fix clang compile issue

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the case used to mount the Engine PAK file in the GameApplication to be Engine.pak to match the other locations where it is mounted

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the proper FFont call to FileIOBase::Size to supply the correct
integer type of AZ::u64 instead of size_t
This fixes building on platforms where size_t is type defined to be
unsigned long

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed segmentation fault in Archive::Unregister when outputing the filename of the Archive file being closed

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix calls to OpenPack in the Legacy LevelSystem

The LevelSystem was calling the incorrect overload of OpenPack that
accepts BindRoot for the mounted level.pak instead of the overload that
that passes a memory block object.

This was causing the level pak files to be mounted using an invalid
directory, causing file accesses inside the level pak to fail.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the error messages in the ZipDir CacheFactory class to use AZ_Warning directly

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the ArchiveFileIO m_trackedFiles container to store mapped type as an AZ::IO::Path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp 5965760612 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp d046389a30 Code/Tools/AssetProcessor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Chris Burel 72cd282ad2
Avoid redefining `PRI` macros on Linux (#4055)
* Avoid redefining `PRI` macros on Linux

The fixed width 64-bit integer types are defined differently per platform.
Some platforms define it as "long", others define it as "long long". For
consistency, `AZ::u64` or `AZ::s64` is always defined to "long long".
However, this causes problems for formatting those types, because on
platforms where `uint64_t` is a `long`, `PRIu64` gives the wrong format
string for `AZ::u64`. Previously this was fixed by redefining the `PRI`
macros so that they work for `AZ::u64`, but that breaks the ability to
format `uint64_t`.

We could add an AZ-specific version of the `PRI` macros for 64-bit integer
types, but we don't really need to, since they are `long long` on every
platform we support.

 * Use `%ll` for `AZ::u64`
 * Use `PRIu64` for `uint64_t`

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

* Avoid redefining `PRI` macros in CryCommon

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Esteban Papp 49d35e0788 Final fixes for MSVC
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
cgalvan d577702935 Updated legacy Editor and Asset Processor icons on Mac to O3DE icons.
Signed-off-by: cgalvan <cgalvan1337@gmail.com>
4 years ago
SJ eae08c4b54
[Mac] Fix crash in Editor and AssetProcessor. (#3786)
Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
lumberyard-employee-dm 0ad2fe2294
Set enable gem variants feature (#3631)
* Implemented the RFC to allow projects to need to specify the Gems

Projects no longer need to specify CMake Targets to associate a Gem
variant with.

In order to associate a CMake Target with a gem variant a new
`ly_set_gem_variant_to_load` function has been added that maps CMake
Targets -> Gem Variants.

This allows CMake Targets to self describe which gem variants they
desire to build and load

This implementation is backwards compatible:
The `ly_enable_gems` function still accepts the TARGETS and VARIANTS
arguments which it will forward to the new `ly_set_gem_variant_to_load`
function to allow the input Targets to be associated with input Gem
Variants

This changes fixes the issue with gems that are required by an
Application regardless of the Project in use, not replicating it's
"requiredness" to the SDK layout

Fixes #3430

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added an LY_PROJECT_NAME property to the Launcher targets

The `ly_enable_gems_delayed` now command queries the LY_PROJECT_NAME property
associated with each target to determine if the gems being enabled are
match the project the target is associated with.
In this case the target only adds dependencies if the gems is being enabled
without a specific project or if the gems is being enabled for the
matching project.

If the LY_PROJECT_NAME property is not set for target, it indicates the
gems for each project can be added as dependencies to the target.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* The INSTALL step now forwards the LY_PROJECT_NAME property for a target

The Install_common.cmake has been updated to support configuring
TARGET_PROPERTIES into the generated CMakeLists.txt for install targets.

Furthermore the indentation of the generated CMakeLists.txt has been
normalized to help with readability

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updating the Atom_Bootstrap CMakeLists.txt to enable the Atom_Bootstrap Gem


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a deprecation message to ly_enable_gems when supplying TARGETS and
VARIANTS

Added a define_property call for the LY_PROJECT_NAME target property
Removed the .Builders alias for the PrefabBuilder and renamed the
GEM_MODULE target o PrefabBuilder.Builders.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed superflous space from AutomatedTesting Gem CMakeLists.txt

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp 2d2a7f4623
XCode doesnt support files per configuration, using the old method (#3789)
- some warn fixes
- fixed release linking issue

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
sharmajs-amzn 0d728a7677
Added new index on SourceDependency Table (#3648)
Signed-off-by: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com>
4 years ago
Esteban Papp fded2bafad More PR comments/fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 6b96be82ea Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
4 years ago
Chris Burel 86770deefa
Add linux equivalents for all the places that enumerate platforms (#3325)
* Add linux equivalents for all the places that enumerate platforms

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

* Fix the AssetFileInfoListComparisonTest fixture to not hardcode the PC platform

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Esteban Papp 07ea4edbc2 Fixes for Mac/iOS
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 1f44b7a328 Code/Tools
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp a2ab05a262 Code/Tools
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 62a0041245 enable warning 4296: 'operator': expression is always false
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp b255334535 Code/Tools fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 9f7d280a1e Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ResourceSelectorHost.cpp
4 years ago
Artur K 4cee263033
Minimal TypeInfo header/reduce std interdependencies. (#2688)
* Minimal TypeInfo header/reduce std interdependencies.

TypeInfoSimple.h is a small header that can replace the use of
TypeInfo.h in some cases.

Signed-off-by: Nemerle <nemerle5+git@gmail.com>

* Windows build fixed

Removed algorithm.h from string_view.h

smoke-test passed

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Resotore dynamic_pointer_cast in intrusive_ptr

Requested by reviewer.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix CI build

string.h - missed alogorithm.h, since it was removed from string_view
NodeWrapper.h - missing smart_ptr.h

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: Nemerle <nemerle5+git@gmail.com>
4 years ago
Esteban Papp ec1a08d487 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ConfigGroup.cpp
#	Code/Editor/ControlMRU.cpp
#	Code/Editor/CryEdit.cpp
#	Code/Editor/CryEdit.h
#	Code/Editor/IEditorImpl.cpp
#	Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
4 years ago
SJ 44b053df58
[Mac] Building and running game projects from an SDK (#2943)
* 1. Initial support for loading dylibs outside the bundle.
2. Child processes inherit parent's environment if no environment is explicitly specified(should change to append the parent's environment even if environment variables are explicitly specified).
3. Update some time functions to use system uptime instead of wall clock time when computing elapsed time. This fixes false timeouts when the OS goes to sleep.
4. Increase wait times for AssetBuilders and some Atom tools to connect to the AssetProcessor. This is needed because GateKeeper slows down first time bootup which results in asset processing failures.
With this change we'll be able to run Editor and AssetProcessor from an install on Mac and we will also be able to build and run projects using the installed engine as an SDK.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Remove debug messages.
2. Fix license
3. Pass parent's environment variables to child processes by default(on Mac).

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Add more detailed comments.2. Use a custom ly_copy for Mac and leave the default as is.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Address some feedback from review

Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
Esteban Papp e28d04aea6 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
4 years ago
Esteban Papp 84623dfb66 FixedMaxPathString replacement
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Artur K 6c22e92db6
Use lambda instead of AZStd::bind (#2658)
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 4 years ago
AMZN-stankowi 9ee9730294
Automated test for scene files with and without python scripts running python incorrectly (#2373)
* Cleared m_scriptFilename between scene files.
This fixes a bug where a Python script file would be run on a scene file
that didn't have a script file set.
Added a general case version to SceneBuilderWorker.cpp, to make it easy
to mark all scene files as dirty.
Automated tests for this will come in a separate pull request.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Work in progress automated tests

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Python test done

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Sorted jobs work now. This may sort too aggressively, I'll remove the additional sorting after some testing.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Cleaned up test

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed stray '

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed temp code from test

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Command line help options for AP
Removed job sorting that wasn't actually sorting jobs

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Changed constant variable names to match coding standards

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
4 years ago
pappeste f301c3b43a Code/Tools
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp de54731282
fix reference to temporary (#2312)
* fix reference to temporary

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

* Non-unity fixes for mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 92571c2ae4
Merge pull request #2250 from aws-lumberyard-dev/SettingsRegistryBuilderGemRegistryFix
Fixed the SettingsRegistryBuilder not merging the Registry directories within Gems
4 years ago
sharmajs-amzn d5431e1c57
{LYN-4996} Asset Processor is not reprocessing STL files after settings are edited/updated (#2095)
* add asset importer file extension

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

* add new test setreg file

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

* removed an unnecessary namespace

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

* addressed feedback

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

* addressed feedback

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

* remove unnecessay method

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

* add file

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

* reduce waiting time in block until idle

Signed-off-by: sharmajs <sharmajs@amazon.com>
4 years ago
amzn-mike fc75dd5fda
Fix python fbx tests (#2171)
* Update fbx test dbgsg files

Remove rc products from fbx test expected output
Update warning counts for 2 of the tests - these are due to missing material properties
Add SkipAtomOutput setting to disable atom material and mesh processing in scene as these pull in a lot of external dependencies to Process
Removed BlendShapeData and MeshData debug output of positions/normals/faces
Updated ManifestImportRequestHandler to remove warning about Joining 2 absolute paths
Updated AssImpMaterialImporter to use new GenerateRelativeSourcePath API to fix issue where relative path generation failed with tmp project directories

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add comment for setting

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add override dbgsg file to python test

The mesh optimizer specifically avoids creating optimized nodes for nodes that are not selected, resulting in a different scene graph that requires a different dbgsg file to compare with

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Replace hardcoded passing of specific registry setting to instead pass all registry settings to AssetBuilder

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
lumberyard-employee-dm ce6514de6d Added clarifying comments as to why the Gem's SourcePaths directory is
temporarily copied over to the SettingsRegistryBuilder local Settings Registry instance

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 0c339d2e2d Fixed the SettingsRegistryBuilder not merging the Registry directories within Gems
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp 1f9b284de2 Merge branch 'development' into cmake/SPEC-7179
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
#	Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
#	Code/Editor/Plugins/EditorCommon/stdafx.cpp
#	Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
#	Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
#	Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
#	Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
#	Code/Tools/AssetProcessor/native/precompiled.h
#	Code/Tools/Standalone/StandaloneTools_precompiled.h
#	Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
#	Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
#	Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
#	Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
#	Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
#	Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
#	Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
#	Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
#	Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
#	Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
#	Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
#	Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
#	Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
#	Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
#	Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
#	Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
#	Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
#	Gems/Blast/Code/Source/StdAfx.cpp
#	Gems/Camera/Code/Source/Camera_precompiled.h
#	Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
#	Gems/FastNoise/Code/Source/FastNoise_precompiled.h
#	Gems/Gestures/Code/Source/Gestures_precompiled.h
#	Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
#	Gems/GraphCanvas/Code/precompiled.h
#	Gems/ImGui/Code/Source/ImGui_precompiled.h
#	Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
#	Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
#	Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
#	Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
#	Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
#	Gems/LyShine/Code/Source/LyShine_precompiled.h
#	Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
#	Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
#	Gems/Maestro/Code/Source/Maestro_precompiled.h
#	Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
#	Gems/Metastream/Code/Source/Metastream_precompiled.h
#	Gems/Microphone/Code/Source/Microphone_precompiled.h
#	Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
#	Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
#	Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
#	Gems/PhysX/Code/Source/PhysX_precompiled.h
#	Gems/PhysX/Code/physx_unsupported_files.cmake
#	Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
#	Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
#	Gems/ScriptCanvas/Code/Editor/precompiled.h
#	Gems/ScriptCanvas/Code/Source/precompiled.h
#	Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
#	Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
#	Gems/ScriptEvents/Code/Source/precompiled.h
#	Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
#	Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
#	Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
#	Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
#	Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
#	Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
#	Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
#	Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
#	Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
#	Gems/Twitch/Code/Source/Twitch_precompiled.h
#	Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
#	Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
#	Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
4 years ago
Steve Pham 38261d0800
Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago