birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,879 Commits 3 Branches 3 Tags
d284d908b9409df175207de45dba3eb41ff93b35
Commit Graph

3444 Commits

Author SHA1 Message Date
Mike Balfour d106c9aba5 Merge pull request #5174 from aws-lumberyard-dev/Prefab/RevertImmediatePropagation 
Prefab/revert immediate propagation
 2021-11-02 10:59:17 -05:00
AMZN-Phil a187ee09a1 Merge pull request #5093 from aws-lumberyard-dev/Prism/SearchForGemsFromTags 
Scroll to and Select Gem When Gem Tag is Clicked
 2021-11-02 08:27:13 -07:00
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>
 2021-11-02 09:19:06 +00:00
hultonha 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
Alex Peterson 49da85ca3a Fix new project path when enabling gem (#5173) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-01 16:07:57 -07:00
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>
 2021-11-01 14:56:24 -07:00
nggieber 2ae927c754 Fix minor indent issue 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-01 14:47:27 -07:00
Chris Burel 8f56dc10c3 Perform sse float comparisons with the floating-point intrinsics (#5115) 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-01 16:11:34 -04:00
Danilo Aimini d948d78b2e Merge pull request #5170 from aws-lumberyard-dev/daimini/cherrypick/outlinerEntityOrderingFix 
Cherry-pick: resolve entity ordering for EntityOutliner
 2021-11-01 12:41:58 -07:00
srikappa-amzn 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
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>
 2021-11-01 11:39:04 -07:00
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>
 2021-11-01 11:39:01 -07:00
Alex Peterson 259ee654ae WIP refresh gem catalog in place 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-01 11:18:38 -07:00
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>
 2021-11-01 10:35:32 -07:00
Guthrie Adams 7ba7928559 Removing redundant registration of script assets 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-01 11:19:08 -05:00
AMZN-Igarri 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
hultonha cf767fd4bd Fix for 'focus' text appearing incorrectly (#5133) 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-11-01 09:33:38 +00:00
nggieber 858e287b1f Removed unused set filter function 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-29 13:37:58 -07:00
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>
 2021-10-29 13:20:11 -07:00
Alex Peterson 781eaabd94 Access gem repos from catalog non-destructively 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-29 12:05:42 -07:00
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>
 2021-10-29 10:38:11 -07:00
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>
 2021-10-29 09:21:20 -07:00
Alex Peterson b4dd4c8f02 Add engine name, folder and fix refresh crash (#5112) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-29 09:20:52 -07:00
Chris Galvan 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
Alex Peterson 6cce184340 Enforce unique gem names in catalog (#5063) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-28 14:33:24 -07:00
Alex Peterson 00a49fa251 Use source model data instead of filtered (#5071) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-28 12:53:54 -07:00
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>
 2021-10-28 12:49:33 -07:00
Chris Galvan e56396a817 Improvements to C++/Python tool gemplates 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-10-28 14:30:14 -05:00
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>
 2021-10-28 13:58:47 -05:00
nggieber 37243c74ec Make gem tags clickable and filter by their text in the Gem Catalog when clicked 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-28 09:21:56 -07:00
nggieber 8117798949 Removed gem repo enable button 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-28 07:00:21 -07:00
greerdv 9b2afbc39b fix explicit qualification of member function addresses 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-10-28 12:51:33 +01:00
greerdv dd0780f6ec make sure joint frame rotations are editable for ragdoll setup 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-10-28 12:26:05 +01:00
Alex Peterson 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
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
 2021-10-27 09:28:16 -07:00
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
 2021-10-27 09:28:06 -07:00
Chris Galvan 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
AMZN-Phil 856318005c Merge pull request #5000 from aws-lumberyard-dev/Prism/RemoteGemWarning 
Adds Warning to Add Repo Dialog
 2021-10-26 11:01:02 -07:00
nggieber 866fd8a420 Fix selected gem filtering 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-26 09:46:54 -07:00
jonawals 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
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>
 2021-10-26 08:56:37 -07:00
nggieber 3ff469c55e Fix issue with project still displaying when last project is removed 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-26 08:42:22 -07:00
AMZN-Phil 6b3fc0ff8b Merge pull request #4981 from aws-lumberyard-dev/Prism/gemdownloadcallfix 
Re-add call used to initiate gem download
 2021-10-26 08:31:03 -07:00
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>
 2021-10-26 08:30:51 -07:00
nggieber 77d05b0bc9 Merge branch 'stabilization/2110' into Prism/RemoteGemWarning 2021-10-26 07:39:56 -07:00
John c2105b0631 Address PR comments. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-26 15:30:08 +01:00
nggieber 75ebf77b59 Added warning message when adding repositories 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-26 07:22:47 -07:00
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>
 2021-10-25 17:47:54 -07:00
AMZN-Phil 423693d16b Re-add call used to initiate gem download 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-25 16:05:19 -07:00
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>
 2021-10-25 15:12:34 -07:00