Commit Graph

989 Commits

Author SHA1 Message Date
daimini d0b6ae47ed Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
2021-05-17 13:26:04 -07:00
Mike Balfour d084027b6e Bugfixes to enable slice-to-prefab conversion to run with less warnings/errors/crashes (#768)
While trying to process all slices and levels in Automated Testing, a few bugs came up that needed to be addressed:
- [LYN-3832] TransformComponent had a field removed without updating the version number and converter, which caused a lot of excessive warnings
- SliceComponent would crash in debug builds on instantiation failures due to a null dereference that was guarded against in most but not all places
- SliceConverter now detects when nested slices exist and gracefully warns about it.
- InstanceUpdateExecutor / TemplateInstanceMapper will now immediately remove instances that are unregistered, so that any in the queue don't get processed on a subsequent tick.  This was causing crashes when the instance was destroyed before the processing occurred.  It also has a side benefit of preventing the same instance from executing multiple times.
- Minor logic bugfix to the pack close warning, the boolean check was flipped.

Also added an early-out on SetTemplateId, since this was causing some unnecessary instance queue entries.
2021-05-17 14:58:18 -05:00
Tom Hulton-Harrop f4106fe73f Add 'Goto entity' support for the new Editor camera (#743)
* add find entity in viewport functionality to new camera

* fix AZ_CVAR usage

* updates following review feedback

- updated comment styles from /// to //!
- retrieve fov of camera (add test for fov access)

* update namespace naming, fix AZ_CVAR usage

* update missed namespace and use AZ::Transform::CreateLookAt

* add missing include

* move EditorViewportSettings to EditorLib

* update DLL import/export API and rename namespace usage
2021-05-17 18:21:38 +01:00
igarri 61ac423ebd Deleted unused files 2021-05-17 16:04:43 +01:00
igarri b9c9811d35 Fixing qobject_cast to the StringFilter 2021-05-17 14:06:01 +01:00
greerdv 18a6134e2d Merge branch 'main' into non-uniform-scale-manipulators 2021-05-17 13:21:43 +01:00
greerdv 7edef63884 address PR feedback 2021-05-17 13:20:52 +01:00
puvvadar fb51829360 Resolve MP Gem Ctrl+G changes with main 2021-05-15 13:12:16 -07:00
puvvadar 1915b97c16 Cleanup server launch, misc. MP consts, and register Editor Spawnable assets server side 2021-05-15 12:58:30 -07:00
daimini 12760ef6a3 Remove unused container entity retrieval 2021-05-14 16:37:47 -07:00
srikappa-amzn 0cfc7f10a9 Merge pull request #728 from aws-lumberyard-dev/Prefab/CyclicalDependencyCheck
Detect cyclical dependencies in the nested prefabs of the prefab being instantiated
2021-05-14 16:33:13 -07:00
daimini 70c968f829 Fixes issue with relative positioning of children on Prefab creation. Makes CreateLink more generic to facilitate reuse. 2021-05-14 15:02:39 -07:00
greerdv d878932966 merge from main 2021-05-14 21:04:06 +01:00
srikappa 1a456cc9b9 Marked an our parameter correctly and changed a ref to const ref 2021-05-14 11:48:31 -07:00
greerdv f2d415ecb8 add functionality for central scale manipulator 2021-05-14 19:38:25 +01:00
nvsickle cc986f563a Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 2021-05-14 10:27:33 -07:00
srikappa-amzn f6767cec2f Merge pull request #751 from aws-lumberyard-dev/Prefab/DeletePrefab
Fixed bug with delete prefab where the prefabs were not being deleted from the correct instances
2021-05-14 09:52:58 -07:00
greerdv c8568a7cf2 add feedback from PR 2021-05-14 13:51:02 +01:00
greerdv 068deea918 remove unnecessary overrides 2021-05-14 13:31:25 +01:00
greerdv e9386bcb9b remove unecessary overrides 2021-05-14 13:29:54 +01:00
igarri d5591e52ff Merge branch 'main' into LYN-1767-AB 2021-05-14 13:12:29 +01:00
igarri cff9fea535 Switching views with filters 2021-05-14 13:09:14 +01:00
greerdv 737178b928 Merge branch 'main' into non-uniform-scale-manipulators 2021-05-14 12:08:10 +01:00
greerdv 5508bf7e1d remove unnecessary non-uniform scale manipulator bus 2021-05-14 12:06:44 +01:00
greerdv d365d00abd hook up non-uniform scale manipulator callbacks 2021-05-14 11:52:29 +01:00
srikappa b72836fa8f Fixed a typo 2021-05-13 18:03:49 -07:00
srikappa d8865a8f0d Remove links when deleting prefabs 2021-05-13 17:41:45 -07:00
srikappa 16b2dabde2 Removed additional spacing 2021-05-13 14:51:27 -07:00
srikappa 9328c944b2 Remove an unnecessary check in the if statement 2021-05-13 14:49:06 -07:00
srikappa 7d8180a3bb Fixed a typo 2021-05-13 14:46:30 -07:00
srikappa b92a68f5a4 Improved a comment 2021-05-13 14:45:06 -07:00
srikappa cd4be3a708 Found a better way to find common owning instance 2021-05-13 14:37:22 -07:00
srikappa 76e8a0ef47 Fixed bug with delete prefab where the prefabs were not being deleted from the correct instances 2021-05-13 14:11:47 -07:00
greerdv 41ea7a1b81 add stubs for non-uniform scale component mode 2021-05-13 20:52:29 +01:00
Tom Hulton-Harrop 795aa114e6 Improve selection in the viewport (#720)
* improve selection in the viewport

* remove debug code

* updates following review feedback

- update API comments from /// to //! from
- add [[nodiscard]] attribute to member function
- move constructor implementations to .cpp files

* use lambda instead of ternary operator

* fix unit test failure caused by typo
2021-05-13 16:19:53 +01:00
igarri 33240c9f90 Selecting assets from tableview 2021-05-13 16:08:14 +01:00
Hasareej a13c9e8d53 Hasareej lyn 2301 cluster space (#717)
ViewportUi widget anchoring & alignment update.
2021-05-13 14:23:31 +01:00
igarri d7ca3f273b croll to top on view when the filter updates 2021-05-13 13:25:03 +01:00
igarri d6868df735 Expanding TableView Columns 2021-05-13 12:29:16 +01:00
sphrose 36a79aca8a Remove redundant function. 2021-05-13 10:56:39 +01:00
greerdv ce3842ac84 Merge branch 'main' into non-uniform-scale-compatibility 2021-05-12 22:19:33 +01:00
srikappa-amzn 1895c2d18d Merge pull request #675 from aws-lumberyard-dev/Prefab/CreatePrefab
Get instantiation to work after creation of a prefab is undone
2021-05-12 13:54:26 -07:00
srikappa 7bdf44a099 Detect cyclical dependencies in the nested prefabs of the prefab being instantiated 2021-05-12 13:38:44 -07:00
greerdv 059f69e5e6 tidy up NonUniformScaleService compatibility 2021-05-12 21:20:23 +01:00
srikappa 98a579abef Added a comment 2021-05-12 12:17:36 -07:00
nvsickle 559798251d Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 2021-05-12 11:55:51 -07:00
bosnichd 7cec2d8b07 Remove more unused things from CryCommon and CrySystem. (#709)
Lots of unrelated removals, I basically tried to remove everything exposed via gEnv that isn't used anymore, and following the threads found a few other things to remove also.
2021-05-12 08:30:15 -06:00
igarri c1e21185b4 Selecting correct indexes from Asset Browser Model 2021-05-12 12:20:23 +01:00
igarri 80684b383b Code cleanup 2021-05-12 11:42:39 +01:00
igarri 1c990b2ef6 Filter Sorting Working 2021-05-12 11:03:02 +01:00