d369912727
Merge branch 'main' into LYN-2461
2021-05-21 16:41:46 -07:00
6f23138338
Merge pull request #809 from aws-lumberyard-dev/cgalvan/DuplicateEntities
...
[LYN-2255] Implemented duplication of entities with prefabs.
2021-05-21 15:33:54 -05:00
d785b3310f
Make sure to autoscroll to a selected entity after a rename ( #872 )
2021-05-21 14:56:59 -05:00
21620a0d73
[LYN-2255] Fixed additional alias replacement case, and removed now unneeded specific alias replacement.
2021-05-21 14:19:00 -05:00
e54963f0a9
Set project_path in the SettingsRegistry in the test SetUp() functions for tests that require a project to be set
2021-05-21 11:00:50 -07:00
3d1fa538c2
[LYN-2255] Added extra protection for duplicate replacement of alias logic by bookending the strings.
2021-05-21 12:05:24 -05:00
20ee399864
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities
2021-05-21 10:54:44 -05:00
01f31cdc56
Move the basic Prefab workflows out from behind the WIP flag ( #769 )
...
* Move the basic Prefab workflows out from behind the WIP flag
2021-05-20 14:44:27 -07:00
1a15007dcb
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities
2021-05-20 14:44:36 -05:00
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
ff35804ce3
Change prefab assert to warning
2021-05-20 11:19:27 -07:00
c93c457356
Merge pull request #772 from aws-lumberyard-dev/Prefab/Create/PositionFix
...
LYN-3833 | Position of entity is different after creating it into a prefab
2021-05-20 10:32:42 -07:00
8d8504aec3
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities
2021-05-20 10:40:50 -05:00
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
eb31d90ad9
Updates to fix BoxSelect when using Orbit with the new Camera ( #825 )
...
* update camera controller to block box select during orbit
* simplify update for modern viewport camera controller
* wip working lmb box select with orbit
* add test for changes to click detector
* add unit test for camera system to validate events
* remove debugging code, tidy-up changes for PR
* small updates before posting PR
* fix for linux build failure
2021-05-20 15:54:36 +01:00
2112d67b6b
Rename variable to make it clearer it's a map
2021-05-19 16:15:18 -07:00
e638c6b0d5
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
2021-05-19 15:30:48 -07:00
815e750439
Merge pull request #94 from aws-lumberyard-dev/LY-113714
...
Ly 113714 QT Widget component card updates - Array: Bold title and add separator bar.
2021-05-19 16:05:35 +01:00
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
29b4ab6ff3
Merge pull request #522 from aws-lumberyard-dev/mp_editor_pipeline
...
Integrating network prefab processing with Multiplayer.Editor to enable server launch on Ctrl+G via an Editor specific network connection
2021-05-18 16:28:08 -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
0959756f73
[LYN-2255] Implemented duplication of entities with prefabs.
2021-05-18 15:05:12 -05: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
6f3f5268d8
Fix build error on unity builds
2021-05-17 14:06:20 -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
fb51829360
Resolve MP Gem Ctrl+G changes with main
2021-05-15 13:12:16 -07:00
1915b97c16
Cleanup server launch, misc. MP consts, and register Editor Spawnable assets server side
2021-05-15 12:58:30 -07: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
amzn-sj
cgalvan
Terry Michaels
Chris Galvan
chiyenteng
Danilo Aimini
Tom Hulton-Harrop
daimini
sphrose
AMZN-puvvadar
srikappa
puvvadar
Mike Balfour
greerdv
srikappa-amzn
nvsickle