Commit Graph

1151 Commits

Author SHA1 Message Date
Esteban Papp e2091f2451 Removes UIFrameworkAPI.cpp from AzToolsFramework
Removes aztoolsframework_win_files.cmake (aztoolsframework_windows_files.cmake is the actual used one)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:31:27 -08:00
Esteban Papp 643bc70c1e Remove ComponentPaletteModelFilter from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:31:22 -08:00
Esteban Papp f8f9b79f7c Removes ToolFileUtils_generic.cpp from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:31:17 -08:00
Esteban Papp 9aa2cbeaba Removes EditorOutlinerComponent from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:31:13 -08:00
Esteban Papp fc30667795 Removes ThumbnailDelegate from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:31:08 -08:00
Esteban Papp b3ba73db3b Removing unneded include form multiple files
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:30:50 -08:00
Esteban Papp bb129c3cd1 Removes TraceContextBufferedFormatter from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:30:42 -08:00
Esteban Papp 3d1560e558 removes Commands/EntityTransformCommand from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:30:37 -08:00
Esteban Papp 6a7553b682 Removes AssetBrowserProductThumbnail.cpp that is unused and duplicated by Code\Framework\AzToolsFramework\AzToolsFramework\AssetBrowser\Thumbnails\ProductThumbnail.cpp
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:30:33 -08:00
Esteban Papp 56802a3cfa removes LegacyCommand from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:30:28 -08:00
Esteban Papp c62c63295f Removes SortFilterProxyModel from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:30:19 -08:00
Esteban Papp 30f7f71111 Remves AssetBrowserBus.inl from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:30:15 -08:00
Esteban Papp 7029135daa Removes AssetBrowserBus.inl from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:30:10 -08:00
Esteban Papp 3c0fa8cb5c Removes NullArchiveComponent from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:30:06 -08:00
Esteban Papp 223fe64d25 Removes EditorVegetationRequestsBus from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:29:57 -08:00
Esteban Papp 0af1adbf2f Removes newoverride.inl from AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-20 15:28:24 -08:00
Nicholas Van Sickle 687a3f1092 Merge pull request #7013 from aws-lumberyard-dev/mnaumov/FixingEOOrdering_signofffix
Fixing entity outliner order when creating prefab
2022-01-20 13:09:03 -08:00
Steve Pham 59e43813f0 GCC Support for Linux
Updates and fixes to support GCC for Linux

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-20 13:00:02 -08:00
Mikhail Naumov f7c120b4b7 PR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2022-01-19 15:15:15 -06:00
Mikhail Naumov 3506a39759 Merge branch 'mnaumov/FixingEOOrdering' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/FixingEOOrdering_signofffix
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2022-01-19 15:01:21 -06:00
Ignacio Martinez 65a749494e Fix: Entity Outliner: Outliner is unusable with the Editor in slice mode (#6983)
* Fixed vertical offset

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

* Fixed QPoint

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

* Fixed Entry delegate

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

* SetRenderHint in Entry delegate

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

* Save and restore painter inside the highlighter

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

* Restoring Painter

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

* Removed comment

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
2022-01-19 16:45:52 +00:00
Guthrie Adams 843ca5a0ad Merge pull request #6960 from aws-lumberyard-dev/Atom/guthadam/atom_tools_shared_asset_browser
Atom Tools: moving custom asset browser code to common location
2022-01-19 09:37:09 -06:00
Guthrie Adams eb51cd4c06 Atom Tools: moving custom asset browser code to common location
Consolidated duplicate asset browser code from multiple tools into single class in atom tools framework
Moved creation of asset browser and Python terminal windows into base main window class
Fixed docked window orientations
Added checks to asset browser to prevent crashes if tree state saver was null

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-18 18:05:23 -06:00
Ignacio Martinez c1bbe3806d Asset Browser Search Entries Highlight (#6133)
* Adding hilight to search entries

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

* Delegate Cleanup

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

* delegate cleanup

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

* General cleanup

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

* reformatting file

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

* Updated Comments

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

* Abstracted richText functions

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

* Extracting highlighting behavior

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

* Added highlighter to the entity outliner

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

* Addressed Code Review Comments

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

* Switched to static functions

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

* changed variable name

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

* Removed unused variable

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

* Apply changes to the Entity Outliner Model

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

* Removed duplicated line

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
2022-01-18 12:29:06 +00:00
Jeremy Ong 7e5e4842b0 Merge pull request #6676 from aws-lumberyard-dev/Atom/mriegger/format
Remove 'INF' from integer widget and replace it with better formatted…
2022-01-13 17:18:57 -07:00
Nicholas Van Sickle 74e4055195 Fix Prefab instance assets not preloading (#6834)
PrefabCatchmentProcessor::ProcessPrefab was no longer updating the ProcessedObjectStore's referenced object list, this change exposes the referenced asset list in the new PrefabDocument API and uses them to update the referenced asset list.

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
2022-01-12 15:23:06 -08:00
srikappa-amzn 13bc91aa77 Split editor entity activation from PrefabSystemComponent (#6787)
* Split editor entity activation from PrefabSystemComponent

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Fixed a small typo

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Pass entity activation callback during prefab instantiation for failing tests

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>
2022-01-11 16:53:46 -08:00
srikappa-amzn d3a99235aa Fix undo for create editor entity (#6785)
* Avoid undoing twice when undo is hit for CreateNewEditorEntity

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Moved an assert immediately after entity creation

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>
2022-01-10 17:01:50 -08:00
Michael Pollind 8503915cdd bugfix: correct mouseMove under AzToolsFrameworkHelper (#6493)
* bugfix: correct mouseMove under AzToolsFrameworkHelper

REF: https://github.com/o3de/o3de/issues/6481
Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: added unit test

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

* chore: address comments

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

* chore: correct fixture

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

* chore: tweak mouse move logic

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

* updates to track mouse/cursor position via events instead of using QCursor::pos()

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

* rename AzToolFrameworkTestHelperTest.cpp to AzToolsFrameworkTestHelpersTest.cpp

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

Co-authored-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2022-01-07 14:43:34 +00:00
Tom Hulton-Harrop 1a8b7aeb48 Small workaround and fix to ensure line fade (alpha) displays correctly (#6733)
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2022-01-07 09:37:33 +00:00
sphrose 98b0f206a0 Merge pull request #6705 from aws-lumberyard-dev/3495_preferences_panel_update
3495 Preferences panel update: fix richtext elision and allow html links
2022-01-07 08:52:45 +00:00
AMZN-koppersr e2a960e442 Fixed a sync issue when a PrefaDOM was taken from a PrefabDocument.
When a PrefabDOM was taken from a PrefabDocument the Instance would continue to have the data from the original Prefab, which means they'd no longer be in sync as the Prefab would be empty. This was fixed by resetting the Instance so they're both clear.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2022-01-05 17:21:15 -08:00
AMZN-koppersr 13375cd7d9 Merge branch 'development' into Prefabs/ProcessStackAddPrefabBug 2022-01-05 11:12:57 -08:00
AMZN-koppersr 31e51f8c3a Minor updates to the Spawnable Entity Aliases in response to PR feedback.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2022-01-05 10:47:23 -08:00
mrieggeramzn 8ed3da5b7f Adding header file
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2022-01-05 10:24:53 -08:00
sphrose 783a04b880 3495 Preferences panel update: fix richtext elision and allow html links
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
2022-01-05 18:00:07 +00:00
mrieggeramzn 30e21bc2d1 Updating formatting
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2022-01-04 14:52:00 -08:00
mrieggeramzn a891993c35 Remove 'INF' from integer widget and replace it with better formatted integers. Also fix warning message with invalid param
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2022-01-04 09:58:30 -08:00
Chris Galvan e09a4d20d3 Merge pull request #6240 from tjmgd/bug-keyword-prefab-23
Fix for bug in entity outliner search box
2021-12-27 13:12:08 -06:00
tjmgd a6240ff6bc Editor issue after clicking Find Layer in Asset Browser and (#6327)
Find Slice in Asset Browser in Slice mode

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
2021-12-22 11:51:33 -08:00
tjmgd 33495e4858 Slice save path incorrect, and error message incomplete (#6214)
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
2021-12-22 11:32:14 -08:00
tjmgd 3f766629bc Lua Editor log - text ghosted (#6329)
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
2021-12-22 09:36:34 -08:00
AMZN-koppersr 34edd4d0c0 Fixed post rebase Spawnable issues.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-12-16 18:06:25 -08:00
AMZN-koppersr 43c42f63c6 Cleaned up some unused code in the Prefab processor.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-12-16 16:01:04 -08:00
AMZN-koppersr 7b5868d198 Added additional functions to edit prefabs during processing to PrefabDocument.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-12-16 16:00:54 -08:00
AMZN-koppersr b8e3b27ea9 Added a PrefabDocument for Prefab to simplify working with Prefabs during conversion to spawnables.
The new PrefabDocument handles the Prefab and the Instance. This reduces the number of times the Instance has to be reloaded from the Prefab and keeps the entity ids stable between steps. The intention is for all the PrefabDocument to conceptually manipulate the Prefab DOM, although behind the scenes it will manipulate the Instance for now. The Instance should only be directly used in case the PrefabDocument doesn't provide the functionality yet.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-12-16 16:00:00 -08:00
AMZN-koppersr 9def902e1c Fixes up parents for entities that are moved to another Prefab.
This fixes issues with entities that are moved to another Prefab and have a parent that was also moved to the same Prefab. Entities that have their parent moved to another Prefab continue to work as is because a placeholder entity is always left behind. Entities that are moved to another Prefab but have a parent that's still in the original Prefab will currently not work correctly. This will be a addressed in a future commit.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-12-16 15:35:51 -08:00
AMZN-koppersr 76a913882c Resolving links in the Prefab Processing Stack now also makes sure that entity ids of aliased entities are appropriately unique or match.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-12-16 15:35:47 -08:00
AMZN-koppersr cbea11c452 Minor performance optimization to Prefab Instance.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-12-16 15:35:43 -08:00
AMZN-koppersr 7e38a5f35c Fixed entity registration issue when setting up Spawnable Entity Aliases.
In some cases entities created for use as a Spawnable Entity Alias would share an entity id with their original. This is no longer working due to a reverse lookup from an entity id to its PrefabDOM. Upon further investigation this turned out to not matter as instances that are created by the PrefabCatchmentProcessor would create new entity ids any way. This cause unexpected behavior at runtime as entity relations may be broken. This will be addressed in a future fix.
Testing the above also highlighted a possible double delete in the builder when aliases were registered. This has also been fixed.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-12-16 15:35:38 -08:00