birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,122 Commits 3 Branches 3 Tags
development
Commit Graph

4529 Commits

Author SHA1 Message Date
Mike Balfour bad4c1a276 Merge commit '8f56dc10c33ae73acaa99c8690e8bc91a1cec2bc' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:30 -05:00
Mike Balfour 122a28c4b4 Merge commit '1228738bb2da5ccf7e3d7a1219a90afab5189d6b' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:09 -05:00
Mike Balfour 9589bc050d Merge commit 'd3ff91f15346328e82e4e4fb293256ff3b026b1c' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:04 -05:00
Mike Balfour 402d4d664f Merge commit 'cf767fd4bd038e39512a0f193dfd7cb536a9700f' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:59 -05:00
Mike Balfour a7f364a5d6 Merge commit '65d23c7ed6b084ad58d03fb46e76793cac41d503' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:43 -05:00
Mike Balfour 5867ab6bde Merge commit 'b2a8e4056950398e13f2fe32f486d29733669a2b' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:12 -05: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
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>
 2021-11-01 14:52:40 -07:00
nggieber 2ae927c754 Fix minor indent issue 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-01 14:47:27 -07:00
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>
 2021-11-01 14:19:27 -07:00
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>
 2021-11-01 14:18:04 -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
AMZN-ScottR 9b39c63bba Merge branch 'development' into profiler_capture_api 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-01 11:43:19 -07:00
AMZN-ScottR 9057cfbcbf [profiler_capture_api] fixed release compile error 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-01 11:41:44 -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
Esteban Papp 8e420dad3d Removes some usage of DEDICATED_SERVER (#5119) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-01 08:46:26 -07:00
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>
 2021-11-01 14:51:15 +00: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
AMZN-ScottR 2d7c6af97c Merge branch 'development' into profiler_capture_api 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-29 17:21:29 -07:00
AMZN-ScottR 4721f44b92 [profiler_capture_api] more changes based on PR feedback 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-29 17:19:38 -07:00
chcurran 6c130c7a86 Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 2021-10-29 16:25:37 -07:00
AMZN-ScottR b2e6711196 [profiler_capture_api] fixed clang compile error 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-29 14:45:25 -07:00
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
 2021-10-29 22:32:33 +01: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 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>
 2021-10-29 12:03:34 -07:00
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>
 2021-10-29 11:28:42 -07:00
Esteban Papp 72d6f2972e Adding support for multi-config/multi-permutation installer 2021-10-29 10:46:28 -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 ca9093c202 Add engine name, folder and fix refresh crash (#5112) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-29 10:19:33 -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
Adi Bar-Lev 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
Michael Pollind f40191dd8c bugfix: resolve broken focus for viewport (#5059) 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-10-29 10:15:22 +01:00
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>
 2021-10-29 09:59:18 +01:00
Esteban Papp 475338cfad Merge branch 'development' into o3de_sdk/installer_configs 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-28 18:29:52 -07:00
Adi Bar-Lev 2a32d67830 Merge commit '6cce184340dbce9796234a67a0452d1088474945' into barlev/gitflow_211028_O3DE 2021-10-28 20:06:53 -04:00
Adi Bar-Lev 1488522236 Merge commit '00a49fa251121eeb13d28a5ff3cc466392ed3ad9' into barlev/gitflow_211028_O3DE 2021-10-28 20:06:42 -04:00
Adi Bar-Lev f25b80e172 Merge commit 'f350ba3042b216369748935800628118b835ca81' into barlev/gitflow_211028_O3DE 2021-10-28 20:06:36 -04:00