9589bc050d
Merge commit 'd3ff91f15346328e82e4e4fb293256ff3b026b1c' into mbalfour/gitflow_211102_o3de
2021-11-02 09:38:04 -05:00
402d4d664f
Merge commit 'cf767fd4bd038e39512a0f193dfd7cb536a9700f' into mbalfour/gitflow_211102_o3de
2021-11-02 09:37:59 -05:00
5867ab6bde
Merge commit 'b2a8e4056950398e13f2fe32f486d29733669a2b' into mbalfour/gitflow_211102_o3de
2021-11-02 09:37:12 -05:00
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 >
2021-11-02 09:19:06 +00:00
bf6fd2a6d6
Add missing reflection calls for various types ( #5163 )
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-11-02 09:18:42 +00:00
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 >
2021-11-01 14:18:04 -07:00
f7a48fda11
Added a missing function comment for UpdatePrefabInstances function
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-11-01 11:41:05 -07:00
729a79dc82
Revert "Fixing undo/redo not updating transform pivot point ( #4375 )"
...
This reverts commit 7018f16088srikappa@amazon.com >
2021-11-01 11:39:04 -07:00
1025eb3929
Revert "Delay propagation for all template updates in detach prefab workflow ( #4707 )"
...
This reverts commit 87533d80c1srikappa@amazon.com >
2021-11-01 11:39:01 -07:00
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 >
2021-11-01 10:35:32 -07:00
d3ff91f153
Fixed memory leak of the in the AssetBrowserComponent ( #5132 )
...
Signed-off-by: igarri <igarri@amazon.com >
2021-11-01 12:16:00 +00:00
cf767fd4bd
Fix for 'focus' text appearing incorrectly ( #5133 )
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-11-01 09:33:38 +00:00
66612cac28
Merge pull request #5116 from aws-lumberyard-dev/barlev/gitflow_211028_O3DE
...
Barlev/gitflow 211028 O3DE
2021-10-29 10:00:14 -04:00
f40191dd8c
bugfix: resolve broken focus for viewport ( #5059 )
...
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-10-29 10:15:22 +01:00
8dca689444
Merge commit 'caf247fcab0fc65773c6a95f1bbcfe10b184c5e0' into barlev/gitflow_211028_O3DE
2021-10-28 20:06:25 -04:00
b2a8e40569
Merge pull request #5100 from aws-lumberyard-dev/cgalvan/GemplateImprovements
...
Improvements to C++/Python tool gemplates
2021-10-28 17:20:07 -05:00
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 >
2021-10-28 13:53:53 -07:00
e56396a817
Improvements to C++/Python tool gemplates
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-10-28 14:30:14 -05:00
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 >
2021-10-28 13:58:47 -05:00
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 >
2021-10-28 10:15:12 -07:00
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 >
2021-10-28 10:14:58 -07:00
1435d8b096
Merge branch 'development' of https://github.com/o3de/o3de into daimini/gitflow_211027_o3de
2021-10-27 14:18:01 -07:00
59c898fc48
Fix notification queue and add gem action ( #4985 ) ( #5024 )
...
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com >
2021-10-27 13:55:32 -07:00
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 >
2021-10-27 12:46:06 -07:00
732b8c2d1b
Merge commit 'd332f7c4c70343d7e1a8ca72723ac99ebdd30ca6' into daimini/gitflow_211027_o3de
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-10-27 11:22:58 -07:00
bc844dc6c9
Merge commit 'a2eca9de3d2e5abca3d5f52f58ff6afd613d8d0d' into daimini/gitflow_211027_o3de
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-10-27 11:22:00 -07:00
657b1026b5
Merge commit '1bc2968330c7f700759d68b4b4a8e59d81007027' into daimini/gitflow_211027_o3de
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-10-27 11:21:27 -07:00
f960d6466c
Merge commit '3b4b8c354903f6c0fb9b579b13ae5d336c761382' into daimini/gitflow_211027_o3de
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-10-27 11:21:17 -07:00
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 >
2021-10-27 10:28:22 +01:00
7a0246530a
Fix notification queue and add gem action ( #4985 )
...
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com >
2021-10-26 14:37:47 -07:00
78b0683313
Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-10-26 15:47:17 -05:00
a2eca9de3d
Merge pull request #4998 from aws-lumberyard-dev/LYN-5265_state_tracker_impl
...
Add Focus Mode integration tests.
2021-10-26 17:16:25 +01:00
c2105b0631
Address PR comments.
...
Signed-off-by: John <jonawals@amazon.com >
2021-10-26 15:30:08 +01:00
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 >
2021-10-26 10:29:12 +01:00
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 >
2021-10-25 17:47:54 -07:00
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 >
2021-10-25 15:12:34 -07:00
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 >
2021-10-25 13:26:53 -05:00
f98d2e55aa
Refactor component mode query.
...
Signed-off-by: John <jonawals@amazon.com >
2021-10-25 13:48:36 +01:00
99b840652d
Add Focus Mode integration tests.
...
Signed-off-by: John <jonawals@amazon.com >
2021-10-25 13:40:12 +01:00
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 >
2021-10-25 10:35:50 +01:00
efbf2f224e
Merge pull request #4913 from aws-lumberyard-dev/cgalvan/AddFindComponentsByServiceAPI
...
Added API for finding components based on required/incompatible services
2021-10-22 14:38:21 -05:00
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 >
2021-10-22 12:37:43 -07:00
476ff637c2
Undo P4 check before spawning thread and fix usage of new AzToolsApplication trait ( #4894 )
...
Signed-off-by: Steve Pham <spham@amazon.com >
2021-10-22 09:47:39 -07:00
1989316cac
Added toast notifications to the gem catalog
2021-10-22 09:11:28 -07:00
95c2ee0e9d
Added API for finding components based on required/incompatible services.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-10-22 10:30:48 -05:00
f3af362ede
Merge pull request #4838 from aws-lumberyard-dev/LYN-7562
...
Make safe asset folder comparison for prefab creation to be case insensitive
2021-10-21 14:37:53 -07:00
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 >
2021-10-21 13:43:21 -07:00
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 .
2021-10-21 12:08:00 -07:00
33490ed6df
Avoided a string copy by using path view
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-10-21 11:42:41 -07:00
4ed73a0b91
Use case insensitive folder path comparison for creating slices
...
Signed-off-by: srikappa-amzn <srikappa@amazon.com >
2021-10-21 09:11:11 -07:00
Mike Balfour
hultonha
AMZN-koppersr
srikappa-amzn
Michael Pollind
AMZN-Igarri
Adi Bar-Lev
Chris Galvan
Guthrie Adams
Danilo Aimini
Alex Peterson
srikappa-amzn
jonawals
galibzon
Steve Pham
Nicholas Van Sickle
chiyenteng