Commit Graph

4039 Commits (1431afb51a08535a0ceabc22f11a55c0e5f5bb93)

Author SHA1 Message Date
hershey5045 9c57c9e64f
Fix track view bug where postfxs do not render correctly. (#5465)
* Fix track view bug where postfxs do not render correctly.

Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com>

* Reduce scope and add comments.

Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com>
4 years ago
nggieber d9443ec42c Addressed some PR feedback and continue filtering with same search string even after refresh
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
Danilo Aimini 27f0aa7f13
LYN-7468 | Viewport manipulators for the container of the focused prefab should be hidden (#5432)
* Extend the level entity behavior to open prefab containers in focus mode. Disable manipulators for these entities too.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor adjustments

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix enum casing in Entity Inspector.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Split views between for Level and FocusedContainer entities.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Slightly different fix to support components on focused containers.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor fixesto RefreshSelectedEntityIds.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 609469d5e4 Fix a couple build issues
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
nggieber 2913d72d17 Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 4 years ago
AMZN-Phil 0bc3e6a18f Let cart overlay be opened to view downloads even when there are no gems to be added or removed
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
nggieber f470351d0c Hook up Gem Updating and Uninstallation and fix lots of minor bugs between gem catalog and gem repos
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
Nicholas Van Sickle e9a57380bb Generic DOM: Add DomBackend abstraction and JSON support
This change adds a `DomBackend` interface and a `DomBackendRegistry` for backend discovery (currently not hooked up to anything) alongside a JSON backend implementation.

The JSON backend comes with a small suite of unit and performance tests. The unit tests validate generic DOM conversion to and from serialized JSON and rapidjson::Document objects (the support for which lives in `JsonSerializationUtils.h`).

The performance tests show a throughput decrease compared to directly using the rapidjson serializer when mirroring our current pattern of copying strings from the serialized JSON representation, but with the coming in-memory store we have the opportunity to keep the buffer in memory and deserialize in-situ using rapidjson's API, which is consistently at least 100MiB/s faster on my machine (Ryzen Threadripper 3970X). The first parameter is the nested object complexity (N*N, objects with N keys comprised of arrays with N values) and the second parameter is the base size of the strings within each entry of this object.
```
----------------------------------------------------------------------------------------------------------------------
Benchmark                                                            Time             CPU   Iterations UserCounters...
----------------------------------------------------------------------------------------------------------------------
DomJsonBenchmark/DomDeserializeToDocumentInPlace/10/5            0.050 ms        0.050 ms        10000 bytes_per_second=355.816M/s
DomJsonBenchmark/DomDeserializeToDocumentInPlace/10/50           0.057 ms        0.057 ms        11200 bytes_per_second=386.064M/s
DomJsonBenchmark/DomDeserializeToDocumentInPlace/100/5            4.77 ms         4.88 ms          112 bytes_per_second=364.046M/s
DomJsonBenchmark/DomDeserializeToDocumentInPlace/100/500          11.6 ms         11.7 ms           64 bytes_per_second=554.518M/s
DomJsonBenchmark/DomDeserializeToDocumentWithCopies/10/5         0.084 ms        0.084 ms         7467 bytes_per_second=212.55M/s
DomJsonBenchmark/DomDeserializeToDocumentWithCopies/10/50        0.099 ms        0.100 ms         6400 bytes_per_second=220.608M/s
DomJsonBenchmark/DomDeserializeToDocumentWithCopies/100/5         8.22 ms         8.16 ms           90 bytes_per_second=217.847M/s
DomJsonBenchmark/DomDeserializeToDocumentWithCopies/100/500       23.2 ms         22.9 ms           30 bytes_per_second=283.56M/s
DomJsonBenchmark/JsonUtilsDeserializeToDocument/10/5             0.070 ms        0.070 ms        11200 bytes_per_second=255.049M/s
DomJsonBenchmark/JsonUtilsDeserializeToDocument/10/50            0.086 ms        0.087 ms         8960 bytes_per_second=253.258M/s
DomJsonBenchmark/JsonUtilsDeserializeToDocument/100/5             6.86 ms         6.84 ms          112 bytes_per_second=260.033M/s
DomJsonBenchmark/JsonUtilsDeserializeToDocument/100/500           22.8 ms         22.9 ms           32 bytes_per_second=283.158M/s
```

For `AZ::DOM::Document`, the current plan is to offer helper methods that can load from a file path or string using a given backend that can take advantage of in-place parsing by internally storing the serialized buffer.

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
amzn-mike 61d0ec9d6b
Remove debug messages. (#5429)
Leaving in the print for absorbed asserts to avoid running into future situations where important asserts are accidentally absorbed

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
amzn-mike e0cc86e898
Remove AssetProcessorManagerTest AssertAbsorber and update test to use the one from the base class instead (#5216) (#5381)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit b3301414ad)

# Conflicts:
#	Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
4 years ago
AMZN-Phil 541e501b06 Re-add the line to open the cart overlay automatically when a new download starts
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
bosnichd 528a747876
Don't allocate memory when processing WM_INPUT messages. (#5491)
This change was made years ago in CrySystem (see CSystem::HandleMessage in System.cpp), but looks like it never made it into the NativeWindow_Windows version.

Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
John 3ced915f8e Fix attempted rendering of invalid Entity selection boxes.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
Esteban Papp 21f9a789c1
Merged the Editor.Camera.Tests with the Editor.Tests (#5463)
* Merged the Edtiror.Camera.Tests witht eh Editor.Tests

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

* Adds dependency to Camera.Editor gem which is used by the test

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

* Inheirts from TraceBusHook instead of adding the default env to the test

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

* makes order consistent between Setup/Teardown

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

* adds missing header for non-unity builds

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

* Removes dependency to Camera gem

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
AMZN-Phil 0102894a83 Handle servers with no content length and make downloading more obvious
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Scott Romero ab37eb138c
[development] removed CryLibrary (#5474)
* [redcode_crylibrary] replaced CrySystem loading in launcher and editor with new custom wrapper that uses AZ::DynamicModuleHandle

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] removed all remaining references to CryLibrary

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] migrate CrySystem loading to use AZ::DynamicModuleHandle directly instead

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] clean up of CrySystemModuleHandle and old CrySystem module [un]init functions

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] added trailing newline to DllMain.cpp in CrySystem

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Benjamin Jillich 838970206b
Animation Editor: Remove preview label (#5449)
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
bosnichd eb775a48dc
Make InputDeviceId's constructor constexpr. (#5433)
* Make InputDeviceId's constructor constexpr.

See also https://github.com/o3de/o3de/pull/4220

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

* Updates based on review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
jonawals adf3357176
Merge pull request #5486 from aws-lumberyard-dev/viewport/ghi_5239
Fix for Issue #5239: Component Edit Mode does not disable Entity Inspector interaction
4 years ago
AMZN-Igarri 027b0f86ae
Activate AssetBrowserTableView feature (#5367)
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
John 0e3df14ea2 Add missing bus connection/disconnection.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
moraaar 15586ee53e
Adding missing pragma once at XcbInputDeviceMouse.h (#5448)
Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
lsemp3d 934c0f2ec7 Made SerializeContext and BehaviorContext consistent with their class name
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
lsemp3d d3b8b761fd Improved messaging on assert about argument types lacking reflection for scripting
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
Alex Peterson 461b63c61a
Temporarily disable the platform filter (#5454)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Mikhail Naumov e1d53395fe
Propagation Optimization (#5355)
* Merge changes

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* removing leftover immediate flag

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Ronald Koppers e6a1f8ed0a
Merge pull request #5108 from aws-lumberyard-dev/Prefabs/SpawnableEntityAlias
Ability to setup aliases for entities spawned from spawnables.
4 years ago
AMZN-Phil c7e5a0fe12 Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/clouddownloadicon
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
nggieber a253bfc2f5 Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 4 years ago
Gene Walters 5d5087e0d3 Moving CommunicatorTracePrinter to a place that AP and Multiplayer gem can use it. MultiplayerEditorSystemComponent now watching the server process and pumping the trace printer. Wip; for some reason not all the server logs are reaching the editor
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
AMZN-Phil e9c3a453c5
Merge pull request #5341 from aws-lumberyard-dev/Prism/CheckGemUpdates
Add ability to overwrite o3de object when downloading
4 years ago
Scott Romero e30b0f51d1
[development] Android compatibility fixes (#5424)
- Added support for NDK r23
 - Added support for the versioned Android 'cmdline-tools' package which replace the deprecated 'tools' package
 - Updated max Gradle version to latest point release of 7.0 to fix volume query bug during sync in some configurations
 - Updated min Android Gradle plugin version to latest point release of 4.2
 - Fixed issue with Gradle task chaining for some custom copy tasks
 - Replaced use of deprecated 'jcenter' repo with 'mavenCentral' in Android project generator template
 - Increased debug logging around adb calls in Android deployment script
 - Fixed a couple try/except cases that were looking for the wrong exception when invoking adb_* functions
 - Fixed issue where asset cache would get deleted when regenerating an existing Android Gradle project with --overwrite-existing
 - Fixed issues with running Android project generation scripts on Unix systems

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
Chris Galvan 5bf0375598
Merge pull request #4776 from pollend/bugfix/resolve-dragging-problem-for-DockTabWidget
bugfix[Linux]: resolve dragging window with more than one tabbed  (#4658)
4 years ago
nggieber d5ae98496c Full UI Built for Updating and Uninstalling Gems
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
lumberyard-employee-dm 5fc4551ac0
[LYN-8041] Enable relocation of the Project Game Release Layout (#5380)
* Enable relocation of the Project Game Release Layout

Relocating the Project Game Release Layout to another directory on the file system failed due to the querying of the engine root failing due to the ComponentApplication::m_engineRoot not using the project path stored in the SettingsRegisry if the engine root cannot be detected

Removed the ApplicationRequestBus GetEngineRoot function.
The ComponentApplicationRequestBus has a function of the same name that returns the same path.

Removed the deprecated GetAppRoot function.
The path it returns has no defined value. It was not the engine root or the project root.
Removed unused CFileUtil and CFileUtil_impl functions that were invoking the ApplicationREquestBus GetEngineRoot function.
On the way to update the functions it was discovered that they aren't called

Added a CalculateBranchToken overload that can populate a fixed_string to avoid heap allocations

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

* Protect against an empty list of artifacts to remove when generating the
engine.pak

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
AMZN-koppersr cc2513f224 Linux build fix Spawnable Entity Aliases.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
Alex Peterson d053a03b5f
Don't update status filter when filling gem model (#5427)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Tom Hulton-Harrop 089dd681b9
Merge stabilization/2110 as of dcc2890da3 into development 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
AMZN-koppersr 83db368706 Merge branch 'development' into Prefabs/SpawnableEntityAlias 4 years ago
AMZN-ScottR 5f7aee0814 Merge branch 'development' into android_compat_fixes
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
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
lumberyard-employee-dm 1998c53882
Non MSVC Release build fix (#5428)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Michael Pollind 3b05e6ab1e
bugfix: correctly center quick access bar (#5396)
Signed-off-by: Michael Pollind <mpollind@gmail.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
nvsickle a5e11efda1 Add a safety check to Prefab/PrefabPublicHandler (potential AR fix)
Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
Chris Burel 33d5109fe8
Merge `stabilization/2110` as of `20edb35cdc` into `development` (#5319) 4 years ago
AMZN-koppersr b3295ffeb3 Fixed several issues with compilation of Spawnable Entities Aliases.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
AMZN-koppersr 976c6abb90 Build fix.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
AMZN-ScottR c5cd7f7fb8 [android_compat_fixes] replaced deprecated 'jcenter' repo with 'mavenCentral' in Android project generator template
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Alex Peterson 431f80510f
Merge pull request #5414 from aws-lumberyard-dev/Prism/DisplayAddGemInfo
Fix Additional Gem Info Handling and Display
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Alex Peterson 79f8edce14
Allow using gem repos page without losing changes #5317
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
AMZN-koppersr c9f9a83c57 Further PR feedback on the Spawnble Entity Aliases.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
AMZN-koppersr 8ccccdcaf1 Merge branch 'development' into Prefabs/SpawnableEntityAlias 4 years ago
nvsickle 47c02f555a Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/FixEntityOrdering 4 years ago
nggieber 14a1206274 Add additional info handling and proper display for gems
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
srikappa-amzn 652e35b0ca
Fix camera transforms being reset when switching to default editor camera (#5326)
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
Tom Hulton-Harrop c0d36399db
Improvements to feedback for default camera orbit point (when no entity is selected) (#5397)
* improvements to camera orbit feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* minor tidy-up before publishing PR

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates following review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
AMZN-Igarri a1d9a2cc58
Asset Browser Tests (#4948)
* Added AssetBrowser Tests

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

* Added Entries to test AssetBrowser

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

* Added Print info.

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

* Added more folders

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

* Added Asset Browser Tests for the Search View

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

* Fixed Entry creation

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

* Removed optimize

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

* Cleanup AssetBrowserModel

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

* RowCount made public

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

* Delegated entry creation to RootAssetBrowserEntry and added Code review feedback

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

* removed unused helper class and fixed demo tests

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

* Fixed bus connections

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

* Refactored test environment and added basic tests

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

* Applied some code review feedback and added basic tests

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

* fixed naming

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

* Refactored Tests

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

* removed pointer reset, now handled by the AssetBrowserComponent

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

* Fixed conversion unsigned-signed

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

* Cleaned includes

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

* fixed test setup

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

* Fixed unused variables

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Added printer function

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* cleaned up code

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Added Test to check the correctness of the setup

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed basic tests

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed Tests

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
4 years ago
Tom Hulton-Harrop 783186fa7e
Update default camera orbit behavior (#5301)
* add new default orbit point behavior

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add default orbit distance to settings registry

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add new default orbit point behavior

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add default orbit distance to settings registry

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* expose default orbit distance to editor settings menu and update how we display default camera position

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add improve orbit changes for focus

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
kberg-amzn c0e63988d8 merging latest dev, again, and hopefully dev is not still completely broken
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Alex Peterson a297ceece4 Merge remote-tracking branch 'upstream/stabilization/2110' into Prism/show-gem-repos-update
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Alex Peterson 0295aa7070 revert change to cancel label href
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Alex Peterson 21c02b195f Update signals/slots to match upstream changes
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Alex Peterson 4ce39ea167 Fix tags, downloads, and several vector copies
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
kberg-amzn 479ff188a0 merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Jeremy Ong 6b6eb2c936 Remove markers that occupy <2us for 99% of events
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
AMZN-Phil c6e77f8e32 Code readability improvements
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
amzn-mike 1399159908
Fix Assert Absorber being leaked due to one of the tests setting m_errorAbsorber to nullptr without deleting the object (#5176) (#5348)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 916fb413c9)
4 years ago
amzn-phist 6cba64f226
Fix issue with Server Launcher debug console not accepting keystrokes (#5325)
* Fix issue with debug console ignoring some keys

This problem was reported for Server only, the Enter/Backspace keys were
being ignored in the ImGui Debug Console.
This wasn't an issue if the Server had loaded a map.
The problem was with XConsole explicitly setting a bool in dedicated
server mode.  This caused text input to be processed by XConsole code
and not passed further along to DebugConsole where it should have been
handling it via ImGui.

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

* Fix missing runtime dependency of ServerLauncher

ServerLauncher in non-monolithic config was missing a runtime dependency
on Legacy::CrySystem.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
moraaar 356fec5490
bugfix: resolve crash with FBX Settings (#4813) (#4944) (#5365)
-prevent export of ModuleInitISystem and ModuleShutdownISystem

Signed-off-by: Michael Pollind <mpollind@gmail.com>

Co-authored-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Michael Pollind eddb867ddf bugfix: change event to WindowBlocked for FancyDocking
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Michael Pollind b42f1b022e replace with ungrab mouse event instead of deactivate window
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Michael Pollind b3c7bf47f2 Update Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
Signed-off-by: Michael Pollind mpollind@gmail.com

Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Michael Pollind 9eb7972e74 bugfix: main window is deactived for tabbed window preventing the use from dragging tabbed windows
issue: https://github.com/o3de/o3de/issues/4658

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
AMZN-koppersr 567702931f Updates for the spawnable entity aliases based on provided feedback.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
Chris Galvan fdc56b4a57
Merge pull request #5337 from aws-lumberyard-dev/cgalvan/MakeProcessingOverlayWidgetAlwaysOnTop
Set window flags so the processing overlay widget always appears on top.
4 years ago
AMZN-Phil 31382d080e Remove duplication, additional readability and added missed file
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Alex Peterson c69142b73b Merge branch upstream/stabilization/2110
* Conflict GemModel.h

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
kberg-amzn ed06ef7ed2 Removing ITimeoutHandler to simplify timeout queue interface, removes some unneeded code
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Alex Peterson d582715321
Merge pull request #5318 from aws-lumberyard-dev/StablizationMacPMLaunchEditor
[MacOS] Launching Editor from ProjectManager and other misc. fixes
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
chcurran 0175e9d3cb Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 4 years ago
AMZN-Phil 393f08fc4b Merge remote-tracking branch 'upstream/stabilization/2110' into Prism/clouddownloadicon
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-Phil 9d977e81da Uncomment temporary disabling of toast notifications
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Chris Galvan c37767f92a Set window flags so the processing overlay widget always appears on top.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Burel f97fa6dbe0 Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@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
Chris Burel 0ee217acac Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 4ba2c06386 Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel ac7cda86c5 Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel f5dea72dfe Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
amzn-mike 20edb35cdc
[LYN-7245] Fix test thread being created multiple times (#5267) (#5315)
* Fix test thread being created multiple times

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

* Update test to not use a callback

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

* Add some more comments

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

* Add back the callback, remove the use of a thread/sleep

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 73202c2091)
4 years ago
Chris Burel 46d1b19816
Merge pull request #5275 from aws-lumberyard-dev/burelc/LYN-6480
[Linux] Unify Editor and Game raw mouse event handling

Signed-off-by: Chris Burel burelc@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
Vishal Das 6f294457da
fix issue #5172 (#5198)
Signed-off-by: Vishal Das <dvishal485@gmail.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
AMZN-Phil b6be57d2cf
Merge pull request #5264 from aws-lumberyard-dev/MacPMLaunchEditor
[MacOS] Launching Editor from ProjectManager and other misc. fixes
4 years ago
Esteban Papp 781a635ef7
Cleanup: Remove cry load dll functions (#5295)
* Removes VTUNE profiler hooks from Cry

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

* Remove cry load dll functions

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

* removes unused restricted section

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Chris Burel 1bd5a63919 Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 6eeae875e9 Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 6c7bc7a296 Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 04652abb8f Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 06ec40452e Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 179389726b Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
amzn-sj 9958e5f012 [MacOS] Launching Editor from ProjectManager and other misc. fixes
Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
Alex Peterson 774b7c2593 Fixed minor logic issue with gem removal warning
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
AMZN-koppersr 0decc57dfc Merge branch 'development' into Prefabs/SpawnableEntityAlias 4 years ago
bosnichd 600bb5b34e
Fix alt-tabbing out of full screen on Windows. (#5288)
Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
Esteban Papp 0b7bff79d3
Removes VTUNE profiler hooks from Cry (#5291)
* Removes VTUNE profiler hooks from Cry

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

* some more vtune cleanup

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Danilo Aimini 6bce0a9a8d
LYN-7054 + LYN-7704 | Exit Focus Mode when starting Game Mode, correct painting of Prefab capsules in Outliner. (#5280)
* Add RefreshAllContainerEntities function to ContainerEntityInterface. It refreshes all registered containers so that listeners can refresh their state.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Move Prefab border painting to foreground, and invert foreground painting order. This ensures the Prefab capsules are drawn according to UX.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Alex Peterson 2f8de3e797 Keep gem repos pages in sync
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 627012840d
Update how Project Filepaths are calculated when not supplied via command line (#5194)
* Fixed the return value of the ConvertToAbsolutePath function

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>

* Update how the project related file paths are determined when not
supplied.

The project-path determination now goes back to only detecting a "project.json" file.
It no longer attempts to detect a "Cache" directory

The project-cache-path determination now in addition to checking the
project_cache_path key searches for a "Cache" directory.

The project-path defaults to executable folder if it cannot be detected.

The copying of generated executable folder Registry directory contents
to the product cache is now removed after the archive step.

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

* Updated the invocation of the AssetProcessor in Jenkins to supply an
absolute path to the project.

The project-path is no longer treated as relative to the engine root,
but instead relative to the current working directory at application
startup.

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

* Added constant for the storing the name of Cache directory

Fixed typos and grammatical errors in the SettingsRegistryMergeUtils.cpp

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

* Updated UnitTest prepend the EngineRoot path to "AutomatedTesting" when
setting the project path.

This is needed now that the project-path isn't treated relative to the
EngineRoot if it is not absolute.

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

* Fix AssetSeedManagerTest and PlatformAddressedAssetCatalogManagerTest

Instead of trying to used the AutomatedTesting directory as the project root, the temp directory created during the test is used as the project root.

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

* Moved the setting of the project cache root folder and project
asset platform root folder into the `if (!projectCachePath.empty())`
block

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

* Removing the scan up logic for the "Cache" directory.

This is no longer needed to locate the project cache path in a Project Game Release Layout.

Because the project path defaults to the executable directory if, it is not found, the Cache directory will be set to the "Cache" directory within the executable directory.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
amzn-mike 73202c2091
[LYN-7245] Fix test thread being created multiple times (#5267)
* Fix test thread being created multiple times

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

* Update test to not use a callback

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

* Add some more comments

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

* Add back the callback, remove the use of a thread/sleep

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Michael Pollind 891a4f6782
bugfix: resolve crash with FBX Settings (#4813) (#4944)
-prevent export of ModuleInitISystem and ModuleShutdownISystem

Signed-off-by: Michael Pollind <mpollind@gmail.com>
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
Tom Hulton-Harrop 4c41a4dfc9
Ensure ImGui menu is displayed when the Viewport UI viewport border is showing (#5240)
* add optimize off code temporarily

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* ensure the imgui menu displays when the viewport border is active

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@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
kberg-amzn 7e65104155 Addressing PR feedback
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Chris Burel 0502ddbe2b [Linux] Return the active window when there's no cursor constraint window
The cursor constraint window is only set by the Editor. In the game
launcher, this function was returning a null window, which makes
`GetSystemCursorPositionNormalized()` unable to determine the cursor
position. This in turn causes mouse input in ImGui to not work.

Fixes #4722, LYN-7491

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 43c83f13c6 [Linux] Add unit tests for xcb mouse input
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 7e67064ef8 [Linux] Style fixes: prefer `nullptr` to `NULL`, etc
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel ae1b6d6729 [Linux] Unify Editor and Game raw mouse event handling
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
kberg-amzn 70a1eb65d8 Improving comments around heartbeat sends + bumping number of heartbeats for increased keep-alive robustness under high packet loss
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn fda7a6353e Backing out some temporary debugging code
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn 5b734b9d41 A number of fixes to timeout and disconnect handling
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Esteban Papp e4c46ffb5d
Merge pull request #5229 from aws-lumberyard-dev/issues/4683
Adds LuaIDE->GridHub dependency
4 years ago
Alex Peterson 861b29ffc7 Fix spelling change for member variable
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Michael Pollind 4277414268
bugfix: cycle mouse to the other side of the screen when using scrollbox (#5048)
* bugfix: cycle mouse to the other side of the screen when using scrollbox

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: added comments to SpinBox

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
amzn-sj 41d3a38781 Add missing header file
Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
Michael Pollind d8c2088d1d bugifx: resolve crash with project manager (#5151)
- system allocator not configured in environment for AZQtComponents
- WA_DeleteOnClose will destroy the toast dialog causing a crashing when ToastNotificationsView tries to access the pointer

issue: https://github.com/o3de/o3de/issues/5129
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Alex Peterson 523f2e6465 Merge remote-tracking branch 'upstream/stabilization/2110' into Prism/show-gem-repos-update
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>

# Conflicts:
#	Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
4 years ago
Alex Peterson 27c7e71516 WIP default gem sorting
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
amzn-sj 9a15b7cadc 1. Fix "Open Editor" button not launching Editor on Mac.
2. Update LaunchAssetProcessor() paths on Mac.
3. LaunchAssetProcessor() uses ProcessWatcher wrappers.
4. SDK Launcher registers the engine when launching.

Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
Danilo Aimini 618777f8d4
LYN-7536 | Focus Mode - Introduce shortcuts to open/close prefab editing (#5230)
* Enable closing prefab by double-clicking it when it's in focus.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Enable double clicking on level prefab to close focus mode and return to editing the level.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce API function to go up one level in the Prefab Focus Mode hierarchy.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Enable keyboard shortcuts to more easily navigate the prefab hierarchy.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Tie the "Open/Edit Prefab" action to the = key on top of +. This allows users with compact US keyboards to use either key, preventing them from having to press Shift and =.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Replace the behavior of the "Up one level" button in the breadcrumbs with the new function that serves the same purpose. Also show the - shortcut in the tooltip.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix FocusOnParentOfFocusedPrefab to require the entity context id (to conform with the other functions in the API that don't pass entityIds). Expand its usage to other functions that did the same operation manually.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Include fix for non-unity builds

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
bosnichd ab76c62188
Allow input devices to be constructed with a custom implementation. (#5217)
* Allow input devices to be constructed with a custom implementation.

This augments the existing functionality that allows for an input device implementation to be swapped out at runtime,

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

* Updates based on review feedback, and fix for clang builds.

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

* Update based on review feedback, and change the InputDeviceImplementationRequest bus to use the same ImplementationFactory type alias.

Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
amzn-mike b3301414ad
Remove AssetProcessorManagerTest AssertAbsorber and update test to use the one from the base class instead (#5216)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Esteban Papp 556847c93e Adds LuaIDE->GridHub dependency
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
AMZN-Phil 99ef2735b7 Create download UI once and update existing UI with progress
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Danilo Aimini 4e2c28105c
LYN-7547 | Focus Mode - It is possible to create a child entity of a closed container (#5193) (#5220)
* Disable drag&drop of entities on closed containers.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Do not show the Create Entity context menu when right clicking a closed prefab container.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Disable entity creation on closed containers, both via the Create Entity flow and drag/drop of assets.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor changes to modernize old code.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini 9dc85000a3
LYN-7547 | Focus Mode - It is possible to create a child entity of a closed container (#5193)
* Disable drag&drop of entities on closed containers.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Do not show the Create Entity context menu when right clicking a closed prefab container.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Disable entity creation on closed containers, both via the Create Entity flow and drag/drop of assets.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor changes to modernize old code.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
rgba16f [Amazon] 5c072a5d51
Part 2 of enabling Atom to use TaskGraph
Enable Atom CullingScene to use TaskGraph
Enable Atom PNG save to use TaskGraph for red/blue color channel swap on save out.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
Mikhail Naumov 22b21acc97
No longer can create camera in an empty level (#5189)
Signed-off-by: Mikhail Naumov <mnaumov@amazon.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
amzn-mike 3d61db8d1d
[LYN-7245] AP unit test segfault - Clean up debug messages (#5192)
* Added newline to debug prints.  Added additional debug prints based on previous segfault log

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

* Add more debug messaging

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

* Add db path to output

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
amzn-mike e11b1e2c9c
[LYN-7774] wildcard source dependencies not refreshing with new files (#5054)
* Fix handling of absolute path dependencies when a newly added file satisfies a previously added dependency

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

* Fixed relative path wildcard dependencies matching absolute paths

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

* Update extra unit test to only run on windows since this problem doesn't apply to other OSes

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Allen Jackson 255e6894dc
{} adding behavior for GraphData BoneData (#5061)
* adding behavior for AZ::SceneData::GraphData::BoneData
* adding behavior for AZ::SceneData::GraphData::RootBoneData


Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
Jeremy Ong 47b7ad1ec4
Merge pull request #5018 from aws-lumberyard-dev/burelc/linuxApTetherLifetime
[Linux] Terminate AssetProcessor when spawned by the parent project process
4 years ago
lumberyard-employee-dm a9f7ab4aaf
Fixed the return value of the ConvertToAbsolutePath function (#5195)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
bosnichd 403e2ff1e3
Fix bug in LocalFileIO::ConvertToAliasBuffer when a resolved alias ends in a path separator. (#5136)
* Fix bug in LocalFileIO::ConvertToAliasBuffer when a resolved alias ends in a path separator, in which case we do not want to consume it when replacing it with the alias.

eg. If the @products@ alias resolves to "C:\" and we call ConvertToAliasBuffer with "C:\some_folder\some_file.txt", the current behaviour results in "@products@some_folder\some_file.txt", but it needs to be "@products@\some_folder\some_file.txt"

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

* Update based on review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
srikappa-amzn 63e68f02e7
Add benchmarks for SpawnAllEntities call in SpawnableEntitiesManager (#5141)
* Add benchmarks for SpawnAllEntities call in SpawnableEntitiesManager

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

* Minor changes to SpawnAllEntities benchmarks setup

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

* Used aznumeric_cast and improved a function name

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

* Fixed an invalid converstion from uint64_t to unsigned int

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
amzn-mike 6da75821c5
Move Exception PrintCallstack call before any ebus calls to help track down issue with crash during an exception (#5188)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
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
Michael Pollind 32bebe1c8c
bugifx: resolve crash with project manager (#5151)
- system allocator not configured in environment for AZQtComponents
- WA_DeleteOnClose will destroy the toast dialog causing a crashing when ToastNotificationsView tries to access the pointer

issue: https://github.com/o3de/o3de/issues/5129
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Mike Balfour d106c9aba5
Merge pull request #5174 from aws-lumberyard-dev/Prefab/RevertImmediatePropagation
Prefab/revert immediate propagation
4 years ago
AMZN-Phil a187ee09a1
Merge pull request #5093 from aws-lumberyard-dev/Prism/SearchForGemsFromTags
Scroll to and Select Gem When Gem Tag is Clicked
4 years ago
Mike Balfour a769a324fa Merge commit 'de6af361ab15a9fc504518368e5a8fca2db5a065' into mbalfour/gitflow_211102_o3de 4 years ago
Mike Balfour 008e825bd2 Merge commit 'bf6fd2a6d6b09a87c2478d389efc306d1215ecb5' into mbalfour/gitflow_211102_o3de 4 years ago
Mike Balfour a40700be2b Merge commit '49da85ca3a4acb633d9c63abcd43f485905aeb92' into mbalfour/gitflow_211102_o3de 4 years ago
Mike Balfour bad4c1a276 Merge commit '8f56dc10c33ae73acaa99c8690e8bc91a1cec2bc' into mbalfour/gitflow_211102_o3de 4 years ago
Mike Balfour 122a28c4b4 Merge commit '1228738bb2da5ccf7e3d7a1219a90afab5189d6b' into mbalfour/gitflow_211102_o3de 4 years ago
Mike Balfour 9589bc050d Merge commit 'd3ff91f15346328e82e4e4fb293256ff3b026b1c' into mbalfour/gitflow_211102_o3de 4 years ago
Mike Balfour 402d4d664f Merge commit 'cf767fd4bd038e39512a0f193dfd7cb536a9700f' into mbalfour/gitflow_211102_o3de 4 years ago
Mike Balfour a7f364a5d6 Merge commit '65d23c7ed6b084ad58d03fb46e76793cac41d503' into mbalfour/gitflow_211102_o3de 4 years ago
Mike Balfour 5867ab6bde Merge commit 'b2a8e4056950398e13f2fe32f486d29733669a2b' into mbalfour/gitflow_211102_o3de 4 years ago
hultonha de6af361ab
Do not clear input channels everytime focus changes (#5044)
* remove HandleFocusChange from FocusIn/Out events in QtEventToAzInputManager

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* ensure we clear input channels when application state changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* wip changes for focus switching tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates to test to verify focus change not affecting input

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add test to ensure input is not cleared when focus changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* ensure key press goes to correct widget

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add test to verify input is cleared when application state changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* clear input for all types of application state change

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update input key for focus test

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* use the Settings Registry to tell the InputSystemComponent to disable various devices

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update how we simulate the application state change event

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* revert Settings Registry changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
hultonha bf6fd2a6d6
Add missing reflection calls for various types (#5163)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Alex Peterson 49da85ca3a
Fix new project path when enabling gem (#5173)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Chris Burel 08c51aaf27 [Linux] Terminate AssetProcessor when spawned by the parent project process
This adds support for the `ap_tether_lifetime` cvar in Linux. It extends
the solution implemented in #2799 to add the same support on Linux.

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Vincent Liu 96159c1e3a
Add missing exclamation mark for documentation (#5144)
* Add missing exclamation mark for documentation

Signed-off-by: onecent1101 <liug@amazon.com>

* Add more

Signed-off-by: onecent1101 <liug@amazon.com>
4 years ago
nggieber 2ae927c754 Fix minor indent issue
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
amzn-mike 916fb413c9
Fix Assert Absorber being leaked due to one of the tests setting m_errorAbsorber to nullptr without deleting the object (#5176)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
AMZN-koppersr 045a826c68 Updates to the Spawnable entity aliases based on provided feedback on PR.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
Chris Burel 8f56dc10c3
Perform sse float comparisons with the floating-point intrinsics (#5115)
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Danilo Aimini d948d78b2e
Merge pull request #5170 from aws-lumberyard-dev/daimini/cherrypick/outlinerEntityOrderingFix
Cherry-pick: resolve entity ordering for EntityOutliner
4 years ago
AMZN-ScottR 9b39c63bba Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR 9057cfbcbf [profiler_capture_api] fixed release compile error
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
srikappa-amzn f7a48fda11 Added a missing function comment for UpdatePrefabInstances function
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
srikappa-amzn 729a79dc82 Revert "Fixing undo/redo not updating transform pivot point (#4375)"
This reverts commit 7018f16088.

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
srikappa-amzn 1025eb3929 Revert "Delay propagation for all template updates in detach prefab workflow (#4707)"
This reverts commit 87533d80c1.

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
Alex Peterson 259ee654ae WIP refresh gem catalog in place
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Michael Pollind 9886603f99 Bug Fix: resolve entity ordering for EntityOutliner (#4798) (#4938)
* bugifx: resolve dragging behaviour for EntityOutliner (#4798)

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: cleanup and rework logic

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Guthrie Adams 7ba7928559 Removing redundant registration of script assets
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Esteban Papp 8e420dad3d
Removes some usage of DEDICATED_SERVER (#5119)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Artur K 2dff26ddb5
Fix asset type retrieval in AssetCatalogModel::GetAssetType (#4995)
* Fix asset type retrieval in AssetCatalogModel::GetAssetType

Previous logic would visit the next entry in m_extensionToAssetType map, if the previous entry had multiple types
 was only exiting the inner loop.

The main change is that now the first found matching asset type is returned.

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

* Apply reviewer's suggestions + reduce allocations.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
AMZN-Igarri d3ff91f153
Fixed memory leak of the in the AssetBrowserComponent (#5132)
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
hultonha cf767fd4bd
Fix for 'focus' text appearing incorrectly (#5133)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
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
AMZN-ScottR 4721f44b92 [profiler_capture_api] more changes based on PR feedback
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
chcurran 6c130c7a86 Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 4 years ago
AMZN-ScottR b2e6711196 [profiler_capture_api] fixed clang compile error
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
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
nggieber 858e287b1f Removed unused set filter function
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
nggieber 08255d2eda Clicking tag now select gem and scrolls to it, it also resets filters if gem is filtered out, also gem filter creation was refactored
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
Alex Peterson 781eaabd94 Access gem repos from catalog non-destructively
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Alex Peterson 07353ed4ad
Merge pull request #5137 from aws-lumberyard-dev/Prism/integrate-crash-fix
Integrate gem catalog refresh crash fix (#5112)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
ffarahmand-DPS 971e24285f
Fixes debug console's "quit" issues (#4975)
* Fixes a crash caused when attempting to ‘quit’ the launcher from the debug console. The change simply ensures that the underlying font data the OnRenderTick() function relies on has not yet been released from memory.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Fixes a crash caused when attempting to ‘quit’ the launcher from the debug console. An object created on the heap was never deleted, causing a chain reaction.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Some quick clean-up for safety.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Changes !defined(DEDICATED_SERVER) to a runtime check since macro is no longer defined.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>
4 years ago
Esteban Papp 72d6f2972e
Adding support for multi-config/multi-permutation installer 4 years ago
Alex Peterson 65d23c7ed6
Merge pull request #5086 from aws-lumberyard-dev/Prism/RefreshRepoButtonDisablesRepo
Removed Gem Repo Enable Button
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Alex Peterson ca9093c202 Add engine name, folder and fix refresh crash (#5112)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Alex Peterson 5db6ffb6f3
Disable custom titlebar on Mac, Linux, fix resize (#4973) (#5114)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Alex Peterson b4dd4c8f02
Add engine name, folder and fix refresh crash (#5112)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Adi Bar-Lev 66612cac28
Merge pull request #5116 from aws-lumberyard-dev/barlev/gitflow_211028_O3DE
Barlev/gitflow 211028 O3DE
4 years ago
Michael Pollind f40191dd8c
bugfix: resolve broken focus for viewport (#5059)
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Artur K a322d9e2b8
Small `Code/Editor` cleanup pass (#4909)
* Clean-up in ConfigGroup

Removed unused templated AddVar and related code.
Replaced legacy types with `AZ::` ones.
Cleaned up cpp file.

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

* Add a few missing Q_OBJECT macros, remove some unused variables.

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

* Apply some of clazy suggestions + simplifications

* removed `emit` from non-signal function calls.
* replaced `QStringLiteral("")` with a constexpr friendly
`QLatin1String()`

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

* Fix a CNewLevelDialog focus bug

Fixed an incorrect QTimer::singleShot invocation.

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

* match lambda to `messageChanged` signature

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

* vs compilation fix + applied review

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

* apply reviewer recommendation

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
Esteban Papp 475338cfad Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Adi Bar-Lev 2a32d67830 Merge commit '6cce184340dbce9796234a67a0452d1088474945' into barlev/gitflow_211028_O3DE 4 years ago
Adi Bar-Lev 1488522236 Merge commit '00a49fa251121eeb13d28a5ff3cc466392ed3ad9' into barlev/gitflow_211028_O3DE 4 years ago
Adi Bar-Lev f25b80e172 Merge commit 'f350ba3042b216369748935800628118b835ca81' into barlev/gitflow_211028_O3DE 4 years ago
Adi Bar-Lev 8dca689444 Merge commit 'caf247fcab0fc65773c6a95f1bbcfe10b184c5e0' into barlev/gitflow_211028_O3DE 4 years ago
Adi Bar-Lev 8119fe4d86 Merge commit '8d7eb4767afff80992bebe4619afc10aef04a93b' into barlev/gitflow_211028_O3DE 4 years ago
Chris Galvan b2a8e40569
Merge pull request #5100 from aws-lumberyard-dev/cgalvan/GemplateImprovements
Improvements to C++/Python tool gemplates
4 years ago
amzn-mike 899bda4631
Add additional logging for Fingerprint test. (#5104)
This logging is to help track down a Jenkins only automated test failure.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Alex Peterson 6cce184340
Enforce unique gem names in catalog (#5063)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
AMZN-ScottR 90509c7fa2 [profiler_capture_api] removed now unnecessary ProfilerRequests EBus alias after AZ::Interface conversion
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-koppersr 6587e149b7 Added unit tests for spawnable entity aliases.
This also fixes several issues discovered through the unit tests and renames a few functions to be clearer.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
Alex Peterson 00a49fa251
Use source model data instead of filtered (#5071)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Tommy Walton f350ba3042
Modify the AssetBundler to correctly identify the Gems that are enabled in the current active project (#5072)
* Modify the AssetBundler to correctly identify the Gems that are enabled in the current active project

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

* Removed unnecessary if() statement and updated the comment.

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

* Disabling gem loading in the asset bundler tests, just like the asset bundler itself.

Signed-off-by: Tommy Walton <waltont@amazon.com>
4 years ago
amzn-mike b6d634c3ed
Print all captured messages in Assert Absorber used by FingerprintTest to help debug crash (#5096)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Chris Galvan e56396a817 Improvements to C++/Python tool gemplates
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
AMZN-ScottR eb713fb3a8 Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Guthrie Adams e5729fbefe Fix clearing material component default material not clearing materials or updating preview
• Changed thumbnail property control to track asset key even if image is overridden so that it will be restored if the image is cleared.
• Changed property asset control to disable the thumbnail image by default whenever the attribute is applied. It will only enable the thumbnail image if the pixmap is valid.
• Changed the material component controller to always use an empty material assignment map on deactivation so that no persistent materials are reapplied.
• Changed the material component controller to immediately send a notification that materials have updated if no materials were queued for load but the configuration contained pre created or persistent material instances. This mainly affects the material editor because it manages its own material instances.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
AMZN-ScottR fc94ede439 [profiler_capture_api] fixed runtime issues with BehaviorInterfaceProxy reflection
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
lumberyard-employee-dm b9147c60a0
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>
4 years ago
chcurran 1b9f6c385d Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 4 years ago
AMZN-koppersr 66df146554 Fixed existing spawnable unit tests to work with entity alias changes.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
AMZN-koppersr 15ea380d39 Post integration fixes and additional changes for entity aliases in spawnables.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
AMZN-koppersr b3cd339904 Added support for setting up entity aliases during the prefab to spawnable conversion.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
AMZN-koppersr a05d5f5d6d Extended the Spawnable Entities Interface to allow entity aliases to be updated.
Entity aliases can now be updated as a reaction to the spawnable being loaded or at any other time afterwards through the Spawnable Entities Interface. Currently these changes are applied to the spawnable that owns the entity aliases, but once the Spawnable Entities Interface makes use of AzFramework::Scene a copy of the entity aliases should be stored in the scene and be updated instead of the spawnable.

This change also adds support for a load barrier, which acts the same as a regular barrier but also accounts for the spawnable being loaded and won't trigger the callback until has completed.
The return values in from the processing functions in the Spawnable Entities Manager now have a clearer return value to indicate whether a request has completed or is being re-queued.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
AMZN-koppersr a0d7048fd4 Added support for entity aliases to Spawnable.
Entity aliases can be used to have a request to spawn an entity:
- spawn the original entity as normal
- be disabled
- redirected to another entity in another spawnable
- also spawn an entity from another spawnable
- add the components from an entity in another spawnable

An entity alias can indicate whether or not to load the spawnable dependency. If the spawnable dependency is loaded it will be loaded asynchronously because starting blocking loads in an asset handler can lead to deadlocks once there are no more jobs available to deserialize assets.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
AMZN-koppersr 48f2487d3c Updates in preparation for adding entity aliases to spawnables.
The following has been changed:
- AssetDataStream can now return the stored streaming deadline and priority.
- RootSpawnable now has an event that's called just before root spawnable spawns entities. This is an immediate event unlike the other events that are queued.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
nggieber 37243c74ec Make gem tags clickable and filter by their text in the Gem Catalog when clicked
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
nggieber 8117798949 Removed gem repo enable button
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
greerdv 9b2afbc39b fix explicit qualification of member function addresses
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv dd0780f6ec make sure joint frame rotations are editable for ragdoll setup
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
AMZN-ScottR e7ed2c2a83 [profiler_capture_api] updated ProfilerRequests reflection to be as AZ::Interface
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR f90074adb6 [profiler_capture_api] added utility for reflecting AZ::Interfaces through the BehaviorContext
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Danilo Aimini 1435d8b096 Merge branch 'development' of https://github.com/o3de/o3de into daimini/gitflow_211027_o3de 4 years ago
Alex Peterson 59c898fc48
Fix notification queue and add gem action (#4985) (#5024)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
srikappa-amzn 6f8890c2ef
Improve error messaging when duplicating entities before they are created (#4922)
* Improved error messaging when user tries to duplicate before entities are created

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
Danilo Aimini d5c09c695c Merge commit '3165cf283828d1234bda738ab24ea74c4511152a' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini b9613bc915 Merge commit '7fc0f14a1b4f66e560a2ee770b9dbb28dfd54d6f' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini 732b8c2d1b Merge commit 'd332f7c4c70343d7e1a8ca72723ac99ebdd30ca6' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini 46d616824f Merge commit '856318005cac14560f765dc5af203e0139344bb3' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini bc844dc6c9 Merge commit 'a2eca9de3d2e5abca3d5f52f58ff6afd613d8d0d' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini 1a65250b96 Merge commit '22a287d046c606ccb79ff19c1c15075d8cd71dbc' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini 324c9462b6 Merge commit '6b3fc0ff8b2e3094781d7521ec116f620951d46f' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini b2ef35caa1 Merge commit 'f3499011ac52f801ab5bf5f27791f56039e0a7d1' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini 657b1026b5 Merge commit '1bc2968330c7f700759d68b4b4a8e59d81007027' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini f960d6466c Merge commit '3b4b8c354903f6c0fb9b579b13ae5d336c761382' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
AMZN-Phil 3165cf2838
Merge pull request #5011 from aws-lumberyard-dev/Prism/FixGemSelectedFilter
Gem Catalog Selected Gems Now Filters For Gems to be Enabled in Current Session
4 years ago
AMZN-Phil 7fc0f14a1b
Merge pull request #5006 from aws-lumberyard-dev/Prism/FixRemovedProjectStillShown
Fix Issue When Removed Project is Still Shown if it Was The Last Project
4 years ago
Nicholas Van Sickle c5c043ecc5
Add Generic DOM visitor interface (#4852)
* Add Generic DOM visitor interface

Just the visitor interface from the [Generic DOM RFC](https://github.com/o3de/sig-content/blob/main/rfcs/rfc-10-generic-dom.md) with a few hardening changes so that we can align on it early:
- Clarified Lifetimes with an enum, extended it to cover the by-ref opaque values as well
- Added an explicit error type so that serializers can provide logging friendly rejections
- Did a first pass on documentation
- Added Visitor capabilities introspection and support for raw strings
4 years ago
Michael Pollind 3e3f27e65c
bugfix: improve viewport overlay (#4939)
* bugfix: improve viewport overlay

- disable animation for window
- fix problem where vieport is offset from main window

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* update geometry of m_uiOverlay

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
AMZN-ScottR a2c42ab072 [profiler_capture_api] started migration of ProfilerRequests EBus to AZ::Interface
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Alex Peterson 7a0246530a
Fix notification queue and add gem action (#4985)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Chris Galvan 78b0683313 Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
AMZN-ScottR 57a69978b9 [profiler_capture_api] replace profiler capture location cvar with setting registry entry
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-Phil 856318005c
Merge pull request #5000 from aws-lumberyard-dev/Prism/RemoteGemWarning
Adds Warning to Add Repo Dialog
4 years ago
puvvadar e68f57c843
Merge pull request #4889 from aws-lumberyard-dev/bitset_serialization_includes
Fix usages of AZStd::bitset not being found by serialize context
4 years ago
nggieber 866fd8a420 Fix selected gem filtering
Signed-off-by: nggieber <nggieber@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
jonawals a2eca9de3d
Merge pull request #4998 from aws-lumberyard-dev/LYN-5265_state_tracker_impl
Add Focus Mode integration tests.
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
AMZN-ScottR 6b1198584b Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Steve Pham 22a287d046
Fix to set the Taskbar name and Game Launcher window title to the name of the Project (#4986)
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
amzn-mike 81acd559d0
[LYN-7529] Create unit tests for ResolveSourceFileDependencyPath (#4790)
* Add unit tests for ResolveSourceFileDependencyPath

Fix crash when file is not in scan folder

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

* Switch to using vector of AZ strings for better error output

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

* Switch to using UnorderedElementsAre

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

* Add some comments and fix typo

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
nggieber 3ff469c55e Fix issue with project still displaying when last project is removed
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
lumberyard-employee-dm b3b646dad9
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>
4 years ago
AMZN-Phil 6b3fc0ff8b
Merge pull request #4981 from aws-lumberyard-dev/Prism/gemdownloadcallfix
Re-add call used to initiate gem download
4 years ago
Chris Burel f3499011ac
[Mac] Fix QtEditorApplication_mac include (#4978)
Commit 8e03d6f306 missed updating the
platform-specific mac QApplication implementation file to include the
class declaration from the new header.

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
AMZN-stankowi 48fca740a2
Fixed crash if you save a bundle outside the default bundle folder (#4974)
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
4 years ago
nggieber 77d05b0bc9 Merge branch 'stabilization/2110' into Prism/RemoteGemWarning 4 years ago
John c2105b0631 Address PR comments.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
nggieber 75ebf77b59 Added warning message when adding repositories
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
Michael Pollind 5374860444
Bug Fix: resolve entity ordering for EntityOutliner (#4798) (#4938)
* bugifx: resolve dragging behaviour for EntityOutliner (#4798)

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: cleanup and rework logic

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Danilo Aimini 1bc2968330
Resolve minor hover state bugs on the Entity Outlier (branches detect hover state separately from the rest of the columns) (#4977)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Alex Peterson c00b99f2d5
Disable custom titlebar on Mac, Linux, fix resize (#4973)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
AMZN-Phil 423693d16b Re-add call used to initiate gem download
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-ScottR c6d3e7900c [profiler_capture_api] updated ProfilerRequests::StartCapture signature as per PR feedback
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Danilo Aimini 3b4b8c3549
Move the initialization of m_editorEntityUiInterface higher so that it's initialized when the interface is set up. (#4972)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Alex Peterson 29dbb0b089
Set Project Manager minimum height 700px (#4970)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Esteban Papp fec1b2fda2 Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
#	cmake/Platform/Common/Install_common.cmake
4 years ago
AMZN-ScottR 471436b0fc [profiler_capture_api] added cvar/console access for profiler capture
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR 6ddfb6500f [profiler_capture_api] fixed ambiguous LogLevel type in some unity file scenarios
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR 1f2eaface9 [profiler_capture_api] merging overlapping profiler EBuses into AzCore
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
galibzon 4d4deb1211
Added Hydra API to extract all the classes, globals and EBuses exposed (#4953)
* Added Hydra API to extract all the classes, globals and EBuses exposed
to lua:

azlmbr.script.LuaSymbolsReporterBus:
GetListOfClasses
GetListOfGlobalProperties
GetListOfGlobalFunctions
GetListOfEBuses

Also exposed to Hydra the classes that can be used to dump
the symbols
azlmbr.script.LuaPropertySymbol
azlmbr.script.LuaMethodSymbol
azlmbr.script.LuaClassSymbol
azlmbr.script.LuaEBusSender
azlmbr.script.LuaEBusSymbol

The python file Assets/Editor/Scripts/lua_symbols.py
can be used with "pyRunFile <script_name> [output.txt]"
to create Game/output.txt will all the symbols
OR
passing up to three additional arguments "c" or "g" or "e" to dump only
classes, globals or ebuses or a combination of those. Example:
To create an output file with only classes and Ebuses:
"pyRunFile <script_name> [output.txt] c e"

Signed-off-by: garrieta <garrieta@amazon.com>
4 years ago
Jeremy Ong 8ed29d5a0c Enable lifetime tethering of the AP by default
After this change, the AssetProcessor process will be torn down by
default after its parent process shuts down (if it was spawned by a
parent process).

Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
John f98d2e55aa Refactor component mode query.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John 99b840652d Add Focus Mode integration tests.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
AMZN-Igarri e970247fc5
Asset Browser Search View fixes (#4814)
* Fixed RowCount method.

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

* Fixed Signals

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

* Fixed Delegate case

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

* Fixed issue when displaying branch icons

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

* Fixed AssetBrowser Delegate

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

* Removed optimize flags

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

* AssetBrowsertableModel cleanup

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

* Fixed Typos

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

* Fixed Comment

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

* Added check for rowCount == 0

Signed-off-by: igarri <igarri@amazon.com>
4 years ago
nggieber 06f893edf1 Merge branch 'development' into Prism/ShowRepoGems 4 years ago
AMZN-Phil e8a7743aec
Merge pull request #4911 from aws-lumberyard-dev/Prism/RefreshGemRepos
Gem Repos can be Refreshed through Project Manager
4 years ago
nggieber 88f7f66b04 Removed fullPathGiven and instead check if path is a file when getting gem json data
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
nggieber 500ac030a3 Merge branch 'development' into Prism/ShowRepoGems 4 years ago
nggieber 673815c58d Merge branch 'development' into Prism/ShowRepoGems 4 years ago
nggieber 15f4c1a091 Undownloaded remote gems are shown in Gem Catalog and searchable by repo name
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
AMZN-Phil 69771ab2e1
Merge pull request #4892 from aws-lumberyard-dev/TrackDownloadProgress
Project Manager track progress of, and cancel downloads
4 years ago
Esteban Papp ec78c1c003 Removes unity=true since its the default
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
AMZN-Phil b609dbbbbb Pass a callback instead of weak linking a module
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Danilo Aimini a4e0d69e83
Update Splashscreen and About Us dialogs for General Availability (#4901)
* Add new image for splashscreen. Layout changes incoming.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Adapt layouts to new splashscreen style with transparent background.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Ensure cropping logic works correctly when screen scaling is used.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove old image. Replace new image with new version with more readable credits.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
nggieber f6d4556b60 Merge branch 'development' into Prism/RefreshGemRepos 4 years ago
nggieber 10c0522dcb Added F5 support for refreshing repos
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
Chris Galvan efbf2f224e
Merge pull request #4913 from aws-lumberyard-dev/cgalvan/AddFindComponentsByServiceAPI
Added API for finding components based on required/incompatible services
4 years ago
Danilo Aimini 45926d0dbd
LYN-7539 + LYN-7541 | Focus Mode - Show prefab names and dirty markers instead of instance names in breadcrumbs (#4850)
* Change Prefab Focus breadcrumb widget to display template filename instead of instance container entity name. Also display dirty state for the template (*) and refresh it in real time.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Streamline path creation code; fix stem retrieval to ensure extension is cut correctly; delay refresh one frame when path is clicked to correctly refresh it.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove test code.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Simplify code to use Native directly.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor variable renaming and comment adjustments to make them clearer.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Mike Balfour 243532c5de
Addressed feedback from PR 4874. (#4915)
* Addressed feedback from PR 4874.
* Removed second copy of HeightfieldProviderBus.h from cmake file
* Changed CookedMeshShapeConfiguration and HeightfieldShapeConfiguration to have less messy implementations, instead opting for the slightly less messy const_cast inside of Utils.cpp and DebugDraw.cpp.
* Changed InitHeightfieldShapeConfiguraiton to CreateHeightfieldShapeConfiguration with a better API signature.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed indentation

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
Mike Balfour 2fe4524458
Terrain API cleanups (#4914)
* Terrain API fixups
Moved SurfaceData definitions in AzFramework out of terrain into separate files.
Added some missing API calls: Get*FromVector2, GetSurfacePoint*
Changed OrderedSurfaceTagWeightSet to SurfaceTagWeightList

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* PR feedback - remove IsClose check.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed PhysX test compile failures by redcoding a bunch of "dummy terrain" implementation that's unused.
It was originally added for the PhysX Terrain component, but that component is long gone and has been superceded by the more generic PhysX Heightfield Collider.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed up failing terrain unit tests.
Added API changes, and changed the assumption on where the surface weight sort is taking place.  The component is no longer expected to provide the sorted list, it only needs to be sorted at the end coming out of the terrain system, so the unit tests have been modified to reflect that.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
Yaakuro 8e03d6f306
Separate application into platform specific files. (#4799)
Signed-off-by: Yaakuro <y1@codeposer.net>
4 years ago
Alex Peterson b536abbf4e
Add existing gem through Project Manager 4 years ago
puvvadar 3ced67974d Merge branch 'development' of https://github.com/o3de/o3de into bitset_serialization_includes 4 years ago
Steve Pham 476ff637c2
Undo P4 check before spawning thread and fix usage of new AzToolsApplication trait (#4894)
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
AMZN-Phil 993baeac7b Add a comment to inform that the process is limited to a single download
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Alex Peterson 1989316cac
Added toast notifications to the gem catalog 4 years ago
Chris Galvan 95c2ee0e9d Added API for finding components based on required/incompatible services.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
John Jones-Steele 3d67be162c
Terrain Physics Heightfield support
* New Heightfield Components

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

* Misc PR fixes
* Fixed linux build failure from bad #include
* Renamed "Terrain Physics Collider" to "Terrain Physics Heightfield Collider" per physics team feedback
* Fixed 1/5 -> 1/4 typo in a comment
* Added missing member copies in HeightfieldShapeConfiguration

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Addressed PR feedback

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Changes from review

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

* Remove tabs accidently added

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

* Fixed overly complicated scaling math.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Added comments to make it more obvious what's happening on CreateEnd / DestroyBegin.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Moved Heightfield CreatePxGeometryFromConfig into its own function

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

Co-authored-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
nggieber 968c8640d0 Merge branch 'development' into Prism/RefreshGemRepos 4 years ago
nggieber b4a85a2ed6 Repos can be refreshed through Project Manager individually or all at once
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
SergeyAMZN 9ce6f43a22
Merge pull request #4488 from aws-lumberyard-dev/MigrationFixup
Further fixes for client migration and 3-way host entity migration
4 years ago
AMZN-nggieber 54b9ed2737
Added Menu to Gem Catalog with Action to Navigate to Gem Repo Screen (#4829)
* Added menu to Gem Catalog that with option to navigate to Gem Repo screen

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

* Changed Goto to GoTo and added a tr

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

* Gem repo button works from new project creation workflow as well and users are warned if they have pending changes in the gem catalog before changing screens.

Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
santorac a55d94217c
Enable material version updates
Merge pull request #4338 from aws-lumberyard-dev/Atom/rbarrand/MaterialVersionUpdate

## Overview

Added support for automatically updating .material files when the property layout of the .materialtype changes. At this stage, we only support a "rename" operation for renaming or moving material properties. We can add more operations in the future if needed (this will require some improvement to how we represent the data internally, but we can deal with that as the need arises).

It's important to note that we currently have a hybrid dependency model for the material system, where materials can depend on materialtypes as job dependencies (property names are processed at asset build time), or material property names can be stored in the cooked assets (property names are processed and resolved at runtime when loading material assets). This means there are two places where we need to apply material property rename auto-updates: in the tools and in the runtime. So you will find that we have ApplyVersionUpdates() functions in both MaterialSourceData and MaterialAsset. (I hope we can move away from this hybrid approach at some point so this can all be simplified, but that depends on new Asset Processor features we don't have yet).

## Main changes
- Added version and versionUpdates structures for .materialtype files, MaterialTypeSourceData, MaterialTypeAssetCreator, etc.
- The .materialtype version number is now at the top level instead of inside the propertyLayout section, because in the future there are other ways the material type could change besides the property layout which might require version auto-updates. (The AP will fail if the version is found in the old location, and tell the user where it should be moved).
- Added ApplyVersionUpdates() and ApplyPropertyRenames() utility functions to facilitate the auto-updates.
- Updated MaterialTypeSourceData::FindProperty(name) to support renames because it must find the property data while loading .material files in order to resolve property data types.
- These new functions will report warnings when they detect that source files are out of date, and recommend the user update them. The easiest way to do this is open it in the Material Editor and save. (which can be scripted in python if necessary)
- Renamed the .material file format "propertyLayoutVersion" to "materialTypeVersion" which is more accurate. This shouldn't hurt existing data as this field wasn't actually used for anything before.

## Unit test improvements
- The new code is well unit tested.
- MaterialSourceDataTests 
  - Updated to include both a .materialtype file and a MaterialTypeAsset for the test material type. Both are used by the MaterialTypeSourceData class.
  - The default test material type now includes some version update steps; these are only used for version update tests and won't impact the other test functions.
  - Updated the path for storing temp files to disk, to just be in a "temp" folder in the exe path. (Originally they were saved to the gem folder near MaterialSourceDataTests.cpp, but at some point someone changed it to be under the exe folder, so there's no reason to use the full gem path anymore).

## Other changes
- Fixed AzCore Utils WriteFile() to create the file if it doesn't exist already.
- Updated all .materialtype files to have the version number in the new position.
- Fixed AssetSystemStub to normalize asset paths for more reliable lookup in unit tests.
4 years ago
AMZN-Phil 5e6ecddbf9 Remove some test code and extra newlines
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-Phil e3cfcd4cc7 Add the ability for Python to pass download progress to Project Manager and to cancel downloads.
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
santorac 19dee0e37c Merge branch 'development' into Atom/rbarrand/MaterialVersionUpdate 4 years ago
AMZN-Phil 50068bcae7
Merge pull request #4807 from aws-lumberyard-dev/GemUIDownload
First part of UI feedback for downloading gems
4 years ago
Nicholas Van Sickle f3af362ede
Merge pull request #4838 from aws-lumberyard-dev/LYN-7562
Make safe asset folder comparison for prefab creation to be case insensitive
4 years ago
puvvadar 2a42654df7 Fix usages of AZStd::bitset not being found by serialize context
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
kberg-amzn 57c65e5b43 merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Danilo Aimini 52112be1ac
LYN-7448 + LYN-7542 + LYN-7543 | Focus Mode - UX Improvements (#4837)
* Introduce Outliner button to simplify Prefab editing

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix Focus Mode and disabled entities colors

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix - propagate the event if the OnOutlinerItemClick function returns false.
This does not change current behavior but makes more sense in the context of future handlers.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Adjust disabled colors to match UX recommendations.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Display the edit button even if the prefab is disabled. Remove prefabWip check (it will be removed for focus mode by the time this goes in). Default to disabled capsule color for borders to save on checks.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Disable edit button on disabled prefabs as it caused conflicts in nested prefabs. May explore that possibility later.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Change disabled text color to be darker, as asked by UX.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
AMZN-Phil 24d7a90e5f Fix a warning
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Steve Pham 244878483a
Update open file limit on linux for applications (#4878)
* Programmatically update the ulimit for open files if the current limit is not enough

Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
AMZN-Phil c4f5f01657 Merge remote-tracking branch 'upstream/development' into GemUIDownload 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
srikappa-amzn 33490ed6df Avoided a string copy by using path view
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
santorac bf2997f960 Merge remote-tracking branch 'upstream/development' into Atom/rbarrand/MaterialVersionUpdate 4 years ago
Chris Galvan 546102077f
Merge pull request #4875 from aws-lumberyard-dev/cgalvan/RemoveLegacyColorGradient
Removed legacy ColorGradientCtrl
4 years ago
kberg-amzn 79b41686c4 Merging latest dev
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
AMZN-Phil a032c59eab Removing unused function
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-Phil 2809c3b7ed Removing unused variables and defines and some renaming
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
SJ c871224dae
Support for importing Json files (#4609)
* Initial support for importing Json files within other Json files

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

* Add some test cases for testing/iterating on the Json import work. Fix MacOS AzTestRunner module loading bug.

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

* The import resolver can take the allocator as a parameter to Load/StoreImports() instead of storing a copy.

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

* Fix assert

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

* Some rework of the JsonImport feature. Base test cases pass. More complex test cases need to be added.

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

* 1. Add test case for testing nested imports.
2. Initialize rapidjson value to fix assert.
3. Fix bug found in merge patch creation.

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

* 1. Update the Resolver class member functions to return proper result codes.
2. Add the wrapper functions for resolving/restoring imports to the JsonSerialization class.
3. Add new test case.

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

* Add test cases for import + patches. Fix bug found when patching import. Rename test cases.

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

* 1. Add ApplyPatch() function to BaseJsonImporter.
2. Move patch logic out of ResolveImport() and into ApplyPatch()
3. Get rid of the custom RestoreImport implementation in the tests since it was the same as the base version.
4. Add test case for patching nested imports.
5. Update merge patch outcome reporting logic to work for nested object patches.

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

* 1. Add a CreatePatch() function to BaseJsonImporter to match the ApplyPatch() function.
2. Reorganize some responsibilities between RestoreImports(), RestoreImport() and CreatePatch() to make ResolveImports() and RestoreImports() more symmetrical.

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

* Combine result code in code path where we add empty object to path

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

* Add test case for inserting a new import into an existing object.

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

* Use == instead of Compare() for comparing file paths.

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

* Address some PR feedback.

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

* Address additional PR feedback

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

* Add missing includes to fix non-unity build

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

* Fix build error. Address additional feedback.

Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
srikappa-amzn 4ed73a0b91 Use case insensitive folder path comparison for creating slices
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
Chris Burel ab86c9961e
[Linux] Fix deadlock when running `LaunchProcess()` from a thread (#4833)
`LaunchProcess()` on Linux works by calling `fork` then `execvpe`. `fork`
is used to copy a running process, generating a new child process. The new
child starts running from the location where the parent was running, from
whatever thread from the parent called `fork`. The child process only gets
one thread, however. If a different thread in the parent process had locked
a mutex, that mutex is also locked in the child process. Since that
separate thread is not present in the child, the mutex remains locked in
the child, with no way to unlock it. So it is important that as little work
as possible happens between the call to `fork` and to `execvpe`.

Previously, this code was trying to report an error that may have occurred
from calling `execvpe`. It was doing that by calling `AZ_TracePrintf`. That
function does lots of things, including trying to make an EBus call, which
looks up a variable in the `AZ::Environment` instance, which has a global
mutex. If there was some other thread that had that mutex locked when the
`fork` call was made, the subprocess would deadlock, and the parent process
would also deadlock waiting for the child to finish.

This solves that issue by removing the call to `AZ_TracePrintf` from the
subprocess code path. Instead, the parent process sets up a pipe for the
child process to write to in case the call to `execvpe` fails (the
self-pipe trick). The parent then reads from that pipe. If it reads no
data, `execvpe` worked and there's no error. If it does read data, the data
to be read is the errno from the failed `execvpe` call made by the child.
The parent can then use `strerror()` to report the error.

Fixes #4702.

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Michael Pollind a33ab67125
bugfix: handle moving files for inode-watch for AssetProcessor (#4656) (#4809)
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Chris Galvan d78aa5bf90 Removed legacy ColorGradientCtrl.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Steve Pham 74d74050f2
Fix unused variable error in release linux builds (#4846)
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
santorac a0b1dec929 Added support for material version updates in MaterialSourceData. This is necessary for tools like Material Editor and Asset Processor to work with the latest property names.
- Added MaterialSourceData::ApplyVersionUpdates() for updating the properties. This should be called by tools after loading the MaterialSourceData. (But can be omitted if a tool wants to read the data exactly as it appears in the .material file).
- Updated MaterialTypeSourceData::FindProperty to support applying version update renames, including a ApplyPropertyRenames utility function, which are necessary for MaterialSourceData to be able to find the necessary property definitons while loading.
- Added a new context struct to JsonMaterialPropertyValueSerializer for passing down the material type version number, to help with applying property renames.
- Renamed the .material file format "propertyLayoutVersion" to "materialTypeVersion" which is more accurate. This shouldn't hurt existing data as this field wasn't actually used for anything before.
- Updated Material Editor to again store the material type version number in .material files.

MaterialSourceDataTests updates...
- Updated to include both a .materialtype file and a MaterialTypeAsset for the test material type. Both are used by the MaterialTypeSourceData class.
- The default test material type now includes some version update steps; these are only used for version update tests and won't impact the other test functions.
- Updated the path for storing temp files to disk, to just be in a "temp" folder in the exe path. (Originally they were saved to the gem folder near MaterialSourceDataTests.cpp, but at some point someone changed it to be under the exe folder, so there's no reason to use the full gem path anymore).

MaterialTypeSourceDataTests updates...
- Moved some code that was accidentally added to LoadAllFieldsUsingOldFormat but should have been in LoadAndStoreJson_AllFields.
- Added test cases for unsupported version update operations

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
AMZN-Phil 9aa9ed8c8e Changing some class names and other download UI feedback.
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Danilo Aimini c2ec18dc0e
Remove prefab WIP checks to make focus mode the default (and only) prefab editing workflow in the editor. (#4840)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Steve Pham 27a535eaf4
Linux Fixes for Launching the Material Editor (#4808)
- Prevent P4 thread to run if we cannot detect the P4 command to begin with
- Add a trait to disable calling the parent ComponentApplication::Destroy(), instead calling _exit() to skip the module unloading on exit

Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
Chris Galvan ae4755bbc3
Merge pull request #4839 from aws-lumberyard-dev/cgalvan/FixSceneSettingsStallWithInvalidP4
Treat invalid p4 configuration as a warning for the scene settings save action so the processing popup will get the job results.
4 years ago
Vincent Liu 8e797982a5
[LYN-7530] Fix matchmaking request type typo and add more matchmaking notifications (#4774)
* [LYN-7530] Fix matchmaking request type typo and add more matchmaking notifications

Signed-off-by: onecent1101 <liug@amazon.com>
4 years ago
Chris Galvan c1948bf94e Treat invalid p4 configuration as a warning for the scene settings save action so the processing popup will get the job results.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Danilo Aimini 60c286dafa
LYN-7483 + LYN-7052 | Correctly initialize and refresh Prefab Focus Mode handler. (#4718)
* Initialize the PrefabFocusHandler on context reset, to also cover the case of a new level being created on the welcome screen.
Relax checks/restrictions on refreshes to cover cases where an instance is reused by the Prefab EOS.
Refresh the breadcrumbs when a container is renamed and when a change is propagated to the instances to ensure the correct names are displayed.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Rename m_isInitialized to m_initialized in PrefabFocusHandler

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Use find_if to detect when a container entity in the focus path has been renamed.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Renaming and commenting variables in PrefabFocusHandler.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Undo minor naming change

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Replace lazy initialization and have the UI side initialize the Editor calls in PrefabFocusHandler.
This should prevent issues with focus mode trying to access these interfaces in non-editor applications.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
amzn-phist 714f5357b2
Add an error message to AP when the project path is invalid (#4801)
* Add an error message to AP when bad project path

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

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

* Fix a failing unit test - AssetProcessorMessages

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

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

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
srikappa-amzn 24b0dab30e Make safe asset folder comparison for prefab creation to be case insensitive
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
Alex Peterson 7ddcdffed7
Move Qt Toast Notifications from GraphCanvas into Framework
Move the existing Qt Toast Notification QWidgets, EBuses and logic from the GraphCanvas gem into AzQtComponents and AzToolsFramework so they can be re-used.

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Allen Jackson 900aa4e5bc
{lyn7065} adding ProcPrefab Prefab::Tempate flag method (#4765)
* {lyn7065} adding ProcPrefab Prefab::Tempate flag method

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

* updated based on comments

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

* moved validation logic to IsValid()

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

* added more guards around the source string


Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
AMZN-Phil 023e8fcff2 Add missing files for review
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
rgba16f [Amazon] c6afb1f0a3
Update all the hardcoded filenames inside the level.pak file to be lowercase now the editor no longer forces them to be lower case. (#4802)
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
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
jonawals a1ee7b5a31
Merge pull request #4725 from aws-lumberyard-dev/hultonha_LYN-7394_focus_cursor
Updates to support 'lock'/'forbidden' cursor when in Focus Mode
4 years ago
AMZN-Phil 02364b869e First part of UI feedback for downloading gems
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
amzn-mike f31b47f775
Switch stacktrace output to use Output function instead of AZ_Printf to avoid it being suppressed accidentally (#4805)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
puvvadar 66c4950de0
Merge pull request #4529 from aws-lumberyard-dev/mp_deltaserializer_perf
Reworking DeltaSerializer to no longer require string based hashes
4 years ago
amzn-mike c1335f69c6
Convert resolved wildcard paths to relative path before saving in database (#4574)
* Convert resolved wildcard paths to relative path before saving in database.

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

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

* Handle abs path wildcard dependencies

Remove dependencies outside of scan folder

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

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

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

* Made code a little more clear

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
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
jonawals befb97a80e
Merge pull request #4627 from aws-lumberyard-dev/igarri/Fix-Viewport-camera-locations
Make Go To Location affect the Default Viewport Camera
4 years ago
John ae6005545e Fix for PyTest editor test case names.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
Nicholas Van Sickle 3485bc08b1
Fix EntityOutlinerTest (#4771)
The test was relying on immediate updates from the prefab system which are now scheduled for a later tick - this reworks the tests to wait for deferred updates before validating state

Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
puvvadar 87b5ac4236 Remove extra new lines
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
puvvadar 0c141ac210 Const some unit test values
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
Nicholas Van Sickle 434641382b
Merge pull request #4749 from aws-lumberyard-dev/nvsickle/OutlinerDuplicateEntryFixes
Fix issues with invalid Outliner entries
4 years ago
chcurran 658da08495 Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 4 years ago
Vincent Liu a534fccc9b
Expose matchmaking event polling APIs and add required session notifications (#4636)
* Expose matchmaking event polling APIs and add required session notifications

Signed-off-by: onecent1101 <liug@amazon.com>
4 years ago
lumberyard-employee-dm 357df2bb4b
Added anchor key parameter to the SettingsRegistry MergeSettings (#4650)
* Added anchor key parameter to the SettingsRegistry MergeSettings

This allows the MergeSettings function to write JSON data anchored
underneath the supplied anchor path.

Upgraded the SignalNotifiers calls in SetObject, MergeSettings and
MergeSettingsFileInternal to query the type of the merge value at the anchor path
and supply that as the type to the notification event.

Also the the above functions now supply the anchor key root as the
path that was modified instead of assuming root ""

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

* Fixed whitespace inconsistencies in SettingsRegistryImpl

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

* Added a queue for storing SignalNotifier calls when a thread is
currently signaling.

The queued calls are invoked by that thread after it has signaled it's
current queue of events

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.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
lumberyard-employee-dm 643c5c2f82
Removed AZ_ENABLE_TRACING from Archive::GetPakPriority (#4741)
The AZ_ENABLE_TRACING check was preventing the Archive System from using the sys_PakPriority value set from the CVar system

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
AMZN-nggieber 4899309b6a
Connect Adding and Removal of Gem Repo UI to CLI (#4729)
* Connect Adding and Removal of Gem Repo UI to CLI

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

* Addressed PR feedback

Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
igarri d8b47a1448 More fixes
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri a3c3de4a76 AR fixes
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri f6945f1334 Fixed Viewport Interaction
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri 6050d2e16e merge develop
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri d8a453f826 changed names
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri c93bd87127 Added default camera position to viewport settings
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri 026919c11b Set View in viewport fixed
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
John 363bc33fed Fix broken function name.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John cf41ff020a Fix merge conflicts.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
nvsickle f0e6841ca8 Fix issues with invalid Outliner entries
The EntityOutlinerListModel was violating the QAbstractItemModel contract in a few cases, as reported by `QAbstractItemModelTester`. The important ones causing issues were:
- Entry order was not guaranteed, leading to model indices pointing at invalid data
- Parent/child relationships could be temporarily invalid due to a change I made in EditorEntityModel::RemoveEntity to try to avoid an unnecessary reparent operation - as it turned out, the parent/child data was being cached even for recreated entities and not clearing child data could cause issues
- `EntityOutlinerListModel::ProcessEntityUpdates` was emitting data changed between two indices that didn't necessarily share a parent, which is [undefined behavior](https://doc.qt.io/qt-5/qabstractitemmodel.html#dataChanged)

The other reported issues (that weren't really causing issues with `QTreeView`) were:
- The root index had flags other than `Qt::ItemIsDropEnabled`
- `rowCount` showed all columns as having children
- `parent` showed indices as being parented to a non-0 column

This change introduces fixes for the above issues, namely:
- Reverts my change to `EditorEntityModel::RemoveEntity` to ensure we don't have invalid parent/child references sitting in the cache
- Ensures `EditorEntityModelEntry` child ordering is guaranteed sorted by EntityId, to prevent the `EntityOutlinerListModel` from having indices pointed at invalid data*.
- Fixes various model sanity issues, such as `rowCount` being 0 for indices with a non-0 column

Two unit tests were added to reproduce the invalid behavior and validate the fix: TestCreateFlatHierarchyUndoAndRedoWorks and TestCreateNestedHierarchyUndoAndRedoWorks
This change focuses on correctness over performance. My subjective in-Editor outliner experience is about the same, but it may be worthwhile to expand the test coverage with a benchmarking suite to look into areas for optimization.

*As a rough illustration of the previous child ordering behavior, consider the following entity hierarchy:
```
Root (EID 9999)
|_ Child1 (EID 2)
|_ Child2 (EID 3)
|_ Child3 (EID 4)
```
With an representations like the following pseudocode:
```
// EditorEntityModel representation
EditorEntityModelEntry root;
root.children[0] = 2;
root.children[1] = 3;
root.children[2] = 4;

// EditorOutlinerListModel representation
// row, column, user data (64 bit uint)
child1 = QModelIndex(0, 0, 2)
child2 = QModelIndex(1, 0, 3)
child3 = QModelIndex(2, 0, 4)
```

When removing a child, the `EditorEntityModel` used to do roughly the following:
```
// Swap and pop the last child
int indexToRemove = 0;
swap(root.children[indexToRemove], root.children[root.children.size() - 1]);
root.children.resize(root.children.size() - 1);
model.notifyRemoved(root, indexToRemove); // model removes the row indicated

// Leading to this EditorEntityModel state
root.children[0] = 4;
root.children[1] = 3;

// And this EntityOutlinerListModel state, note that the row indices are swapped from the indices in the backing storage
child2 = QModelIndex(0, 0, 3)
child3 = QModelIndex(1, 0, 4)
```

A QModelIndex having a row that doesn't match its underlying data is undefined behavior, and was the source of an intermittent crash in our `QSortFilterProxyModel` as subsequent updates to the wrong row led to an invalid proxy state.

Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
Pratik Patel b58ae15d83
Merge pull request #4595 from yaakuro/yaakuro-development-patch-1
[GNU/Linux] Add basic mouse device implementation and fullscreen handling to GNU/…
4 years ago
Yaakuro 4c733d3f4c Add basic mouse device implementation and fullscreen handling to GNU/Linux.
Signed-off-by: Yaakuro <y1@codeposer.net>
4 years ago
amzn-mike dd47e1aa4e
Add EditorPrefabComponent to procedural prefab container entity (#4727)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
puvvadar f6e53241a1 Add test demonstrating size savings of DeltaSerializer
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
puvvadar b5739f6918 Merge branch 'development' of https://github.com/o3de/o3de into mp_deltaserializer_perf 4 years ago
chcurran 42d286f8a6 Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 4 years ago
Esteban Papp 721d92b4f9 adding exception handling for tests that are not going through AzTestRunner
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
hultonha 244e1b8e16 add a switch to enable/disable cursor lock (default off)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Esteban Papp 8829ceb0f8 Merge branch 'development' into issues/exception_handling
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
4 years ago
Esteban Papp 7651ba621c
Remove old "Integ" functionality from tests (#4688)
* fixes some warnings for newer versions of VS2022

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

* more warning fixes

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

* remove integ test filters from AzTest

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

* remove integ test handling from AzTestRunner

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

* changes integ tests of gridmate to regular tests and disables failing ones

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

* removes the Integ from the EMotionFX tests, but leaves them disabled since they are failing

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

* removes the Integ from the HttpRequestor tests and disables it since is not passing

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

* changing integ tests for DISABLED, these ones are using files that are not there

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

* fixes linux build
gridmate tests that were Integ are now disabled

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

* fixes linux warnings

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
hultonha bd224b3a5c update bus implementation for integration tests
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
hultonha 67ccc438c4 remove redundant word from comment
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
hultonha 2158c8cfdf Merge branch 'development' into hultonha_LYN-7394_focus_cursor
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
hultonha c955880d9b ensure cursor position is mapped to the right widget space
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
hultonha 9aafc51ff5
Add first pass version of click feedback while in Focus Mode (#4693)
* add first pass version of click feedback while in Focus Mode

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add more WIP experimental feedback ideas for Focus Mode

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small updates after UX feedback to improve focus mode feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* refactor and improve invalid click feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update comments from review feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
hultonha 3d4c060fb5 updates to improve cursor lock behavior
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
srikappa-amzn 87533d80c1
Delay propagation for all template updates in detach prefab workflow (#4707)
* Delay propagation for all template updates in detach prefab workflow

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

* Some minor changes to the PrefabUndo constructor

Signed-off-by: srikappa-amzn <srikappa@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
hultonha 1d6542c274 initial wip code to update cursor states
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Michael Pollind 716c561cb7
bugfix: correct broken layout when searching global preferences (#4689)
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
hultonha 5c8a1b573e
Add support for border in Focus Mode (#4692)
* restore component mode border

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add viewport border for focus mode, remove dead code in ObjectManager

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* ensure the focus mode border is restored when leaving component mode

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update FocusModeNotification call order after merge from development

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
John 396530b274 Address PR feedback.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
ffarahmand-DPS 606de5427b
Fixes debug console autocomplete issues (#4223)
* Fixed a crash caused by large autocomplete results in the debug console. A fixed vector was growing beyond its allocated size.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Fixes printing duplicate autocomplete results, caused by looping over multiple CVARs registered with the same name. Also adds an erase to prevent undefined behavior.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Adds a test case for autocomplete duplication in the event of multiple cvars existing under the same name. Two matching cvars are created and checked against the number of matches produced by autocomplete.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Added two safety checks and made a pointer const as per reviewer feedback.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>
4 years ago
AMZN-Igarri f7eb906516
Moved Max Number of Entries Shown in Asset Browser Search View to EditorViewportSettings (#4660)
* removed references to maxNumberOfItemsShownInSearch

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

* Move Max Number of Entries Shown in Asset Browser Search View to EditorViewportSettings

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

* Fixed extra spaces

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

* Code review feedback

Signed-off-by: igarri <igarri@amazon.com>
4 years ago
moraaar 3b9762142a
Triangle Mesh with a Kinematic PhysX Rigid Body warns the user instead of error. (#4657)
Using triangle mesh with a kinematic rigid body is allowed, but the options "Compute COM", "Compute Mass" and "Compute Inertia" are not supported by PhysX and an error in logged that default values for COM, Mass and Inertia will be used. Now this situation is captured and an explanatory warning is used instead.

- Improved RigidBody::UpdateMassProperties function to apply the same logic in the treatment of shapes for all three parameters: COM, Mass and Inertia.
- Improved UpdateMassProperties function by using references for the override parameters instead of pointers.
- Improved function that computes the Center of Mass UpdateCenterOfMass (renamed from UpdateComputedCenterOfMass), to include the same shapes that the compute mass and inertia functions in physx updateMassAndInertia, which is to include all shapes if includeAllShapesInMassCalculation is true, else include only the shapes with eSIMULATION_SHAPE flag.
- Removed unused private function RigidBody::ComputeInertia.
- Added unit test to check when the warnings are fired correctly when COM, Mass or Inertia are asked to be computed on a rigid body with triangle mesh shapes.
- Improved MassComputeFixture tests by not only using Box shape, but also sphere and capture, plus improved the PossibleMassComputeFlags parameters to include all possible variations of the MassComputeFlags flags.

Fixes #3322
Fixes #3979

Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
kberg-amzn 3040f74c41 Merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn a6e7a81b79 More fixes to migration, plus some quality of life fixes to TimeoutQueue to allow lambda based handlers and a quick fix to OctreeSystemComponent to more gracefully handle enumerate calls that lie outside the vis system bounds
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Esteban Papp 17b5312ce5 PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
puvvadar 8a1d59934d Remove some includes
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
puvvadar b295e674fc Update DeltaSerializer and tests with delta'd vectors
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
Danilo Aimini bcf3980de6
LYN-7191 + LYN-7194 | Adjust Prefab operations to conform with Prefab Focus/Edit workflows. (#4684)
* Disable ability to delete container entity of focused prefab. Default entity creation to parent to container entity of focused prefab.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Disable detach and duplicate operations for the container of the focused prefab. Update the context menu accordingly.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix spacing

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Address minor issues from PR (error message, optimization in RetrieveAndSortPrefabEntitiesAndInstances).

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Esteban Papp c5da705b46 fixes typo
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp a6c506c121 some warning fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Steve Pham 16a7b896ee
Fix to prevent using legacy windows based logic to create a Path on Linx (#4704)
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
Esteban Papp 07a52d2dfc Merge branch 'development' into issues/exception_handling
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 04a6744765 enables our exception handling and disables gtest's
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e078580f2c Changes GTEST_OS_SUPPORTS_DEATH_TEST to the right define which is GTEST_HAS_DEATH_TEST
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 3e729638b5 adds unhandled exception test
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 88cc3c774a adds stack trace conversion from native
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
AMZN-koppersr aabb519452
Merge pull request #4565 from aws-lumberyard-dev/mnaumov/LYN-7227
Fixing crash creating new level when simulate mode is on
4 years ago
amzn-mike 63ece6e3ca
Change Asset Hint fixup code to not request assets be queued for load. (#4664)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Mikhail Naumov e36be1ee95 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-7227
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Chris Galvan 4d4f99767f
Merge pull request #4594 from pollend/chore/update-IntersectSegment-cleanup
Clean-up IntersectSegment  and improve documentation
4 years ago
chcurran 0b646ac693 initial scriptcanvas source handle
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Steve Pham 8d7b03c859
Implement open in file browser for Linux (#4677)
* Add support to open folder browser for Linux
* PAL'ified DesktopUtilities.cpp

Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
Chris Burel 5967b419a2
Only enable the Keyboard device in the XcbKeyboard unit tests (#4682)
This prevents other input devices from interfering with the expected calls
that the Keyboard tests should make.

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
igarri d12c6beb40 Added Default Camera Location to the Viewport Setting Registry
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
Michael Pollind 5a204dc80b chore: remove equality from boolean expression
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Vincent Liu 6823ea2274
Add GameLift matchmaking backfill server support (#4622)
* Add GameLift matchmaking backfill server support

Signed-off-by: onecent1101 <liug@amazon.com>
4 years ago
puvvadar ba7ff3c8e8 Add Network Input unit tests
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
puvvadar 65e124809c Merge branch 'development' of https://github.com/o3de/o3de into mp_deltaserializer_perf 4 years ago
amzn-phist 80dcc34e6f
Add "Registry" folders as scan folders (#4583)
* Add "Registry" folders as scan folders

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

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

* Change params for adding scan folder

Also add trailing newlines to setreg files.

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

* Adjust the priority order for project templates

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

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

* Removes change of default assets folder to Assets

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

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

* Update platform configuration test to pass

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

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
Esteban Papp 6a2020ec6c fixes some warnings for newer versions of VS2022
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Danilo Aimini f7e2d07a4b
LYN-7333 | Fix multiple selection by dragging to take focus mode and containers into account. (#4620)
* Change FocusModeNotificationBus's OnEditorFocusChanged arguments to also pass the previous focus root entity id.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add focus mode and container entity states to the visibility cache for the viewport. Use that data to correctly select entities when a rect is dragged on the viewport.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor code adjustments

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor fixes and optimizations

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Nicholas Lawson 5ba30f9a37
Update tiff to the new package revision (fixes IOS TIFF package) (#4638)
The new tiff package works for all platforms, including android and IOS, which had issues before.
Android - was missing tiff.h
ios - wrong minimum ios revision
4 years ago
Danilo Aimini 3c3cde99be
LYN-7189 | Outliner - Disable context menu if right clicking on disabled entity (#4651)
* Don't allow right clicking on a non selectable entity in the Outliner

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Also check that the index is valid to still allow the right click context menu to appear on empty areas of the widget.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Change if check to a more readable bool.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
nvsickle fcd6360c26 Merge remote-tracking branch 'upstream/development' into nvsickle/OutlinerDuplicateEntryFixes 4 years ago
amzn-phist 29b62c7b84
Various updates to get pak builds working (#4552)
* Various updates to get pak builds working

-Fix basing config file merges off engine root.
-Merge command-line in relelase to make sure they override defaults.
-Fix nullptrs.
-Exclude more paths from being sent to bootstrap setreg.

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

* Reverting a change that caused some test failures.

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

* Change tabs to spaces

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
AMZN-nggieber 10ab1a369f
Adds Download status info UI to Gem Catalog (#4602)
* Adds Download status info UI to Gem Catalog

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

* Removed test code

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

* Remove unused variable

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

* Addressed PR feedback

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

* Fixed Open3DEngine spelling

Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
Danilo Aimini da3a39a6a0
LYN-7121 | Focus Mode - Make editing a prefab an undoable operation (#4582)
* Refactor the PrefabFocusInterface to differentiate between Public and Internal functions. Introduce PrefabFocusUndo nodes to allow undoing Prefab Edit operations.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix selection code to avoid warning message

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Removed changed property from PrefabFocusUndo node

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Switch from size == 0 to empty in EntityOutlinerWidget::OnSelectionChanged

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* condense if check on Prefab Edit context menu item setup

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Correct interface usage in PrefabIntegrationManager (interface was renamed to public)

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove rej file that was included by mistake

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix missing interface initialization in PrefabFocusTests

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
John f9740ae25c Remove undefined behavior.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John 06910a7c82 Add API comments.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John 3c2c52910f Merge branch 'development' into LYN-5265_state_tracker_impl 4 years ago
John 2e7c8a0fd2 Double click entity in prefab to enter FocusMode.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John 65f3f26339 Fix issue with activating/deactivating FocusMode.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
lumberyard-employee-dm 97e9f4dc7d
[LYN-6838] Various Monolithic shutdown fixes for the GameLauncher (#4564)
* Added a stateless allocator which uses AZ_OS_MALLOC/AZ_OS_FREE to
allocate memory for objects in static memory.

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

* Updated the Maestro and LyShine Anim Nodes to use the
stateless_allocator for its static containers.

This prevents crashes in static de-init due to the SystemAllocator being
destroyed at that poitn

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

* Updated the EBus AllocatorType to use the EBusEnvironmentAllocator

Because the EBus Context resides in static memory, the SystemAllocator
lifetime is shorter than the EBus Context.

This results in shutdown crashes in monolithic builds due to all of the
gem modules being linked in as static libraries and the EBus context now
destructing at the point of the executable static de-init, instead of
the module de-init, where the SystemAllocator would still be around.

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

* Fixed an assortment of shutdown issues due to deleting objects after
AZ allocators are no longer available

Fixed the NameDictionary IsReady() function to not assert when the
dictionary when invoked after the environment variable it was stored in
was destroyed.
Updated the NameData destructor to check that the NameDictionary
IsReady() before attempting to remove itself from the dictionary

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

* Fixed NameDictionary destory workflow, to reset the EnvironmentVariable
instance

Updated the EnvironmentVariable instance to store the NameDictionary as a
value.

Added a rvalue reference `Set` function overload to the
EnvironmentVariable class to support move only types.

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

* Clang 6.0.0 build fixes

The C++17 std::launder feature isn't available in that compiler version

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
hultonha 48a74ca93d
Remove clearFocus from EditorTransformComponentSelection duplicate Entity (#4571)
* remove clearFocus from EditorTransformComponentSelection duplicate entity

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove extra unneeded calls to RequestWrite

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update PrefabPublicHandler to use SetSelectedEntities

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Michael Pollind 63da5847c1 chore: correct documentation and correct method return.
- change return for IntersectSegmentTriangleCCW to bool
- change return for IntersectSegmentTriangle to bool

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Steve Pham ccd60513f1
Fix prefab close dialog Editor crash on Linux (#4623)
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
Danilo Aimini 1cb26a31f8
LYN-7195 + LYN-7185 + LYN-5301 | Hide viewport helpers for entities out of focus + selection shortcut adjustments (#4615)
* Light refactoring of selection logic. Only draw helpers for selectable entities according to Editor Focus Mode and Container Entity systems.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* When Escape is pressed, clear the Prefab Focus.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Alter Ctrl+A and Ctrl+Shift+I to take editor focus mode and container entity behaviors into account.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove redundant comments and reduce footprint of tests.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce loop protection, as GetParentId is known to loop in some situations possibly causing timeouts.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Guthrie Adams 2b72f7b100
Merge pull request #4642 from aws-lumberyard-dev/Atom/guthadam/overriding_property_asset_ctrl_thumbnails
PropertyAssetCtrl and ThumbnailPropertyCtrl support custom thumbnail image
4 years ago
Steve Pham 70636572ff
Fix casing of editor_xml filenames to match casing in .ly files (#4640)
Signed-off-by: Steve Pham <spham@amazon.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
Guthrie Adams f34811c373
Merge pull request #4639 from aws-lumberyard-dev/Atom/guthadam/thumbnail_bus_passes_const_qpixmap
Updated thumbnail notification bus to use const QPixmap&
4 years ago
Guthrie Adams 4f539b0eb7 fixed comments
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams f7e08d1c4b PropertyAssetCtrl and ThumbnailPropertyCtrl support custom thumbnail images
• PropertyAssetCtrl was previously extended with ThumbnailPropertyCtrl to optionally display a thumbnail and floating zoomed in preview of the selected asset.
• This change allows overriding the image that comes from the thumbnail system with a custom image provided as an attribute. The custom image can be specified as either a file path or a buffer containing a serialized QPixmap.
• This will be used by the material system in the editor to provide a dynamically rendered image of the material with property overrides applied so that the image will update as the user customizes their material.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Danilo Aimini 6318247b3d
LYN-7279 + LYN-7192 | Focus Mode - Container unit tests + Clear container entity open state on new level load (#4558)
* Change SetContainerOpenState to SetContainerOpen.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce Clear function to avoid retaining all lingering open states when switching contexts/loading a new level.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor FocusMode fixture refactors to support ContainerEntity tests

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce tests for the ContainerEntity API

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add include to fix issue with EntityContextId not being defined.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor comment fixes. Moved environment clear functions to TearDown function of test fixture.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Use default editor context id in ContainerEntitySystemComponent

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Revert previous change as the EditorEntityContextId would not be initialized correctly on ContainerEntitySystemComponent Activate.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Chris Galvan 190cf92f9d
Merge pull request #4637 from aws-lumberyard-dev/cgalvan/FixPythonScriptsTreeItems
Fixed logic error causing Python Scripts tree items to only show extension intead of filename.
4 years ago
puvvadar a273899f1b Add DeltaSerializer unit tests
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
Guthrie Adams 8487373b0c Updated thumbnail notification bus to use const QPixmap&
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
AMZN-Phil c355c162ab
Merge pull request #4486 from aws-lumberyard-dev/Prism/ShowRepoList
repo.jsons can be listed and and access through CLI and is Integrated with Project Manager
4 years ago
Chris Galvan 94c938496e Fixed logic error causing Python Scripts tree items to only show extension intead of filename.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Junbo Liang 736c2fe27b
[O3DE][GameLift] Add client side change for starting and stopping matchmaking (#4536)
* [O3DE][GameLift] Add client side change for starting and stopping matchmaking

Signed-off-by: Junbo Liang <junbo@amazon.com>
4 years ago
igarri 8cf736b999 Added default Camera position a Sensible Default
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri da190abbab Fixed Camera Locations
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
Michael Pollind 7ca85460f7
Bug Fix: Improve display of Viewport UI (#4596)
- always show controls on top of main ui
- Tool window does not show visually in toolbar

issue: https://github.com/o3de/o3de/issues/4380

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Michael Pollind 02d8596d87 chore: improject documentation for IntersectSegment
- change return of IntersectRayDisk to bool
- change return of IntersectRayBox to bool
- move [out] after @param

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Mikhail Naumov 7af448c9b7 PR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Scott Romero a95c609bd8
[development] Migrate Atom CPU timing stats tracking to use global stats profiler (#4549)
This change is a preparation for moving the CPU profiler/visualization system from Atom into its own Gem by removing the dependency on local time tracking object AZ::RHI::CpuTimingStatistics

Full changes include:
- Removed all usage of AZ::RHI::CpuTimingStatistics
-- Replaced with pushing to AZ::Statistics::StatisticalProfilerProxy global instance
- Promoted VariableTimer from AZ::RHI to AZ::Debug
- Removed now unused CpuTimingStatistics.h

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
Alex Peterson ef3470b0a9
Dependency confirmation screen and URL display fix
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
nggieber 3698c3c3a7 Merge branch 'development' into Prism/ShowRepoList 4 years ago
Chris Burel 189aa5f3ac
Disable the creation of the UserSettings.xml file in Xcb tests (#4593)
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
hultonha 5c859cb134
Fix camera drift issues (#4576)
* remove some unused code in RenderViewportWidget and make viewing devicePixelRatioF easier

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates to how cursor positions are calculate to handle the viewport widget moving

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove optional for previous position

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add test to capture error with moving the widget

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* minor comment updates before publishing PR

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Allen Jackson 3b89f7e1cd
{lyn7283} added test for assetHint Json Serialzier callback logic (#4586)
* {lyn7283} adding unit test for the assetHint Json Serialzier callback logic

AssetTracker_Callback_Works will regress the functionality

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

* clean up of the jsonRegistrationContext

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
bosnichd 2d7dfe5047
Increase the max time in the iOS run loop from DBL_EPSILON to one millisecond to address issue where the virtual keyboard is sluggish. (#4580)
Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
jonawals 61533f68bf
Merge pull request #4522 from aws-lumberyard-dev/LYN-5265_state_tracker_impl
LYN-7122: Remove redundant editor mode notifications.
4 years ago
Michael Pollind 1c3b293cd3 fix comments replace /** with //!
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
John 3ef24d3a05 Header fix.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John e26d1f9ec5 Linux non-unity header fix (again).
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John 6c8441713d Fix another missing header for Linux non-unity.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John 9baf76beab Add missing header for non-unity builds on Linux.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
greerdv cd6fc66322
Merge pull request #4575 from aws-lumberyard-dev/triangle-mesh-warning
small improvements to triangle mesh rigid body warning
4 years ago
Artur K b91d503a82
Add AZStd::lerp math function, based on C++20 (#3468)
* Add AZStd::lerp math function, based on c++20

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

* Add unit test for AZStd::lerp, based on libc++ ones

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

* written a reduced set of lerp tests, but now the license is correct

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

* Update Code/Framework/AzCore/AzCore/std/math.h

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

* Update Code/Framework/AzCore/Tests/AZStd/Math.cpp

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

* fix the github suggestion merge

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

* Copy some AZ::Lerp tests to std::lerp test suite + clang-format

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

* Cleanup lerp test cases

Remove comments that suggested very heavy tests that required things like `for every t1..`

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

* Fix unit test compilation issues

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

* fix whitespace issue

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

* Use `TypeParam` in TYPED_TEST

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

* Remove unneeded new-lines

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

* remove unused infinity

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

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
greerdv 622a9bc009 merge from development
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
John 1cdb34326b Merge branch 'development' into LYN-5265_state_tracker_impl 4 years ago
Michael Pollind afa8bb9226 chore: update intersect and improve documentation
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
lumberyard-employee-dm 7b1dd01d1d
Implemented a deferred LoadLevel queue for the SpawnableLevelSystem (#4561)
* Moved the SettingsRegistryTests.cpp and
SettingsRegistryMergeUtilsTests.cpp to the Settings folder

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

* Implemented a deferred level load queue, that allows the
SpawnableLevelSystem to re-run the last LoadLevel command that occured
before it was constructed.

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

* Added SettingsRegistryVisitorUtils to reduce Array and Object visitor
boilerplate.

The VisitArray and VisitObject functions allows iteration over each
element of array and object respectively via a callback.

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

* Removed the queuing logic for levels that attempt to load before the SpawnableLevelSystem is available

Only the last level name that could not load is stored off and deferred until the SpawnableLevelsystem is created.

Made the FieldVisitor AggregateTypes constructor protected and added a comment specifying the expected values.

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

* Bring in the SettingsRegistry::Visitor::Visit functions into scope to fix MSVC compilation errors.

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

* Changed the list of supported SettingsRegistry types to visit to an enum to constrain the values to Array and/or Object.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
lumberyard-employee-dm e4d3ab118c
Console changes: Added a new SettingsRegistry root key for executing (#4567)
console commands.

The new key is "/O3DE/Autoexec/ConsoleCommands" and the only difference
with the "/Amazon/AzCore/Runtime/ConosleCommands" key is that it isn't
excluded by the SettingsRegistryBuilder.

Due to not being excluded by the SettingsRegistryBuilder this key can be
used to forward console commands to the aggregate
`bootstrap.game.<config>.<platform>.setreg` files.

For GameLauncher specific console commands it is recommend to be put them in
.setreg file that uses the "game" specialization, such as
"autoexec.game.setreg".

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
lumberyard-employee-dm b7c2401056
Added a ThreadDispatch Policy to the EBus code (#4405)
* Added a ThreadDispatch Policy to the EBus code

The ThreadDispatch Policy can be configured by authors of an EBusTraits to
invoke a callback function after an EBus has finished it's dispatching
mechanism on a specific thread.

It takes into account recursive calls as well and will only invoke the
PostDispatch callback after all callstack entries for the current thread
are cleared.

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

* Clang build fix

The Traits type is dependent on the template parameter, therefore the compiler needs to be told that the ThreadDispatchPolicy is a type and not a value.

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

* Fixed DispatchLockGuard cxall in the TerrainWorldRendererComponent.cpp

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

* Added EBusTrait for configuring the DispatchLockGuard

Removed the ThreadPolicy trait, now that the DispatchLockGuard for the
EBus Context can be configured.

Used the DispatchLockGuard template along with the
IsInDispatchThisThread function to determine when an EBus has finished
dispatching on thread and released it's Context Mutex.

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

* Tweaked comment format for the IsInDispatch function


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

* Removed explicit GetContext call from ThreadDispatchTestBus.

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

* Clang EBus Test fix for DispatchLockGuard trait

Due to the clang compiler evalating constants within templates at the time of declaration, the LocklessDispatch value supplied to the template was always false resulting in the LocklessDispatch feature always locking.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Steve Pham 73f8537030
Fix Issue saving new assets in Asset Editor on Linux (#4537)
* Add helper function to apply a selected file filter from a file dialog to the result filename if needed
* Add platform traits to restrict the use of the helper function on platforms that need to apply it
* Fix building of file filters of multiple extensions for a file type

Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
greerdv c562f0a807 small improvements to triangle mesh rigid body warning
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
Terry Michaels 00b938b6a7
Merge pull request #4212 from ppinfel/component-doc-links
Fixes various component's help URL links to correct o3de.org page
4 years ago
Allen Jackson dcadfe6e1f
Feature json assetloading assethints (#4554)
* capture assets using SerializedAssetTracker in LoadInstanceFromPrefabDom()
assign assets using asset hints where the asset ID is not valid
switch up SerializedAssetTracker to store pointers instead of copies of Asset<>

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

* PoC for the AssetFixUp strategy


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

* clean up of PoC

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
FiniteStateGit 591854c384
Edit help menu lua documentation link (#4520) 4 years ago
Mikhail Naumov f43b3b9fbe Fixing crash creating new level when simulate mode is on
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Jeremy Ong e0a1164a92
Merge pull request #4424 from aws-lumberyard-dev/rgba16f/AZJobToIdle
Move Job system towards being used for Idle tasks
4 years ago
Qing Tao e64b9d3536
ATOM-16320 Remove PVRTC and ETC compressor (#4557)
Signed-off-by: Qing Tao <qingtao@amazon.com>
4 years ago
rgba16f 4b92aa34b7 Updated with PR feedback. Created a common function to calculate the number of worker threads.
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
John 863a7c8382 Address PR comments.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
rgba16f a2c16fa24f adjust the default number of worker threads created by the TaskGraph & Job systems
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
AMZN-AlexOteiza d1947c68c9
Added extra output and callstack information for improving debugging automated tests (#4528)
Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>
4 years ago
hultonha 3d1ec83f78
Update naming to CameraInput types (#4527)
* rename public facing Pivot cameras to Orbit - previous rename was a mistake

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* some more comment and naming updates to improve camera documentation

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
hultonha 3f2881ea46
Simplify viewport interaction model reset functionality (#4524)
* simplify entity reset functionality

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove reference to removed shortcuts

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Nicholas Lawson 6c4e16eab8
Merge pull request #4512 from aws-lumberyard-dev/burelc/xcbInputTextEvents
Generate text input events during XCB key press handling
4 years ago
Chris Burel 8668d8b2fe [XCB] Avoid emitting text events when a key press does not generate text
Many keys will generate key press events but return an empty string from
`xkb_state_key_get_utf8`, like modifier keys, arrow keys, function keys,
etc. This checks if the string retrieved from such a key press is empty
before emitting an associated text event for it, to avoid notifying a
potentially large number of listeners about an empty string.

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 3e0535e211 [XCB] Add tests to cover text events from key presses
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
puvvadar 397fd79b70 Reworking DeltaSerializer to no longer require string based hashes
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
Chris Burel b1b52c201f [XCB] Add test fixtures for xcb connection and keyboard setup
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel ba48426750 [XCB] Generate raw text events as well as key press events
Fixes LYN-6997

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel ee5ab1770b [XCB] Respond to keyboard state changes
This allows the keyboard to correctly store modifier keys, as the keyboard
state changes.

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Junbo Liang 4f51b53558
[GameLift][FlexMatch] Update session interface for clients to make matchmaking requests (#4450)
* [GameLift][FlexMatch] Update session interface for clients to make matchmaking requests

Signed-off-by: Junbo Liang <junbo@amazon.com>
4 years ago
Esteban Papp 8928c90cc4
Makes Editor depend on LuaIDE (#4514)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
rgba16f 49dd0d6331 Update with PR feedback. Use direct ratio on hardware concurrency with a set min and an a number excluded for O3DE threads
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
hultonha a40af98394
Add focus camera and custom camera input (#4493)
* add focus camera and custom camera input

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* very minor tidy before publishing PR

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small updates after PR feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>
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
John 317d624f6c Minor formatting.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John 66f419e8e5 Merge branch 'development' into LYN-5265_state_tracker_impl 4 years ago
John 5308a0fbbb Remove redundant editor mode notifications.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
Nicholas Lawson 977d58e1a8
Update ZLIB min req osx ios and android to reasonable limits (#4473)
This also updates the name of the zlib library to uppercase ZLIB which conforms to normal CMake standards .
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
4 years ago
rgba16f be166d68b8 Reduce the default worker thread priority for the Job system, Job system is now aimed at long running or idle tasks
Add cvars to control the number of worker threads created by the TaskGraph and Job systems. The cvars are scales on the hw concurrency of the cpu.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
bosnichd e5a7315de4
Auto-expand input mappings. (#4501)
Signed-off-by: bosnichd <bosnichd@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
Danilo Aimini bb8971a3ad
LYN-5288 | Clicking on a Prefab in the viewport should select the entire Prefab and not an individual Entity (#4462)
* Setup work for the ContainerEntity SystemComponent and Interface.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce Container Entity Notification Bus

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce a proxy model to control open/closed state of entity containers. Register prefab containers as entity containers. Profit.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add open state to OnContainerEntityStatusChanged notification + improvements to comments.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix to notification trigger to include new arguments.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix issue where the Level container would not be expanded correctly. The Level container is now no longer a container entity (since we don't need to be able to close it).

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Revert the addition of an extra proxy layer (which was causing issues) and just move the container logic to the existing filter.
Fix bug in the dataChanged signal.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix column count in dataChanged signal to correctly update all column and fix visual glitches.
Limit container registration to the prefab WIP flag so that the changes can be submitted with an opt-in mechanism.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add doubleclick behavior on Outliner items - enters focus mode when double clicking on prefab containers.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* override sourceModel() to store pointer to avoid dynamic casting at every filterAcceptsRow call.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor comment fixes and nits

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Move container selection logic to a helper function in the ContainerEntityInterface to simplify reusing it in the near future.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Support lazy initialization for tests (since we do not load a level, the lazy initialization in OnEntityStreamLoadSuccess does not trigger)

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Alex Peterson df419a0990
Run get_python script when Python fails to load (#4482)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
sphrose 4a4c93f866
Terrain/sphrose/surface gradient list component (#4409)
* cherry-pick conflict fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Missed include file

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* cherry-pick merge fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* bug fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* compile fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* compile fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 14474dbac7
Swapped the order in which the engine.pak is searched (#4455)
* Swapped the order in which the engine.pak is searched

First the Project Cache Root folder is searched before falling back to
the Executable Directory

Removed the need for the engine.json and project.json in a project
release layout when a "Cache" directory exist at the root.
The project root uses the the first "Cache" directory it finds by scanning upwards as if fails to find a
project.json,
The engine root use the project root, if it fails to reconcile the
engine path using project.json "engine" key and the o3de_manifest.json
"engines_path" object.

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

* Removed Generation of the engine.json and project.json in Release
Install builds.

The project and engine path can be determined based on the Cache
directory location.

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

* Added missing space for enginePakOpened

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

* Adding missing endif() and bracket argument terminator.


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
hultonha ca26599f93
Remove legacy sandbox picking - no longer used (#4472)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Dennis Brakhane 7f75dc6dee
Fix "index out of range" error in AssetProcessor (#4324)
* Fix "index out of range" error

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

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

Fixes #2343

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

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

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

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

* add some sanity checks in debug mode

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

Signed-off-by: Dennis Brakhane <brakhane@gmail.com>
4 years ago
puvvadar 258fa765b5
Merge pull request #4431 from aws-lumberyard-dev/mp_handshake_conndata
Move handshake check to connection data
4 years ago
nggieber 0f5a347205 Merge branch 'development' into Prism/ShowRepoList 4 years ago
Stephen Tramer 678c9a9fe9
Merge pull request #4449 from FiniteStateGit/issue-913
AzCore/Ebus/Ebus.h: Fix docs urls Issue#913
4 years ago
puvvadar 55a10278c2 Merge branch 'development' of https://github.com/o3de/o3de into mp_handshake_conndata 4 years ago
nggieber 118834efde Added ability to list gem repos using CLI and integrated support into Project Manager
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
Scott Romero 1e4faca332
[development] Revived the statistical profiler (#4378)
- Removed unused RunningStatisticsManager.cpp
 - Updated stats profiler proxy to use budgets
 - Fixed and re-enabled stats profiler tests
 - Enabled StatisticalProfilerProxySystemComponent in runtime

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
lumberyard-employee-dm 0a8170f52a
Added IsDirectory function to SystemFile (#4454)
* Added IsDirectory function to SystemFile

This takes the implementation in LocalFileIO and uses it for SystemFile
and then just has LocalFileIO call the SystemFile implementation

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

* Fixed logic to detect the WinApi FILE_ATTRIBUTE_DIRECTORY attribute

Updated the FileIO.cpp test to use AZ::IO::Path and removed direct uses
of AZStd::string

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

* Adding googletest printers for string and Path classes

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

* Updated the SystemFile_WinAPI functions to use AZStd::to_wstring

This makes the the SystemFile function convert from UTF-8 to UTF-16

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Yaakuro 093f321b68
Fix issue that gives wrong results for running debugger (#4434)
* Fix issue that gives wrong results for running debugger

Signed-off-by: Yaakuro <y1@codeposer.net>

* Remove redundant part.

Signed-off-by: Yaakuro <y1@codeposer.net>
4 years ago
puvvadar 170a32d667 Merge latest to mp_handshake_conndata
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
kberg-amzn 5acb360fbb
Merge pull request #4253 from aws-lumberyard-dev/MigrationFixup
Migration fixup
4 years ago
Alex Peterson 555e95679d
Open CMake GUI from Project Manager (#4360)
This provides a fast way for engineers who want to configure -> generate -> open project in IDE -> build & run to do so without waiting for a potentially lengthy Project Manager build.

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
lumberyard-employee-dm c9608846a1
Updated the AssetProcessorManagerTest LockFileTest to check the Source… (#4459)
* Updated the AsetProcessorManagerTest LockFileTest to check the SourceFileNotificationMessage

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

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

* Changed SourceFileNotificationMessage cast to use azrtti_cast

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Steve Pham 6dcdb5787a
Fix release build errors on Linux/Mac (#4474)
* - Fix unused release warnings
- Fixed compile errors from missing includes
- Commented out missing AZ_ATOM_PROFILE_FUNCTION macro

Signed-off-by: Steve Pham <spham@amazon.com>

* Deleted AZ_ATOM_PROFILE_FUNCTION

Signed-off-by: Steve Pham <spham@amazon.com>

* Adding more unused errors from windows release build, and updates based on PR suggestions

Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
bosnichd 29b5f4c9e5
Added Floor, Ceil, and Round functions to AZ::Vector2/3/4 (#4470)
https://github.com/o3de/o3de/issues/4216
Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
jonawals d03273089e
Merge pull request #4433 from aws-lumberyard-dev/LYN-5265_state_tracker_impl
Change editor viewport mode tracker id from viewport to entity context.
4 years ago
John d5dcd3c74a Add explanatory comment to broadcast fixture.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
hultonha f0c66cfa6f
Remove references to legacy visibility system (#4441)
* remove look at interpolation position

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove visibility switch

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove references to object cache

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add some more asserts to catch code that should never run

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add missing [[maybe_unused]]

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* revert clang-format change

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
John 8c55107e07 ViewportEditorModeInfo to ViewportEditorModeTrackerInfo.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
Guthrie Adams aca5961eb7
Merge pull request #4376 from aws-lumberyard-dev/Atom/guthadam/material_editor_replace_modified_color_with_indicator
Replace modified property name highlighting with indicator icon in material editor and component inspectors
4 years ago
FiniteStateGit 49cfc67f61
AzCore/Ebus/Ebus.h: Fix docs urls Issue#913
Signed-off-by: FiniteStateGit <31811688+FiniteStateGit@users.noreply.github.com>
4 years ago
kberg-amzn 98e5a18e49 Fixes for API changes from most recent integrate
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Qing Tao 5f8e60f4bb
ATOM-16558 Buffer memory leak (#4444)
Fixed the memory leaking with ID3D12CommandAllocator in DX12 AsyncUploadQueue. Add reset for the ID3D12CommandAllocator when the commandlist was executed.
Fixed another small memory leak in NativeWindow.

Signed-off-by: Qing Tao <qingtao@amazon.com>
4 years ago
nvsickle 305a4e083a Merge remote-tracking branch 'upstream/development' into nvsickle/OutlinerDuplicateEntryFixes 4 years ago
kberg-amzn bf136a567b Some shutdown crash fixes, reverted a whitespace, and added some basic unit tests for time additions
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Guthrie Adams 050de68f7d Merge branch 'development' into Atom/guthadam/material_editor_replace_modified_color_with_indicator
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

# Conflicts:
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h
4 years ago
Esteban Papp f3e6adce7f
LYN-6882 release builds are executing code in asserts (#4305)
* adding Windows/release to PR-validation builds

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

* changing trace back to expand to nothing for release

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

* typo

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

* more fixes

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

* fixing some more unused variable cases

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

* renaming file in ScriptCanvas that causes a msbuild warning

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

* reverting a previous change

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Mikhail Naumov 7018f16088
Fixing undo/redo not updating transform pivot point (#4375)
* Fixing undo/redo not updating transform pivot point

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* PR feedback

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* PR feedback

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* fixing non-redo operations to still use batching (fixes some tests)

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
puvvadar a18655e8f7 Update jinja change to use booleanTrue filter
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
lumberyard-employee-dm 18b947fd00
Changed the AssetManager DispatchEvents function to continously pump the (#4432)
AssetBus of queued functions until empty.

This replicates the old behavior of the EBusQueuePolicy::Execute
function that would continue to execute functions if new ones were added
during the execution of the current queue.

Split the TestFixture class from the AssetHandler and EBus handler for the DynamicSliceInstanceSpawnerTests and
PrefabInstanceSpawnerTest.
This avoids the AssetMananager destructor from deleting the test fixture
if the call to UnregisterHandler is ever removed. This also allows the
memory allocators to get online earlier.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
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
kberg-amzn 865ed60007 merging latest dev
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
SJ b984335b30
[Android] Fix black screen on Android when app is launched (#4418)
* When copying the runtime dependency setreg files to the cache, the name of the registry directory should be all lower case

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

* Lower case the registry folder name when looking in the asset cache.

Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
Esteban Papp bf393ec85c
fixes some install paths issues in monolithic release (#4422)
* fixes some install paths issues in monolithic release

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

* PR comments

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

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

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

* Make ArchiveComponent use AZ::IO::IArchive

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

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

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

* Updates AZStd::thread constructors

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

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

* Async operation of ArchiveComponent api

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

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

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

* Removes the platform-specific ArchiveComponen

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

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

* Removes the platform-specific files from cmake

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

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

This tool is no longer needed in the repo.

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

* Fixes usage of IArchive::GetFullPath()

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

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

* Fix promises and threads

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

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

* More edits to thread creation

Changes to thread construction to account for parameter change.

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

* Fix some remaining issues with ArchiveComponent

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

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

* Fixes some remaining bugs in ArchiveComponent

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

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

* Fix initialize of opaque thread handle in thread_UnixLike.h

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

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

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

* Fix some issues with archives

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

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

* Adds some new ArchiveComponent unit tests

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

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

* Fix file data offset issues when opening archives

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

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

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

* Addresses PR feedback

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

* Address more points of feedback in PR

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

* Address additional PR feedback

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

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

* Address PR feedback

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

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

* Disabling the ArchiveComponent tests on Linux

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

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

* Rename a member variable to be more accurate

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

* Address feedback on PR

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

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

* Revert recent changes

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

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
John 10c7ef7147 Change editor viewport mdoe tracker id from viewport to entity context.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
SergeyAMZN b1fd428a99
Merge pull request #4413 from aws-lumberyard-dev/LYN-5265_state_tracker_impl
Add call sites for activating/deactivating ViewportEditorMode::Focus
4 years ago
puvvadar f6638420f0 Formatting fix up
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
puvvadar 2811a84187 Move did handshake logic to connection data plus an optimization
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
rgba16f [Amazon] e1c49e436d
convert atom to task graph (#4230)
* Intial attempt to convert the Atom/RHI/FrameScheduler to use the new TaskGraph api

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Avoid enqueuing work on the active task thread if the submitted task
graph is waitable

When submitting a task graph, supplying a wait event implies that
dependent jobs must occur on threads that do not wait on the event (in
the absence of work stealing). This change prevents this by adding a
notion of a task thread enable/disable state, and prohibiting dependent
jobs from being enqueued on waiting threads.

Signed-off-by: Jeremy Ong <jcong@amazon.com>

* Convert RPI/Scene to use TaskGraph pass 1, Culling jobs remain on the old system

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* RemoveTask Graph changes from the FrameScheduler::ExecuteGroups, use old job system instead

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Per review, removing commented out code

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Cleanup debug code, & build fix

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Add a cvar & interface to query whether to use jobs or task graph

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Make TaskGraph assert if you try to wait inside a job

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix TaskTest SpawnSubgraph to account for the new TaskGraphEvent assert on wait in a running task

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* 3 minor cleanups. 1) Events always store a ptr to their executor 2) Fix clang compile error 3) remove an early out.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix double group end that was causing assert/crash plus misc minor diff's with development

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix deallocation failure on deactivation of the TaskGraphSystemComponent. Also make the system component account for multiple creation in Unit Tests.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update with PR feedback
1) Rename UseTaskGraph to IsTaskGraphActive & update related code
2) prefer TaskExecutor::SetInstance
3) add comments and remove commented out code

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix incorrect RTTI name for TaskGraphActiveInterface

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Move TaskGraphSystemComponent CRC calculation to a shared variable

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

Co-authored-by: Jeremy Ong <jcong@amazon.com>
4 years ago
carlitosan 8a1af282c4
Merge pull request #4419 from aws-lumberyard-dev/carlitosan/bugfix
Fix unused variables in property list, and set ed_useNewAssetBrowserTableView  to false by default
4 years ago
nvsickle 2d0b969065 Re-enable orphaned test
Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
chcurran 5fe4d8043d set ed_useNewAssetBrowserTableView to false by default
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Chris Galvan 8581b30260
Merge pull request #4274 from aws-lumberyard-dev/daimini/FocusMode/breadcrumbs
LYN-5303 | Focus Mode - Add breadcrumb of the prefab hierarchy path when entering into the prefab editing mode
4 years ago
Chris Burel aa8594b491
Add a unit test for `XcbInputDeviceKeyboard` (#4393)
* Use XcbUniquePtr to manage xcb resources

Signed-off-by: Chris Burel <burelc@amazon.com>

* Add a unit test for XcbInputDeviceKeyboard

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Danilo Aimini 225d9d3b3c Fixes to unit tests after merge
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini d3bc7d8f12 Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeTests.cpp
#	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp
4 years ago
bosnichd 3635e5ed35
Put the ShaderMetrics.json in the @user@ folder, plus an unrelated #include path fix. (#4402)
Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
Danilo Aimini 8d67f184c8
LYN-7008 | Focus Mode - Selection unit tests (#4357)
* Refactor existing tests and fixtures, split them up in more granular tests, and add more comments.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Refactor test fixture for FocusMode to make it more reusable

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fixture rename, draft of selection test

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Split SetFocus and ClearFocus tests for Editor Focus Mode

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Move BoundsTestComponent to its own file so that it can be reused in Focus Mode Selection tests

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Making progress on selection test. Test compiles now, but selection doesn't seem to be working.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Removed commented out code from previous iteration.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Move BoundsTestComponent under the UnitTest namespace

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Viewport selection tests + minor fixes.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor fixes

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
puvvadar bee4346df8
Merge pull request #4401 from aws-lumberyard-dev/mp_unit_test_pass1
Quick updates to AzNetworking unit tests
4 years ago
John cfbe76fdf6 Add call site for activating/deactivating Focus.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
lumberyard-employee-dm b1c82fc045
Updated references to Engine.pak to be lowercase engine.pak (#4397)
* Updated references to Engine.pak to be lowercase engine.pak

This makes the engine.pak file consistent with naming scheme of other pak files such as assets.pak.

It will also help avoid issues with mounting the file on Linux.

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

* Engine.pak now loads correctly in release builds. The check for the file existing was failing in release builds because it was only checking inside packs. OpenPack first checks if the file exists, anyways, so it was safe to remove.

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

Co-authored-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
4 years ago
srikappa-amzn ffbc3f1c80
Fix a bug in recursion of prefab links when checking for dirty prefabs (#4392)
* Fix a bug in recursion of prefab links when checking for dirty prefabs

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

* Added a missing EntityId header

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
Danilo Aimini 4d368fe329 Fix to capitalization in include via the UI
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini 7b1d98535d Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs 4 years ago
jonawals fa47b35580
Call sites for activating/deactivating viewport editor modes. (#4265)
* Provisional impl and testing of central state tracker.

Signed-off-by: John <jonawals@amazon.com>

* Add missing namespace comment.

Signed-off-by: John <jonawals@amazon.com>

* ViewportEditorModeState -> ViewportEditorModes

Signed-off-by: John <jonawals@amazon.com>

* ViewportEditorModesTracker -> ViewportEditorModeTracker

Signed-off-by: John <jonawals@amazon.com>

* GetEditorModeState ->GetViewportEditorModes

Signed-off-by: John <jonawals@amazon.com>

* GetNumTrackedViewports -> GetTrackedViewportCount

Signed-off-by: John <jonawals@amazon.com>

* IsViewportStateBeingTracked -> IsViewportModeTracked

Signed-off-by: John <jonawals@amazon.com>

* Fix API comments.

Signed-off-by: John <jonawals@amazon.com>

* Delete hangover file.

Signed-off-by: John <jonawals@amazon.com>

* Delete more hangover files.

Signed-off-by: John <jonawals@amazon.com>

* Minor member name refactor.

Signed-off-by: John <jonawals@amazon.com>

* Refactor nonclemanture.

Signed-off-by: John <jonawals@amazon.com>

* Rename Enter/ExitMode to Register/UnregisterMode.

Signed-off-by: John <jonawals@amazon.com>

* Error and warning msgs now return AZ::Outcomes.

Signed-off-by: John <jonawals@amazon.com>

* Change all nomenclature to Activate/Deactivate for consistency.

Signed-off-by: John <jonawals@amazon.com>

* Change tense of notification bus methods.

Signed-off-by: John <jonawals@amazon.com>

* Fix malformed string format.

Signed-off-by: John <jonawals@amazon.com>

* Fix malformed string format (again).

Signed-off-by: John <jonawals@amazon.com>

* Fix Linux warning.

Signed-off-by: John <jonawals@amazon.com>

* Call sites for editor mode activate/deactivate.

Signed-off-by: John <jonawals@amazon.com>

* Move Component editor mode logic to ComponentModeCollection.

Signed-off-by: John <jonawals@amazon.com>

* Delete non-source data.

Signed-off-by: John <jonawals@amazon.com>

* Remove line breaks and forward declare class.

Signed-off-by: John <jonawals@amazon.com>

* Remove constructors without ViewportEditorModeTrackerInterface ptr.

Signed-off-by: John <jonawals@amazon.com>

* Add integration tests for viewport editor modes.

Signed-off-by: John <jonawals@amazon.com>

* Address PR comments.

Signed-off-by: John <jonawals@amazon.com>
4 years ago
SergeyAMZN 08e020f2b1
Merge pull request #4251 from aws-lumberyard-dev/nvsickle/RevertFrameTimer
Revert "Refresh rate driven rendering tick logic (#3375)"
4 years ago
amzn-sean 43748c37fd
update joints to use cluster viewport ui. (#4352)
also some joints Component mode cleanup.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
AMZN-Igarri 9eb9a13d99
Flipped CVar to activate the AssetBrowser Search View (#4370)
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
hultonha ab0aa4973f
Remove camera LookAtAfterInterpolation (#4391)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Danilo Aimini 742a84f587 Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs 4 years ago
Danilo Aimini 27c7e2dcb0 Add correct include in FocusModeInterface to fix non-Unity builds.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini ea3435a9bb Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs 4 years ago
Steve Pham 19bd934a43 Fix missing include for AZStd::unordered_set in AssetEditorBus.h
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago