Commit Graph

970 Commits (1431afb51a08535a0ceabc22f11a55c0e5f5bb93)

Author SHA1 Message Date
Nicholas Van Sickle 2c2c1d8137
Merge pull request #5562 from aws-lumberyard-dev/nvsickle/StabToDevNov21
Merge `stabilization/2110` as of `fac3d0b1bf` into `development`
4 years ago
AMZN-AlexOteiza eafb2fdce5
Fixed editor log path and improved editor log not found error string (#5357)
* Fixed editor log path and improved editor log not found error string

* Renamed any lowercase editor.log to Editor.log

* Fix unit test failures

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

Co-authored-by: aljanru <aljanru@uc5564ff5a5ee55.ant.amazon.com>
4 years ago
jromnoa 96b4212439 improve docstring descriptions for FOV degrees and Asset.id not asset paths for diff asset properties
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
Allen Jackson 6ffee4b0a8
{lyn7352} adding more logging around mock_asset_builder.py (#5103) (#5566)
o3de\AutomatedTesting\Gem\PythonTests\PythonAssetBuilder\mock_asset_builder.py
- adding more logging
- updated keys for platforms (pc, server)

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
4 years ago
jromnoa 9edaa2172d move component descriptions above the property param in the docstrings
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa d7c31184dc add AtomComponentProperties.grid('Secondary Grid Spacing') direct call, remove fmt:on comment
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa ad81c311d8 add some docstring descriptions for Cubemap Texture, Material Asset, Secondary Grid Spacing, & Field of View component properties
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa 01081fea32 update asset called in global skylight test as well
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
Sean Masterson 35cb018d5c Add P0 Look Modification Test
Signed-off-by: Sean Masterson <semaster@amazon.com>
4 years ago
jromnoa 51cf98c23d update golden images for spot light and area light tests, update asset used
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa 9d93282e42
Merge pull request #5530 from aws-lumberyard-dev/Atom/scottmur/ssao_p0
SSAO component P0 automation
4 years ago
sweeneys 10619d53bf fix spelling
Signed-off-by: sweeneys <sweeneys@amazon.com>
4 years ago
sweeneys 34e5758d6c Merge branch 'development' into linux_ar 4 years ago
Nicholas Van Sickle 8d5dd4e35f Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
greerdv 27076cab73
Merge pull request #5135 from aws-lumberyard-dev/tick-tests
Tick tests
4 years ago
SWMasterson 984ea571f4
Add P0 test for Entity Reference component. (#5456)
Signed-off-by: Sean Masterson <semaster@amazon.com>
4 years ago
greerdv 9d05168cfc address feedback from PR
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv 53c6a22ac2 add python test for smoothness of character gameplay component motion
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv 06ef037278 fix typo
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv 128b3d7ec0 fix copy paste error in test description
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv 2ced6011e9 add python test for smoothness of interpolated rigid body motion
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
moraaar e98a65a735
Fixed casing of all .fbx.assetinfo files to match their .fbx (#5490)
Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
sweeneys c083513916 add missing import
Signed-off-by: sweeneys <sweeneys@amazon.com>
4 years ago
sweeneys b482a1a6a1 Disable failing smoke tests on Linux
Signed-off-by: sweeneys <sweeneys@amazon.com>
4 years ago
sweeneys e0c2fd90b1 Disable failing modules, add explicit skip-reason
Signed-off-by: sweeneys <sweeneys@amazon.com>
4 years ago
sweeneys bf00d82b02 Fix linux-specific test failures
Signed-off-by: sweeneys <sweeneys@amazon.com>
4 years ago
jromnoa 99f1783138 Merge branch 'development' into Atom/jromnoa/fix-asset-path-calls-to-use-new-asset-test-class 4 years ago
Scott Murray b202bbfbc9 SSAO component P0 automation
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
amzn-mike efe78d035f
Updated project path to use absolute path (#5459)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
jromnoa 6d206f6921 saving progress on test fixes to swap branches
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa 14bce55796
Merge pull request #5420 from aws-lumberyard-dev/Atom/semaster/add_diffuse_probe_grid_p0
Test Parallel Add P0 test for Diffuse Probe Grid component
4 years ago
Nicholas Van Sickle ec74d363f3
Merge pull request #5297 from aws-lumberyard-dev/nvsickle/FixEntityOrdering
Fix Entity Outliner sort order with Prefabs enabled
4 years ago
John Jones-Steele c35f74e9ce
Physics/test axis aligned box shape configuration works #7378a (#5366)
* Safety commit before merging

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Moved from Physics to Terrain

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR + AR fix

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fixed another AR bug

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fixed another AR compilation bug

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* More PR changes

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Added virtual destructor

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Added TestSuite_main_Optimized.py

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Further fixes for PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fix to editor_test.py

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Testing prefab level

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Testing slice level

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Testing prefab level

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Disabled orefab loading for the time being.

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
4 years ago
Tom Hulton-Harrop 5047ba7f7b merge stabilization/2110 to development - 2021/11/09
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
jromnoa 5c56650516 add new golden image that uses smaller asset file
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
nvsickle 487ac2b516 Force prefabs off for Editor smoke test
Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
Sean Masterson 015611977f Merge branch 'development' of https://github.com/o3de/o3de into Atom/semaster/add_diffuse_probe_grid_p0 4 years ago
jromnoa 8beb4eb0f2 Merge branch 'development' into Atom/jromnoa/fix-asset-path-calls-to-use-new-asset-test-class 4 years ago
Chris Burel 33d5109fe8
Merge `stabilization/2110` as of `20edb35cdc` into `development` (#5319) 4 years ago
Sean Masterson 901aa217b8 removed unused import and fixed line length
Signed-off-by: Sean Masterson <semaster@amazon.com>
4 years ago
Sean Masterson cd508415ef Removed unused tuple.
Signed-off-by: Sean Masterson <semaster@amazon.com>
4 years ago
Sean Masterson 6242d1ee8e Added P0 test for Diffuse Probe Grid component
Signed-off-by: Sean Masterson <semaster@amazon.com>
4 years ago
nvsickle 47c02f555a Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/FixEntityOrdering 4 years ago
moraaar 425e172079
Cloth automated tests only check for cloth gem errors and warnings (#5374)
Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
jromnoa 35e1317d90 add new component property paths to mesh, material, camera, hdri_skybox, and global_skylight components
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa fc3d2ce94c drop the 'as helper' for TestHelper and re-factor the helper. calls to TestHelper.
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
Neil Widmaier 9d656005c4 Adding fmt comments
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
4 years ago
Neil Widmaier c886996bd7 fixing typos and formatting
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
4 years ago
jromnoa f42c034437 Merge branch 'development' into Atom/jromnoa/fix-asset-path-calls-to-use-new-asset-test-class 4 years ago
Neil Widmaier b000b5fab3 Adding P0 HDRi Skybox test
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
4 years ago
jromnoa 425412b4c2
Merge pull request #5354 from aws-lumberyard-dev/Atom/semaster/add_deferred_fog_p0
Test parallel Add P0 Deferred Fog
4 years ago
Sean Masterson c0ece7d32d Update to atom_constants.py docstring
Signed-off-by: Sean Masterson <semaster@amazon.com>
4 years ago
SergeyAMZN b5d5ffb74c
Merge pull request #5331 from aws-lumberyard-dev/LYN-8035_MultiplayerFlakyTestFix
Moving Flaky Multiplayer Tests into Sandbox
4 years ago
Gene Walters 84d38a4f9c Removing Multiplayer MainSuite tests, because AR considers no-test to be a failure
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Sean Masterson 708582731d Add P0 Deferred Fog Test
Signed-off-by: Sean Masterson <semaster@amazon.com>
4 years ago
jromnoa 6bae0bca7e add new bloom test to updated Main Suite test file since optimized main suite test file is removed
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa cf245e0ad3 delete unused TestSuite_Main_Optimized.py file
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa 363a778c33
Merge pull request #5323 from aws-lumberyard-dev/Atom/semaster/add_bloom_p0
Test parallel Add P0 Bloom
4 years ago
jromnoa 0c97c879c1 remove the main suite optimized jobs from CMakeLists.txt since its causing a false build failure on AR
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa 5fe5697147 Merge branch 'development' into Atom/jromnoa/remove-xfail-for-main-suite-tests 4 years ago
jromnoa 06ac304968 use smaller asset files, fix asset to use asset.id for tests
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
Sean Masterson bbeefe43b8 Added extra line above class Tests
Signed-off-by: Sean Masterson <semaster@amazon.com>
4 years ago
Gene Walters 1f4cb58c5e Moving flaky multiplayer tests into sandbox so they will still be ran nightly, but we can still fix and create new tests
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Chris Burel d942c90c56 Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Sean Masterson 64ab8d5956 Add P0 Bloom Test
Signed-off-by: Sean Masterson <semaster@amazon.com>
4 years ago
AMZN-nggieber 4721ef8298
License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272)
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
jromnoa f26e272a8d move light component non optimized test to sandbox until it gets optimized (ticket cut for this)
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
nvsickle 9a4cc6bde9 Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/FixEntityOrdering 4 years ago
nvsickle 52604d79f6 Address some review feedback
Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
jromnoa ae72463581 sandbox portion
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa b82ea09a67 remove redundant sandbox test, remove unsued/old hydra script for old log lines test approach
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa 16526f58b7 remove xfail marker
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa bc2b3b12a7 remove old main suite, rename optimized main suite to be the new main suite
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
puvvadar 537af556c3
Merge pull request #5313 from aws-lumberyard-dev/GitIssue-5310_MultiplayerFlakyTest
Removing Flaky Multiplayer Tests
4 years ago
jromnoa 2539fb6065 saving initial round of edits for the using the Asset class
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
Gene Walters be7c8c8dd3 Removing flaky multiplayer tests. Will bring back once we can reproduce and correct the flakes
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Olex Lozitskiy 7acc343a68
Corrected system requirements of AutomatedTestingSystemComponent. 4 years ago
AMZN-stankowi 6b5f5bc666
Bundled release build bug fixes cherry picked from development (#5270)
* Fixed some files missed when groundplane_521 was renamed to 512 (#4958)

* Fixed references to 521x521 to reference the correct 512x512 FBX file

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed asset hints

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Moved the Asset Catalog loading from LmbrCentral to the AzFramework::Application (#4568)

* Moved the loading of the AssetCatalog from LmbrCentralSystemComponent to AzFramework Application

Modified the AssetCatalog::InitializeCatalog function to no longer rely on the TickBus to send out the `AssetCatalogEventBus::OnCatalogLoaded` event.
It now queues a function on the AssetCatalogRequestBus to send the OnCatalogLoaded event as soon as the dispatching for the AssetCatalogRequestBus has completed on the current thread.
This is done by updating the AssetCatalogRequestBus to use EBus ThreadDispatchPolicy to add a callback to invoke any queued function has soon a thread has finished dispatching and has released its DispatchMutex

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

* Updated the AssetCatalogRequestBus to add a custom DispatchLockGuard

The AssetCatalogRequestBus uses the custom lock guard to dispatch queued
events after it has unlocked it's context mutex for the current thread.

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

* Removed GetContext call from the
AssetCatalogRequests::PostThreadDispatchInvoker

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

* Updated the definition of FileTagQueryManager::GetDefaultFileTagFilePath
function to return a path

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

* Updated the AZ_CONSOLEFREEFUNC macro to actually use the _NAME

The _NAME parameter was not being used before, resulting in the Console
stringified name of the function being used.

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

* Removed CrySystem dependencies from the BundlingSystemComponent

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

* Moved the loading of the AssetCatalog from LmbrCentralSystemComponent to AzFramework Application

Modified the AssetCatalog::InitializeCatalog function to no longer rely on the TickBus to send out the `AssetCatalogEventBus::OnCatalogLoaded` event.
It now queues a function on the AssetCatalogRequestBus to send the OnCatalogLoaded event as soon as the dispatching for the AssetCatalogRequestBus has completed on the current thread.
This is done by updating the AssetCatalogRequestBus to use EBus ThreadDispatchPolicy to add a callback to invoke any queued function has soon a thread has finished dispatching and has released its DispatchMutex

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

* Updated the AssetCatalogRequestBus to add a custom DispatchLockGuard

The AssetCatalogRequestBus uses the custom lock guard to dispatch queued
events after it has unlocked it's context mutex for the current thread.

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

* Removed GetContext call from the
AssetCatalogRequests::PostThreadDispatchInvoker

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

* Updated the definition of FileTagQueryManager::GetDefaultFileTagFilePath
function to return a path

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

* Updated the AZ_CONSOLEFREEFUNC macro to actually use the _NAME

The _NAME parameter was not being used before, resulting in the Console
stringified name of the function being used.

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

* Removed CrySystem dependencies from the BundlingSystemComponent

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

* Addded missing template parameter to AssetCatalogRequests

The fixes the compile error.

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

* Adding AssetBus::MultiHandler::BusDisconnect call

The BlastSystemComponent was connecting to the Bus, but not
disconnecting from it, causing an assert to fire to it being a
multi-thread bus

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

* Added support for DataDrive lifecycle events to the ComponentApplication

The events are using the SettingsRegistry NotifyEvent to track when
certain keys are modified to signal handlers.

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

* Corrected invalid JSON creation in ModuleManager::DeactivateEntities

Resolved clang warning about used type alias

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

* Fix for dangling reference in lambda registered to the SettingsRegistry
Notifier event

This was causing the EditorPythonBinding tests to crash due to the
following circumstances.

First Python has created an instance of a SettingsRegistryProxy
Second the SettingsRegistry sends an event during the time when the
SettingsRegistryProxy exists.

This issue was exposed due to the ComponentApplication Lifecycle events
using the SettingsRegistry to dispatch during various times of the
application workflow.

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

* Added the generated cmake_dependencies.*.setreg files to engine.pak (#5073)

* Copied the generated cmake_dependencies.*.setreg file to the Cache
directory

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

* Removed the platform name from the bootstrap.game.*.setreg

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

* Fixes for release builds with DCO fix (#5164)

* This set of changes is work toward allowing release builds to work with asset bundler generated bundles and legacy, non-prefab levels. This requires some other in-flight changes before this work is complete.

    Updated engine seed list + fixed automated test
    ComponentApplicationLifecycle has the ability to automatically register events if asked to register a handler and the event doesn't exist. This is only intended for cases where you need to register a handler early in startup before the settings registry file is loaded.
    Added two new lifecycle events: One after the system entity has been activated, and one after the system interface has been created.
    If you load an archive before the system entity has been activated, archive.cpp caches information about those archives until that time, so it can finish registration. This is because the serialization system and BundlingSystemComponent both need to be available to do this registration, but the bundles have to be loaded before those are initialized so that the settings registry file can be loaded.
    Fixed an error were mounted pak files were searching for levels.pak and not level.pak, and not finding them. I'm pretty sure this logic doesn't do anything functional either way, but I've been testing legacy levels with this change and they work now.
    Moved wildcard pak loading to where engine.pak is loaded. This is because the settings registry file that defines the IO stack to spin up must be available early in application startup, and this file must be within a mounted pak file. If you're using asset bundler generated bundles, they need to be loaded at this time so that file can be loaded.
    Atom's BootstrapSystemComponent.cpp no longer initializes on AssetCatalogLoaded, and instead initializes on the ApplicationLifecycle event SystemInterfaceCreated. This is because the base assetcatalog.xml file is really just a development time concept, this file should not be used in packaged release builds, because those builds will make use of delta catalogs in each bundle loaded. The asset catalog contains the list of all assets that were in the cache at development time, and this contains content that developers don't want to ship, and they may want to specifically hide from their customers, so data miners don't find secrets about upcoming game content.

Recovering from a branch that had incorrect DCO

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed an incorrect ebus disconnect and removed an include that's no longer needed

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed a copy and paste typo from trying to recover the previous pull request

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated product IDs for the settings registry builder to no longer collide with the JSON builder. Now they are based on a hash of the configuration.
Updated the engine default seed list to include the new asset ID info for the renamed bootstrap file

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated the path to the application lifecycle events, because runtime settings aren't included in the merged bootstrap file.
Addressed some feedback on printing out a string view on an error

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed a test that uses old assets that aren't relevant. We may not need this test anymore, but if we do we've backlogged a task to create a new test to cover this behavior without using old assets.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Renamed SystemInterfaceCreated event to LegacySystemInterfaceCreated
Removed SystemEntityActivated event. Now that I have the rest of the fixes in this pull request, this new event wasn't needed, the already existing SystemComponentsActivated event does what I need.
Changed list to vector

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
nvsickle c9fb41d0e5 Fix Entity Outliner sort order with Prefabs enabled
The EditorEntitySortComponent was relying on serialization callbacks not exposed to the JSON serializer to marshal data between its serialized state and its runtime state, which led to the outliner sort order becoming disrupted every time a prefab propagation occurs (and the component is subsequently serialized and deserialized). This change:
- Forces `PrepareSave` and `PostLoad` for `EditorEntitySortComponent` to be called at update (direct descendant added or removed) and activation time respectively while prefabs are enabled. While this could be optimized, and this logic stands to be refactored once slices are fully removed, I was unable to gather any samples in which `PrepareSave` are called in a sampling profiler in a scene with 1000 top-level entities, so I don't anticipate this introducing a meaningful performance regression in the short term.
- Disables updates in `EditorEntitySortComponent` during prefab propagation, as any detected changes do not signal authored intent at this time
- Made `GetEntityChildOrder` in `EditorEntityHelpers` work with prefabs enabled, which restores the existing "Sort: A -> Z" and "Sort: Z -> A" behaviors (which have some preexisting issues this does not fix)
- Adds a Python regression test to the Editor suite to validate this behavior - the test is currently in TestSuite_Main and not TestSuite_Main_Optimized because it requires an Editor launch with prefabs enabled, this can be fixed once AutomatedTesting is further migrated away from slices

@AMZN-daimini has a larger change that improves the JSON serialization format (https://github.com/o3de/o3de/pull/1292) which we should absolutely bring in in the future to improve the legibility of the Prefab format, but this change fixes the functionality (including saving & reloading a level and keeping a consistent order) without altering the Prefab format - this lower impact radius fix is my preference for our stabilization period.

Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
jromnoa cdf5a0519f
Merge pull request #5284 from aws-lumberyard-dev/Atom/semaster/add_hdr_colorgrading_p0
Test parallel P0  HDR Color Grading Component
4 years ago
Sean Masterson 68e2770caf Adding P0 Automation for HDR Color Grading Component
Signed-off-by: Sean Masterson <semaster@amazon.com>
4 years ago
AMZN-Olex f041661474 Correcting system requirements for the startup
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
4 years ago
jromnoa f0ba0ff7eb
Merge pull request #5033 from aws-lumberyard-dev/Atom/jromnoa/assert-for-screenshot-comparisons
Fixes the test_BasicLevelSetup_SetsUpLevel() test and adds proper asserts for screenshot comparisons.
4 years ago
Allen Jackson 815c2d1986
{lyn5868} fixing the asset_processor_batch_tests.py auto tests (#5247)
Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
4 years ago
jromnoa 52bae87a93
Merge pull request #5218 from aws-lumberyard-dev/Neil_o3de_automation
Adding P0 Occlusion Culling Plane test
4 years ago
jromnoa 1085aed137 Merge branch 'development' into Atom/jromnoa/assert-for-screenshot-comparisons 4 years ago
Neil Widmaier ebfb34733d fixing new line formatting issues
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
4 years ago
Neil Widmaier 36b6aed2df fixing function name formatting issues
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
4 years ago
Neil Widmaier 3466e51206 fixing formatting issues
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
4 years ago
Adi Bar-Lev cf1d13fa43
AutomatedTesting - adding Hair to MainPipeline (#5200)
* AutomatedTesting - adding Hair to MainPipeline

Signed-off-by: Adi Bar-Lev <82479970+Adi-Amazon@users.noreply.github.com>

* Hair - securing default value of render technique to be ShortCut

Signed-off-by: Adi Bar-Lev <82479970+Adi-Amazon@users.noreply.github.com>
4 years ago
Mike Balfour 6d7be70133
Merge pull request #5202 from aws-lumberyard-dev/mbalfour/gitflow_211102_o3de
Merging stabilization/2110 to development
4 years ago
SergeyAMZN 536cba18d7
Merge pull request #4778 from aws-lumberyard-dev/LYN-6770_AutomatedTestNetInputs
LYN-6770 Automated Test Network Input
4 years ago
AMZN-stankowi 6d592d78cd
Fixes for release builds with DCO fix (#5164)
* This set of changes is work toward allowing release builds to work with asset bundler generated bundles and legacy, non-prefab levels. This requires some other in-flight changes before this work is complete.

    Updated engine seed list + fixed automated test
    ComponentApplicationLifecycle has the ability to automatically register events if asked to register a handler and the event doesn't exist. This is only intended for cases where you need to register a handler early in startup before the settings registry file is loaded.
    Added two new lifecycle events: One after the system entity has been activated, and one after the system interface has been created.
    If you load an archive before the system entity has been activated, archive.cpp caches information about those archives until that time, so it can finish registration. This is because the serialization system and BundlingSystemComponent both need to be available to do this registration, but the bundles have to be loaded before those are initialized so that the settings registry file can be loaded.
    Fixed an error were mounted pak files were searching for levels.pak and not level.pak, and not finding them. I'm pretty sure this logic doesn't do anything functional either way, but I've been testing legacy levels with this change and they work now.
    Moved wildcard pak loading to where engine.pak is loaded. This is because the settings registry file that defines the IO stack to spin up must be available early in application startup, and this file must be within a mounted pak file. If you're using asset bundler generated bundles, they need to be loaded at this time so that file can be loaded.
    Atom's BootstrapSystemComponent.cpp no longer initializes on AssetCatalogLoaded, and instead initializes on the ApplicationLifecycle event SystemInterfaceCreated. This is because the base assetcatalog.xml file is really just a development time concept, this file should not be used in packaged release builds, because those builds will make use of delta catalogs in each bundle loaded. The asset catalog contains the list of all assets that were in the cache at development time, and this contains content that developers don't want to ship, and they may want to specifically hide from their customers, so data miners don't find secrets about upcoming game content.

Recovering from a branch that had incorrect DCO

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed an incorrect ebus disconnect and removed an include that's no longer needed

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed a copy and paste typo from trying to recover the previous pull request

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated product IDs for the settings registry builder to no longer collide with the JSON builder. Now they are based on a hash of the configuration.
Updated the engine default seed list to include the new asset ID info for the renamed bootstrap file

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated the path to the application lifecycle events, because runtime settings aren't included in the merged bootstrap file.
Addressed some feedback on printing out a string view on an error

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed a test that uses old assets that aren't relevant. We may not need this test anymore, but if we do we've backlogged a task to create a new test to cover this behavior without using old assets.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Renamed SystemInterfaceCreated event to LegacySystemInterfaceCreated
Removed SystemEntityActivated event. Now that I have the rest of the fixes in this pull request, this new event wasn't needed, the already existing SystemComponentsActivated event does what I need.
Changed list to vector

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
4 years ago
Scott Romero 797b8248e5
[development] Consolidated programmatic profiler capture API (#4969)
Merged overlapping profiler EBuses/Interfaces into AzCore
Fixed ambiguous LogLevel type in some unity file scenarios
Added cvar/console access for profiler capture
Added utilities for reflecting AZ::Interfaces through the BehaviorContext
Included profiler system sample python script

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
Mike Balfour cb9603ddcd Merge commit '0ccd55f9459f50a9d0906e8d875943a7bc8e74c2' into mbalfour/gitflow_211102_o3de 4 years ago
moraaar 0ccd55f945
Added PAL to blast and whitebox tests to only enable automated tests on supported platforms: windows only at the moment. (#5165)
Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
jromnoa 5b0f345052 PR fixes to clean up syntax and variable names also to remove a change from another PR
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa a8efd5da95 add the correct paths for Light component test and use the 'Base' level instead of 'auto_test' level to resolve remaining issues with screenshot angles
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
4 years ago
jromnoa 2329e4302f Merge branch 'development' into Atom/jromnoa/assert-for-screenshot-comparisons 4 years ago
Gene Walters 2a3667f7b0 Merge branch 'upstream/development' into LYN-6770_AutomatedTestNetInputs 4 years ago
Neil Widmaier 4a57b13a0e Adding P0 Occlusion Culling Plane test
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
4 years ago
chiyenteng 6862b52069
Convert several physics automated tests with Base test level file converted to prefab file (#5138)
* Convert some physics automated tests to use prefab system

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

* revert changes

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

* Fix file names

Signed-off-by: chiyteng <chiyteng@amazon.com>
4 years ago
Gene Walters fa32940205 Adding logs to dedicated-server start up (unable to use for automated testing just yet since remote console cant be connected that early). Adding pytest check to make sure AutomatedTesting.ServerLauncher is running. Moved sveditor_port to MultiplayerEditorConnection since it was never actually getting used when it was in EditorSystemComponent (dedicated servers dont know about editor)
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
AMZN-ScottR 2d7c6af97c Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Sean Sweeney ea4bc31b38
Merge pull request #4675 from aws-lumberyard-dev/editor_test_tools_cleanup
Editor test tools cleanup
4 years ago
AMZN-AlexOteiza e871dff70e
Added two complex prefab tests (#5089)
* Added two complex prefab tests

* Fix compile error

* Added extra methods, fixed test failure

* Addressed PR commments

* More PR comments

* Fix space

* Fix ar error
4 years ago
Gene Walters 2f38873e03 Adding logs for successful steps occurring in the editor-server process. AutomatedTesting will expect these logs and can be helpful to narrow down any test fails
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
jromnoa 7b5a5b8f74
Merge pull request #5106 from aws-lumberyard-dev/Atom/scottm/cleanup_import
Test parallel PostFX Layer remove and unused import
4 years ago
AMZN-ScottR 9bc0422f0b [profiler_capture_api] added trailing newlines to a couple new files
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Allen Jackson 29f5fb1271
{lyn7352} adding more logging around mock_asset_builder.py (#5103)
o3de\AutomatedTesting\Gem\PythonTests\PythonAssetBuilder\mock_asset_builder.py
- adding more logging
- updated keys for platforms (pc, server)

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
AMZN-ScottR e67db19a63 [profiler_capture_api] add sample python script to test Profiler System interface bindings
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Scott Murray 7536073df0 remove and unused import
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
Gene Walters 6d673643be Re-merging latest dev after rebasing to fix DCO. Re-resolving conflicts
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 131c415404 small fix: adding newline back to end of a merged file
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Allen Jackson 63308c942a {lyn7677} updated test modules to pass AssetPipelineTests on Linux (#5017)
* {lyn7677} updated test modules to pass AssetPipelineTests on Linux

Fixes for Python AssetPipelineTests modules fail on Linux

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

* Separating the Linux and Mac concerns

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
sweeneys 0b9c792fda Fix AzTestRunner with correct lib
Signed-off-by: sweeneys <sweeneys@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
sweeneys b9486036c3 Fix AzTestRunner smoke test on Linux
Signed-off-by: sweeneys <sweeneys@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Scott Murray 12784c4ada test cleanup and adding AtomComponentProperties
Signed-off-by: Scott Murray <scottmur@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
SJ 104170879e Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters (#4504)
* Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters.

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

* Revert previous change. Remove the exclude filter for the Install directory.

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

* Pass in relative path to the exclude filter as before. Fix the AssetScanner tests.

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

* Prepend a ./ to the relative path in order to match the exclude patterns

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

* Remove hack to prepend ./. Update the exclude patterns so that the hack is no longer required.

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

* Add missing ? and remove whitespace

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

* 1. IsFileExcluded() now converts the input path to a path that's relative to its corresponding scan folder.
2. Update regex patterns in gems and AutomatedTesting as well.
3. Remove unnecessary escaping for '/'.

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

* Use ConvertToRelativePath() function to compute path relative to a scan folder.

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

* More fixes to regex patterns

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

* Remove test case which tests a hypothetical scenario that cannot occur. Fix another test case by adding scan folder.

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

* Remove assert that's not needed since it's a valid scenario

Signed-off-by: amzn-sj <srikkant@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
amzn-mike 769e2e3942 Add serialized output version (xml) of debug scene graph (#3437)
* Add serialized output version (xml) of debug scene graph

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

* Fix line endings

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

* Fix line endings

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

* Update fbx unit tests to check for dbgsg.xml file

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

* Add dbgsg.xml comparison

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

* Move dbgsg files to SceneDebug sub folder

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

* Add shaderball.dbgsg.xml and multiple_mesh_multiple_material_override.dbgsg.xml

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

* Add shaderball dbgsg.xml product.

Update code to look in SceneDebug for dbgsg files
Fix extension concatenation

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

* Remove unnecessary dbgsg.xml file

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
LesaelR b4f42b599a Adding Shaderball test and asset files. (#4743)
Signed-off-by: Rosario Cox <lesaelr@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
santorac 6da17abba4 Made material property auto-rename procedure apply to Material Component at runtime. This ensures that an material property overrides and any gameplay scripts that work with property overrides can get the benefit of the material type version update procedure.
I added an ApplyPropertyRenames function to MaterialTypeAsset very similar to the one in MaterialTypeSourceData.
Updated the MaterialAssignment class to apply any property renames when it discovers the old name doesn't work. This will be written to disk when the level or prefab is saved.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 48c438f469 Reverting the debugging code I was using to narrow down the problem on Jenkins now that the issue was fixed by PR-4946
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters c9a02e3c8a Revert "Lowering timeout so pytest doesnt abort, but still get mode time to read the server logs"
This reverts commit 8380c5ff24.

Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
jromnoa 568d9a3f36
Merge pull request #5069 from aws-lumberyard-dev/Neil_o3de_local
Adding the Hydra P0 Grid component test, and including it in the Test…
4 years ago
Neil Widmaier 308fcd8bf2 Adding the Hydra P0 Grid component test, and including it in the Test_Suite_Main_Optomized.
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
4 years ago
Allen Jackson af7bb2332f
{lyn7677} updated test modules to pass AssetPipelineTests on Linux (#5017)
* {lyn7677} updated test modules to pass AssetPipelineTests on Linux

Fixes for Python AssetPipelineTests modules fail on Linux

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

* Separating the Linux and Mac concerns

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
jromnoa 6d62dbba76 fixes the basic level GPU test screenshot comparison failure
Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
Sean Sweeney 56a1d4ff44
Merge pull request #4988 from aws-lumberyard-dev/aztestrunner_smoke
Fix AzTestRunner smoke test on Linux
4 years ago
jromnoa 8f66b0765e
Merge pull request #4933 from aws-lumberyard-dev/Atom/scottmur/test_cleanup
Atom parallel test cleanup and adding AtomComponentProperties
4 years ago
evanchia 7c25cb6d5a addressing minor details in feedback
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
SJ 3bdfe51fca
Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters (#4504)
* Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters.

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

* Revert previous change. Remove the exclude filter for the Install directory.

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

* Pass in relative path to the exclude filter as before. Fix the AssetScanner tests.

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

* Prepend a ./ to the relative path in order to match the exclude patterns

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

* Remove hack to prepend ./. Update the exclude patterns so that the hack is no longer required.

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

* Add missing ? and remove whitespace

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

* 1. IsFileExcluded() now converts the input path to a path that's relative to its corresponding scan folder.
2. Update regex patterns in gems and AutomatedTesting as well.
3. Remove unnecessary escaping for '/'.

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

* Use ConvertToRelativePath() function to compute path relative to a scan folder.

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

* More fixes to regex patterns

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

* Remove test case which tests a hypothetical scenario that cannot occur. Fix another test case by adding scan folder.

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

* Remove assert that's not needed since it's a valid scenario

Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
amzn-mike ee6ceba5ce
Add serialized output version (xml) of debug scene graph (#3437)
* Add serialized output version (xml) of debug scene graph

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

* Fix line endings

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

* Fix line endings

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

* Update fbx unit tests to check for dbgsg.xml file

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

* Add dbgsg.xml comparison

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

* Move dbgsg files to SceneDebug sub folder

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

* Add shaderball.dbgsg.xml and multiple_mesh_multiple_material_override.dbgsg.xml

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

* Add shaderball dbgsg.xml product.

Update code to look in SceneDebug for dbgsg files
Fix extension concatenation

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

* Remove unnecessary dbgsg.xml file

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
sweeneys dd49798596 Fix AzTestRunner with correct lib
Signed-off-by: sweeneys <sweeneys@amazon.com>
4 years ago
sweeneys fa6b1d1d65 Fix AzTestRunner smoke test on Linux
Signed-off-by: sweeneys <sweeneys@amazon.com>
4 years ago
LesaelR 079e684b77
Adding Shaderball test and asset files. (#4743)
Signed-off-by: Rosario Cox <lesaelr@amazon.com>
4 years ago
Gene Walters 2f651c05c8 Python passes lower-case net-player-prefab path.
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 8380c5ff24 Lowering timeout so pytest doesnt abort, but still get mode time to read the server logs
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 3d7346ac32 increasing multiplayer is-in-game timeout, going to try this on Jenkin. Maybe AssetProcessor isn't finished and thats why its failing?
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 6ef6164ad8 merging latest dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
santorac cef1e200f6 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialPropertyRenameInMaterialComponent 4 years ago
Scott Murray e28bf7179f test cleanup and adding AtomComponentProperties
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
jromnoa 267d690171
Merge pull request #4770 from aws-lumberyard-dev/Atom/scottmur/Atom-16561
AtomComponentProperties class for atom_constants to store property paths and other constant values
4 years ago
santorac 0972c4f1a3 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialPropertyRenameInMaterialComponent 4 years ago
allisaurus 136788bccf
Update env var setting instructions in AWS Gem test README (#4791)
Signed-off-by: Stanko <stankoa@amazon.com>
4 years ago
santorac c6b209ace0 Made material property auto-rename procedure apply to Material Component at runtime. This ensures that an material property overrides and any gameplay scripts that work with property overrides can get the benefit of the material type version update procedure.
I added an ApplyPropertyRenames function to MaterialTypeAsset very similar to the one in MaterialTypeSourceData.
Updated the MaterialAssignment class to apply any property renames when it discovers the old name doesn't work. This will be written to disk when the level or prefab is saved.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
evanchia 670e9a1fa1 merge with development
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
jromnoa 6c1b2fa84c
Merge pull request #4883 from aws-lumberyard-dev/Atom/jromnoa/fix-atom-testsuite-main-gpu-AR-logs
Fix log lines in main GPU tests for Atom
4 years ago
AMZN-AlexOteiza ea442b80d1
Renamed ctest_pytest.ini to pytest.ini so it is used by default, added TestSuite_ as collection file (#4822)
* Fixed warnings of unused marks, renamed ctest_pytest.ini to pytest.ini to better consistency on runs

* Fixed some test suites to run propertly

* Fix missing arguments

* Fixed missing cmakelists and renamed missing file

* Temp disable editor_testing_tests as timeout in jenkins
4 years ago
jromnoa 94f54e8586 re-add the 'Captured data successfully.' log line to test_AtomFeatureIntegrationBenchmark() test, removed on accident
Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
jromnoa 3fc32675fd removes general.log() checks for pass/fail status as these do not appear in AR and only appear locally
Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
chiyenteng 7316802941
Add Detach and Duplicate Prefab basic workflow auto test (#4506)
- Add a new automated test PrefabBasicWorkflow_CreateReparentAndDetachPrefab for verifying prefab detachment basic workflow.
- Add a new automated test PrefabBasicWorkflow_CreateAndDuplicatePrefab for verifying prefab detachment basic workflow.
- Fix a bug related to sets of entity ids in Reparent helper function .
4 years ago
evanchia 11c31cb5ca removed platform specific tests and consolodated
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
jckand-amzn 3a6cc2498b
Skipping GraphUpdate test due to LC node issue in Debug configuration (#4847)
* Skipping GraphUpdate test due to LC node issue in Debug configuration

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

* Reverting test type for GraphUpdates test to EditorSharedTest

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

* Updating xfail reason for GraphUpdates test with GitHub issue link

Signed-off-by: jckand-amzn <jckand@amazon.com>
4 years ago
Gene Walters 55c96e9eb1 Revert after testing! Printing the entire server log in order to see gather information on Jenkins machine
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Scott Murray 0c7e732527 removing return type Union which is not supported
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
Scott Murray 2c0e78cb0d more development freshening
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
Sean Sweeney 26f23cc3a5
Merge pull request #4836 from aws-lumberyard-dev/flakytest
Moved atom flaky tests to sandbox
4 years ago
AMZN-AlexOteiza af27906598 Moved atom flaky tests to sandbox 4 years ago
Gene Walters 322e339543 Printing error if the editor server launcher has not been built. Updating pytest to fail if the serverlauncher does not exist.
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Scott Murray eb41ec5978 bringing in latest development
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
LesaelR 67532ed18f
Updating FBX_Tests and test asset files (#4477)
* Updating FBX_Tests and test asset files

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

* Updating fbx_tests to removed marker from helper function.

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

* Update to add Motion Test to FBX Tests.

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

* Update fbx_tests.py

Removing unnecessary sandbox mark.

Signed-off-by: LesaelR <LesaelR@amazon.com>
4 years ago
AMZN-AlexOteiza 7ccde16b0d
Rename prefab -> Prefab (#4825)
* Rename part 1

* Rename part 2

* Rename part 3
4 years ago
AMZN-AlexOteiza 181d12625f
Reorganized Prefab tests and standarization (#4786)
* Reorganized Prefab tests and standarization

* Restore changed file by accident
4 years ago
AMZN-AlexOteiza 38f9dcb8ca
Added option to reopen if the current level is the same. This contributes to stability for batched tests (#4043)
* Added option to reopen if the current level is the same. This contributes to stability for batched tests

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Addressed PR comments

* Addressed PR and cleaned Base level that had an entity by accident

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Cleaned up params

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Addressed PR comments
4 years ago
Gene Walters 41e85b5899 Merging latest dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters dd6c9b9403 Misc code comment changes based on PR feedback
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
evanchia 64a20c45b5 adding editor integ tests to AR
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
Scott Murray 5bc334be70 updating docstrings for formatting and typos
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
AMZN-ScottR 1b1ef46d9d Merge branch 'development' into atom_cpu_profiler_gem_promotion
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
jonawals 0031016548
Merge pull request #4785 from aws-lumberyard-dev/pytest_editor_testcase_name_fix
Fix for PyTest editor test case names.
4 years ago
amzn-sean 82b731b673
Increase the timeout for ForceRegion_LinearDampingForceOnRigidBodies. (#4784)
The Test runs with a wait_for_condition, and the original timeout was right on the edge of how long the test takes to reach that condition.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
John ae6005545e Fix for PyTest editor test case names.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
Gene Walters c8237d69c7 Misc cleanup. Fixing typos and remove unused test level
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 580153b16e Adding EditorPython methods to Multiplayer gem for launching the editor gamemode with a server. Adding a test for networkinput with scriptcanvas to ensure the autonomous client can create input and that the server can receive and process the input via script canvas.
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Scott Murray 9f7c80ce23 removing an extra blank line and fixing a docstring
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
Scott Murray 5b70b2a8a9 reordering constant and class in file
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
Scott Murray 268b9da857 atom constant component property class
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
evanchia bc479a362f removing remote console smoke test
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
Allen Jackson fbedd8126d
{lyn7251} Add material component example in Python (#4724)
* {lyn7251} Add material component example in Python

adds a AZ::Render::EditorMaterialComponent as an example of how to
override the default material from the scene building pipeline

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

* Only set the cube to a gray material
Skip loading the asset, instead just set the outPrefabAssetPath for the Prefab system to load

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

* stablizing the sub-id of procedural prefab groups

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
moraaar 7a450d02cb
Deleted PhysXSamples gem (#4753)
Removing PhysXSamples gem since its assets are outdated generating issues:

- Uses old material file format .mtl
- All FBXs info assets (.fbx.assetinfo) were generated before Assimp and the mesh unification work.
- All script canvas were created before new Physics API, which reflected events differently as AZ::Events.
- It heavily depends on slices (legacy system)

sig/core approved this removal at 15-OCT/2021 meeting: https://github.com/o3de/sig-core/blob/main/meetings/notes/SIG-Core-Notes%20-%202021-OCT-15.md

Signed-off-by: moraaar moraaar@amazon.com
4 years ago
AMZN-ScottR 15cbea28c2 [atom_cpu_profiler_gem_promotion] registered new Profiler gem with engine and the AutomatedTesting project
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Gene Walters d097a4e951 Merge branch 'upstream/development' into LYN-6770_AutomatedTestNetInputs 4 years ago
smurly d1d4bf812e
P0 PostFX Gradient Weight Modifier component parallel test automation (#4709)
* PostFX Gradient Weight Modifiere component P0 parallel test

Signed-off-by: Scott Murray <scottmur@amazon.com>

* fixing some comment step numbering

Signed-off-by: Scott Murray <scottmur@amazon.com>

* fixing PostFX casing and method camel casing of the test function

Signed-off-by: Scott Murray <scottmur@amazon.com>

* changing the casing of the file name

Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
amzn-mike 969a55170e
Procedural Prefabs: Entity parenting fixes (#4669)
* Parent top level entities to container entity when creating prefab

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

* Add to_json method to PythonProxyObject to allow serializing any AZ serialializable type

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

* Update scene_mesh_to_prefab.py to parent entities in a chain

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

* Remove redundant eval

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

* Improve error handling in ToJson

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

* Add maybe_unused for commonRoot since it's not used

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Gene Walters f4c21147af Merge branch 'upstream/development' into LYN-6770_AutomatedTestNetInputs 4 years ago
Tommy Walton 2dd00e2983
Move wrinkle mask data out of default object srg (#4578)
* Refactored depth, shadow, and motion vector shaders to support custom object srgs. Added a new skin object srg and moved wrinklemask data out of the default object srg. Added a new minimal morph target asset for testing wrinkle masks to AutomatedTesting.

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Fix copyright header

Signed-off-by: Tommy Walton <waltont@amazon.com>
4 years ago
Guthrie Adams f30965eed9
Merge pull request #4641 from aws-lumberyard-dev/Atom/scottmur/Atom-16573
PostFX Shape Weight Modifier component P0 parallel tests
4 years ago
jromnoa 922a991443
change expected_lines to something that appears in both AR + locally (#4680)
Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
Scott Murray 408e27e0f1 wait_for_condition added and merged development
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
Scott Murray 718fc97bb6 changes from review feedback
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
jromnoa 150060441e
Re-add pytest.mark.test_case_id markers (#4621)
* add some test case id markers

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

* re-added pytest.mark.test_case_id markers for test cases

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

* re-add directional light log lines that were missing and re-add directional light test case id

Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
amzn-sean 5bf7330f35
made some physX tests less flaky (#4632)
Joints_BallLeadFollowerCollide - changed the idle_wait to a wait_for_condition of the lead and follower colliding with a 10 second timeout. It was a 2 second timeout which is on the edge of the time from start to collision (~1.5sec).

Joints_HingeNoLimitsConstrained - now measures the angle the joint is at and waits for the follower to raise up and over the lead, or fail after a 10sec timeout. This use to 'catch' the follower joint in a force region and check the position of the follower to determine pass/fail.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
Artur K 80db67e90a
Remove many unused variables and unused setting files (#4607)
* Remove many unused variables and unused setting files

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

* Remove a few more dead config vars

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

* fix android test_ConfigureSettings_DefaultValues_SetsValues

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
Sean Sweeney 960e3fc1b9
Merge pull request #4427 from aws-lumberyard-dev/sample_editor_for_qa_automation
Sample Editor test for QA Automation project
4 years ago
Scott Murray c35b0e5efa fix a test string to indicate PostFX Layer
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
Scott Murray 4c5906a8d4 PostFX Shape Weight Modifier component P0 parallel test
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
smurly 7fcaeb16c4
PostFX Layer component P0 parallel test (#4619)
* PostFX Layer component P0 parallel test

Signed-off-by: Scott Murray <scottmur@amazon.com>

* removing an unused import

Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
Terry Michaels ff14c2d991
Merge pull request #4471 from aws-lumberyard-dev/jckand/LCXfailUpdate
Removing xfail from optimized Landscape Canvas suite and disabling non-optimized suites
4 years ago
Qing Tao 01448c5c49
ATOM-16658 Remove PBSreferenceMaterials gem which is a gem for legacy cry3dengine (#4616)
Signed-off-by: Qing Tao <qingtao@amazon.com>
4 years ago
jckand-amzn 52ced4a4ee Merge branch 'development' of https://github.com/o3de/o3de into jckand/LCXfailUpdate 4 years ago
smurly 9dee92a708
Mateiral component P0 tests editor script (#4585)
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
Qing Tao 89e6df1c7f
ATOM-16575 clean up image builder presets files (#4611)
ATOM-16575 clean up image builder presets files
Removed unused image builder presets
Deprecating preset UUID and use preset name as unique id
Delete all .exportsettings file which were only used for legacy imageProcessing gem.

Signed-off-by: Qing Tao <qingtao@amazon.com>
4 years ago
jromnoa d3c2e288e9
sandbox the Reflection Probe portion of the test, remove xfail marker - Reflection Probe will be re-added in the parallel test approach (#4584)
Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
amzn-sean f84bd9829a
remove some flackyness in physx automated tests (#4547)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
jromnoa d3f6898ad6
Fixes test_MaterialEditorLaunch_AllRHIOptionsSucceed() test by searching for RHI log lines (#4511)
* double test timeout from 60 seconds to 120 seconds in attempt to fix it for nightly GPU runs

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

* add a file to launch with the test to ensure we get a full viewport load completed

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

* fix import error

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

* remove python error checks

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

* add new log line specific to each RHI to check for

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

* remove the new test script as it is no longer needed with our improved log lines check - the viewport logs don't show up in AR for some reason

Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
Gene Walters 82ae9e9a41 merging latest dev with small conflict resolution taking theirs
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
smurly cef4126100
Mesh component parallel test automation P0 (#4562)
* Mesh component P0 automation for parallel testing

Signed-off-by: Scott Murray <scottmur@amazon.com>

* Remove unused imports

Signed-off-by: Scott Murray <scottmur@amazon.com>

* Decorating test classes with test_case_id to corresponding testrail cases

Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
jromnoa de41653d26
remove LY_PROJECTS check in Atom test registrations so that the targets build in project centric builds (#4581)
Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
hultonha 2fb4a9d2c3
Add xfail to test that failed in an unrelated development build (#4569)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
smurly cdca77acd1
Reflection Probe component test for parallel execution (#4532)
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
Gene Walters d2da35aec3 merging latest dev + resolving 1 conflict
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
kritin f009e06cab responding to code reviews
Signed-off-by: kritin <kritin@amazon.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
moraaar 606ba45cf2
Fixed PhysX and Blast creation of default config files (#4497)
- Avoid saving blast global configuration unnecessarily every time the editor is opened.
- Fixed how to obtain the default physics material library. The relative path needs to be from the project folder, not the asset folder inside the project. It was also missing saving the physx configuration after a the default library is assigned to it.
- Fixed asset id for physics material asset 'assets/physics/surfacetypemateriallibrary.physmaterial'

Signed-off-by: moraaar moraaar@amazon.com
4 years ago
jromnoa 02b6b1dbf4
First in set of PRs for adding parallel GPU test runs to Atom tests. (#4276)
* add remaining hydra code for test to run using new parallel test classes and interfaces
* fix return value of Secondary Grid Spacing property test for Grid Entity
* Add `or error_tracer.has_asserts` call for better error catching
* make `Tests.viewport_set` test check a `Report.critical_result()` check instead of `Report.result()` check
* add updates from PR feedback: makes constants for re-used component name strings, move test verifications into the Report() call instead of setting first then calling Report(), use builtin math.isclose function over custom function
* remove after_level_load() and split it into several function calls, add screenshot check, cleanup the GPU script and fix the rendering not displaying by setting global_extra_cmdline_args = []
* fixes the viewport Test check and splits up the helper functions into multiple functions
* add comment for global_extra_cmdline_args update in test and rename the zip file to f'screenshots_{formatted_timestamp}.zip'

Signed-off-by: jromnoa <jromnoa@amazon.com>
Co-authored-by: smurly <scottmur@amazon.com>
4 years ago
kritin f1fe2912e4 responded to code reviews
Signed-off-by: kritin <kritin@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
Adi Bar-Lev bf7ae12402
Hair - Adding the Hair Gem to the automated testing (#4498)
* Hair - Adding the Hair Gem to the automated testing

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - added FP protection when not initialized

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - renaming shader options for longtitude / azimuth contribution separation

Signed-off-by: Adi-Amazon <barlev@amazon.com>
4 years ago
jckand-amzn 36eac35bc3
Removing xfail from optimized Gradient Signal tests and disabling non-optimized suite (#4475)
Signed-off-by: jckand-amzn <jckand@amazon.com>
4 years ago
kritin b7e3a63fae responded to code reviews
Signed-off-by: kritin <kritin@amazon.com>
4 years ago
Luis Sempé 11d047136e
Merge pull request #4428 from aws-lumberyard-dev/scripting/xfail_test
Marked test_VariableManager_UnpinVariableType_Works as xfail, the tes…
4 years ago
jckand-amzn e306321b61 Removing xfail from optimized Landscape Canvas suite and disabling non-optimized suites
Signed-off-by: jckand-amzn <jckand@amazon.com>
4 years ago
Guthrie Adams 3cff21e2c2
Merge pull request #4430 from aws-lumberyard-dev/Atom/jromnoa/fix-for-vulkan-rhi-test-failure
Fix Vulkan RHI test failure by increasing timeout
4 years ago
chiyenteng 23322edde7
Fix Entity id consistency issue & refactor prefab workflows/tests (#4373)
* Fix Entity id consistency issue & refactor prefab workflows/test framework

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

* Update comments

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

* Modify CreatePrefab and remove extra spaces

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

* Address comments

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

* Refactor prefab instance constructors

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

* Remove commented out code

Signed-off-by: chiyteng <chiyteng@amazon.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
jromnoa 46ad2f684b fixes the configurtion typo to be configuration instead and increases the test timeout to 60 sec from 30 sec
Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
lsemp3d fbf09f27c7 Marked test_VariableManager_UnpinVariableType_Works as xfail, the test needs to be reworked
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
kritin 779edb7fe5 Sample Editor test for QA Automation project
Signed-off-by: kritin <kritin@amazon.com>
4 years ago
Gene Walters f22dda1efd Enabled Multiplayer gem for AutomatedTesting project. Adding a simple network component and level for testing. (wip)
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
LesaelR caf161ec63
Signed-off-by: LesaelR <LesaelR@amazon.com> (#4278)
* Signed-off-by: LesaelR <LesaelR@amazon.com>

* Removing the un-needed sandbox marks.

Signed-off-by: LesaelR <LesaelR@amazon.com>
4 years ago
mrieggeramzn 50fabb1bf7
Atom/mriegger/fixupname (#4187)
* Removing atom from the Decal (atom) name
* Decal component can take advantage of non-uniform scale option
* Using the base class nonuniform scale property rather than firing an event
* removing pragma optimize off
* Python tests need the updated name

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
4 years ago
jromnoa fa163f49b9
Re-structure Atom test folders in AutomatedTesting. (#4206)
* move shader asset builder test into test_Atom_MainSuite_Optimized.py, update CMakeLists.txt, and move all imports inside the test class for hydra_ShaderAssetBuilder_RecompilesShaderAsChainOfDependenciesChanges.py

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

* re-organize the Atom automated test structure to match the new parallel + batched test structures

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

* fix CMakeLists.txt registrations for test files

Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
jromnoa 3685f1bff2
move shader asset builder test into test_Atom_MainSuite_Optimized.py, update CMakeLists.txt, and move all imports inside the test class for hydra_ShaderAssetBuilder_RecompilesShaderAsChainOfDependenciesChanges.py (#4205)
Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
jckand-amzn e4479fff4a
Dynamic Vegetation automated test conversion/optimization (#4175)
* Initial batch of optimized Dynamic Vegetation tests

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

* Adding another round of optimized Dynamic Vegetation tests

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

* Adding more optimized Dynamic Vegetation tests

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

* Adding another round of optimized Dynamic Vegetation tests

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

* Final batch of converted Dynamic Vegetation tests

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

* Re-organizing/cleaning up TestSuite files

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

* Running optimized tests without xfail marker for Jenkins test

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

* Corrected path on CMakeLists.txt to point to the correct TestSuite file for optimized tests

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

* Adding xfail mark to DistanceBetweenFilter tests due to Editor deadlock

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

* Updating CMakeLists to build Launcher

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

* Updating xfail for DistanceBetweenFilter tests to skips as they timeout and cause cascading test failures

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

* Re-added xfail marker to optimized tests

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

* Correcting a few typos

Signed-off-by: jckand-amzn <jckand@amazon.com>
4 years ago
jckand-amzn a4424ea820
Adding xfail mark to LayerBlender test due to Launcher crash on quit (#4173)
Signed-off-by: jckand-amzn <jckand@amazon.com>
4 years ago
Junbo Liang ac5cc04b59
[AWSI Automation] Export more AWS resource names via CloudFormation stack outputs for the automation tests (#4161)
* Read resources name via CloudFormation stack outputs and trim resource names when they are too long

Signed-off-by: Junbo Liang <junbo@amazon.com>
4 years ago
jromnoa 47a8dbc1d0
Adds Atom component tests into the new parallel + batched test approach (#4039)
* create PoC for starting point for parallel + batched Atom tests

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

* CMakeLists.txt update

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

* saving progress on re-factor for parallel and batched tests, added Tracer(), added Report(), and added new exit code validation method but code is unfinished still

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

* finalize conversion of component tests into new optimized test setup for batched/parallel runs

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

* fix REDO deletion check, remove class referencing a test not yet added to parallel runs

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

* revert hydra_AtomEditorComponents_AddedToEntity.py back to its original version

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

* re-add the DepthOfField component to expected_lines for non-optimized main suite (removed on accident)

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

* remove test comments from legal header, add EditorEntity() class, remove hydra calls - updated for Decal component, but the next commit will get the rest

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

* saving progress on converting over fully to using EditorEntity() per PR comments - almost done, will finish tomorrow

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

* add new test setup docstring, fix the create entity test step wording, re-add accidental removal of string text from editor_entity_utils.py

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

* finalize PR concerns, use EditorEntity object for most/all calls, tests pass when run

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

* remove accidental change

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

* update helper.open_level() call to not include 'Physics' in path, remove unnecessary f-string calls

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

* editor_python_test_tools.asset_utils.Asset.find_asset_by_path(), add is_hidden() and is_visible() to editor_python_test_tools to use for verification, clean up UNDO/REDO comments, fix test order in file to match the order of the test files

Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
jckand-amzn b95e170f9e
Marking DistanceBetweenFilter tests with xfail due to Editor deadlock (#4156)
* Marking DistanceBetweenFilter tests with xfail due to Editor deadlock

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

* Updating xfail mark

Signed-off-by: jckand-amzn <jckand@amazon.com>
4 years ago
Junbo Liang c50f3b2638
Fix the destruction failure and update the instructions for running automation tests (#4124)
Signed-off-by: Junbo Liang <junbo@amazon.com>
4 years ago
smurly a5306f10f3
Reflection Probe component added to AtomEditorComponents test (#4135)
Signed-off-by: Scott Murray <scottmur@amazon.com>
4 years ago
galibzon 169b8f3679
[ATOM-5441] Shader Builders May Fail When Multiple New Files Are Added (#3862)
* [ATOM-5441] Shader Builders May Fail When Multiple
New Files Are Added

ShaderAssetBuilder::CreateJobs now recursively parses *.azsl files
looking for #include lines and builds the list of source dependencies
using a depth-first algorithm. It was using MCPP before but not anymore
(during CreateJobs).

The new algorithm may over prescribe, but fixes the issues
when multiple new shader related files are added, at once or out of order, to a game project
or Gem.

Overall the new ShaderAssetBuilder::CreateJobs() is around 40% faster
and, of course, handles source dependencies in a robust way.

* Added new test suite to AutomatedTesting project:
Gem/PythonTests/atom_renderer/test_Atom_ShaderBuildPipelineSuite.py

Bug fix to Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.cpp
discovered thanks to the automated test suite. The idea is that
CreateJobs doesn't fail if the AZSL file doesn't exist. The failure is
deferred during ProcessJob. This way if the AZSL file exists the .shader
file is rebuilt automatically.

* For testability purposes and avoid memory leakage errors
during Unit Tests created the class ShaderBuilderUtility::IncludedFilesParser

Now accepts "#  include <file>" with space between '#' and 'include'.
Also now accepts the '-' character inside the file path.

Added Unit Test to validate all cases of "#include <file>" parsing.

* Fixed linux runtime issues for Unit Tests in Atom_Asset_Shader.Tests

Signed-off-by: garrieta <garrieta@amazon.com>
4 years ago
mrieggeramzn 603e33d7f7
Removing the boundary search method. (#4024)
* Removing the boundary search method. Bicubic is now the default and only PCF filtering method

* Removing padding (based upon feedback)

* Removing PCF method from py auto testing

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
4 years ago
moraaar 6628f5bad1
Marking script canvas failing tests as xfail until they can be reworked to make them pass. (#4077)
Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
AMZN-AlexOteiza fd627af003
Merge pull request #4048 from aws-lumberyard-dev/automation_improv4
Renamed folder physics -> Physics
4 years ago
Junbo Liang 3535d6b6b3
[AWS Automation] Stack tear down mechanism for the deployment on Jenkins (#3656)
Make awsi_test_profile_vs2019 a nonblocking step to make sure that resources are cleaned up even though automation tests failed

Signed-off-by: Junbo Liang <junbo@amazon.com>
4 years ago
Qing Tao d9cbc97ec0
ATOM-16063 Remove SetShaderResourceGroupCallback in scene and update scene srg handling (#3969)
ATOM-16273 Compiling SceneSRG before updating it can cause a gpu crash

Changes include:
1. Removed Scene::SetShaderResourceGroupCallback() function and clean up code which use this function.
2. Moved SceneTimeSrg.azsli to RPI's DefaultSceneSrg folder and setup the constants in RPI::Scene
3. Add AZ::Event for Scene's update srg event which features and update scene srg at proper place
4. UpdateTransformServcie FP to use PrepareSceneSrg event handler.
5. Clean up shaders and srgs used in project templates.

Signed-off-by: Qing Tao <qingtao@amazon.com>
4 years ago
AMZN-AlexOteiza 78d0b46f08 Updated path in CMakeLists.txt
Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>
4 years ago
AMZN-AlexOteiza 5441ab4bac Rename to final folder name 4 years ago
AMZN-AlexOteiza ddd662f6b9 rename to tmp name 4 years ago