Commit Graph

73 Commits

Author SHA1 Message Date
srikappa 0ffaa5429b Fixed a linux build error where an implicit conversion to const ref is not supported 2021-05-26 11:31:16 -07:00
srikappa 5a41746683 Fixed a comment and added a forward declaration 2021-05-26 10:46:00 -07:00
srikappa be9c9d9fa3 Remove prefab undo cache dependency on CreatePrefab use case 2021-05-25 12:57:16 -07:00
Chris Galvan 21620a0d73 [LYN-2255] Fixed additional alias replacement case, and removed now unneeded specific alias replacement. 2021-05-21 14:19:00 -05:00
Chris Galvan 3d1fa538c2 [LYN-2255] Added extra protection for duplicate replacement of alias logic by bookending the strings. 2021-05-21 12:05:24 -05:00
Chris Galvan 1a15007dcb Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 2021-05-20 14:44:36 -05:00
Chris Galvan c105894aa5 [LYN-2255] Made PrefabTestFixture have the prefab system enabled so that the duplicate tests pass on Jenkins (they rely on the PrefabEditorEntityOwnershipInterface being registered). 2021-05-20 14:28:04 -05:00
Chris Galvan 8d8504aec3 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 2021-05-20 10:40:50 -05:00
Chris Galvan 2d89c60175 [LYN-2255] Updated Prefab Duplicate to select the newly duplicated entities. Also addressed some other PR feedback. 2021-05-20 10:39:57 -05:00
daimini 2112d67b6b Rename variable to make it clearer it's a map 2021-05-19 16:15:18 -07:00
daimini 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
daimini 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
daimini 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
Chris Galvan 0959756f73 [LYN-2255] Implemented duplication of entities with prefabs. 2021-05-18 15:05:12 -05:00
srikappa 761a77a436 Avoid creating a new list for non-container top level entities 2021-05-17 18:51:23 -07:00
srikappa eb873f246a Merge branch 'main' into Prefab/CreatePrefab 2021-05-17 17:13:02 -07:00
srikappa 45074c651a Fix bugs with creating prefabs with nested entities 2021-05-17 17:10:50 -07:00
daimini 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
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
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
srikappa 1a456cc9b9 Marked an our parameter correctly and changed a ref to const ref 2021-05-14 11:48:31 -07: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 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
srikappa 7bdf44a099 Detect cyclical dependencies in the nested prefabs of the prefab being instantiated 2021-05-12 13:38:44 -07:00
srikappa 98a579abef Added a comment 2021-05-12 12:17:36 -07:00
srikappa 33af6c1014 Merge branch 'main' into Prefab/CreatePrefab 2021-05-11 13:41:48 -07:00
srikappa b11234097d Fixed a capitalization issue 2021-05-11 11:30:16 -07:00
Danilo Aimini d61c93a7b6 Merge pull request #431 from aws-lumberyard-dev/Prefab/Create/IgnoreLevel
LYN-3211 | Create Prefab can be triggered on the Level Container, generating an invalid level hierarchy
2021-05-10 23:09:51 -07:00
srikappa 886fe22b16 Merge branch 'main' into Prefab/CreatePrefab 2021-05-10 12:31:18 -07:00
srikappa b57dd02d90 Removed a debug print command 2021-05-10 12:28:33 -07:00
srikappa 0da6e450a6 Improved comments 2021-05-10 11:43:32 -07:00
daimini e24827efb3 Fix direct editing of a reference 2021-05-07 17:08:35 -07:00
daimini 4662290d92 Switching IsPrefabInInstanceAncestorHierarchy to use const refs 2021-05-07 16:50:41 -07:00
daimini 47001dc0c3 Merge main 2021-05-07 16:42:51 -07:00
srikappa eb8084d3f6 Initial draft for getting instantiation to work immediately after creation is undone 2021-05-07 16:21:23 -07:00
srikappa a7624bb985 Removed returning AZ::Failure when AZ::Assert is thrown 2021-05-03 17:23:00 -07:00
daimini bc3f285601 Refactored IsPrefabInInstanceAncestorHierarchy to use Instance Optional References. Added more information to the error message. 2021-04-29 18:45:42 -07:00
srikappa d433cd623b Fix undo for nested prefab creation by providing link patches to the undo node 2021-04-29 17:02:44 -07:00
daimini e22398700d Simplified some checks, added early outs. 2021-04-29 16:19:58 -07:00
daimini 48c34628f6 Exclude the Level root prefab container when creating prefabs. 2021-04-28 13:34:02 -07:00
daimini c07a7c3766 Detect and block instantiations that would generate circular dependencies in the instance hierarchy. 2021-04-27 17:20:22 -07:00
daimini 833ca2767d Fix a bug with level save erasing link information on Instances. All changes to non-root container entities are now saved as patches in the link to the parent instance. 2021-04-23 20:14:17 -07:00
AMZN-daimini e772afa06e Merge pull request #226 from aws-lumberyard-dev/Prefab/Instantiate/Setup
KEYSTONE USE CASE | Instantiate Prefab
2021-04-23 09:23:31 -07:00