977030a27a
On prefab creation, inherit the patches when moving the nested prefab instances and then update the link with the new parent if necessary.
2021-05-18 17:53:27 -07:00
a4953a5204
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
...
# Conflicts:
# Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
2021-05-18 15:04:34 -07:00
bb458254a2
Polish pass - rename arguments to be more generic, add comments, restore patches to links during instantiation that were mistakenly removed in previous changes.
2021-05-18 14:52:30 -07:00
761a77a436
Avoid creating a new list for non-container top level entities
2021-05-17 18:51:23 -07:00
eb873f246a
Merge branch 'main' into Prefab/CreatePrefab
2021-05-17 17:13:02 -07:00
45074c651a
Fix bugs with creating prefabs with nested entities
2021-05-17 17:10:50 -07:00
bcaf4209d5
Move some logic to a helper function. Revert order of link creation operations as they are not necessary to fix the bug, so it is preferred to leave them untouched.
2021-05-17 15:39:25 -07:00
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
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
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
18a6134e2d
Merge branch 'main' into non-uniform-scale-manipulators
2021-05-17 13:21:43 +01:00
7edef63884
address PR feedback
2021-05-17 13:20:52 +01:00
12760ef6a3
Remove unused container entity retrieval
2021-05-14 16:37:47 -07:00
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
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
d878932966
merge from main
2021-05-14 21:04:06 +01:00
1a456cc9b9
Marked an our parameter correctly and changed a ref to const ref
2021-05-14 11:48:31 -07:00
f2d415ecb8
add functionality for central scale manipulator
2021-05-14 19:38:25 +01:00
cc986f563a
Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay
2021-05-14 10:27:33 -07:00
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
c8568a7cf2
add feedback from PR
2021-05-14 13:51:02 +01:00
068deea918
remove unnecessary overrides
2021-05-14 13:31:25 +01:00
e9386bcb9b
remove unecessary overrides
2021-05-14 13:29:54 +01:00
737178b928
Merge branch 'main' into non-uniform-scale-manipulators
2021-05-14 12:08:10 +01:00
5508bf7e1d
remove unnecessary non-uniform scale manipulator bus
2021-05-14 12:06:44 +01:00
d365d00abd
hook up non-uniform scale manipulator callbacks
2021-05-14 11:52:29 +01:00
b72836fa8f
Fixed a typo
2021-05-13 18:03:49 -07:00
d8865a8f0d
Remove links when deleting prefabs
2021-05-13 17:41:45 -07:00
16b2dabde2
Removed additional spacing
2021-05-13 14:51:27 -07:00
9328c944b2
Remove an unnecessary check in the if statement
2021-05-13 14:49:06 -07:00
7d8180a3bb
Fixed a typo
2021-05-13 14:46:30 -07:00
b92a68f5a4
Improved a comment
2021-05-13 14:45:06 -07:00
cd4be3a708
Found a better way to find common owning instance
2021-05-13 14:37:22 -07:00
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
41ea7a1b81
add stubs for non-uniform scale component mode
2021-05-13 20:52:29 +01:00
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
a13c9e8d53
Hasareej lyn 2301 cluster space ( #717 )
...
ViewportUi widget anchoring & alignment update.
2021-05-13 14:23:31 +01:00
ce3842ac84
Merge branch 'main' into non-uniform-scale-compatibility
2021-05-12 22:19:33 +01:00
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
7bdf44a099
Detect cyclical dependencies in the nested prefabs of the prefab being instantiated
2021-05-12 13:38:44 -07:00
059f69e5e6
tidy up NonUniformScaleService compatibility
2021-05-12 21:20:23 +01:00
98a579abef
Added a comment
2021-05-12 12:17:36 -07:00
559798251d
Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay
2021-05-12 11:55:51 -07:00
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
deae9db5c2
Merge pull request #704 from aws-lumberyard-dev/MultiplayerComponents
...
Removing unused GridMate touchpoints from AzFramework, and non-inclusive code removal
2021-05-11 17:51:03 -07:00
4e54df49db
Merge pull request #438 from aws-lumberyard-dev/Spawnable/ProductDependency
...
AddProductDependency to handle inter-product dependencies in PrefabProcessors
2021-05-11 15:19:01 -07:00
318f97a717
build fix for removed gridmate headers
2021-05-11 14:28:10 -07:00
74385a575f
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-11 13:43:17 -07:00
33af6c1014
Merge branch 'main' into Prefab/CreatePrefab
2021-05-11 13:41:48 -07:00
3e13dd52d1
First pass, removing gridmate touchpoints from AzFramework and non inclusive terminology purge
2021-05-11 12:47:15 -07:00
daimini
srikappa
Mike Balfour
Tom Hulton-Harrop
greerdv
srikappa-amzn
nvsickle
Hasareej
bosnichd
kberg-amzn
sconel
karlberg