Commit Graph

296 Commits (115f18fcdc54753dfae542bcd0d79c5cf0a10a66)

Author SHA1 Message Date
amzn-sj d369912727 Merge branch 'main' into LYN-2461 5 years ago
cgalvan 6f23138338
Merge pull request #809 from aws-lumberyard-dev/cgalvan/DuplicateEntities
[LYN-2255] Implemented duplication of entities with prefabs.
5 years ago
Terry Michaels d785b3310f
Make sure to autoscroll to a selected entity after a rename (#872) 5 years ago
Chris Galvan 21620a0d73 [LYN-2255] Fixed additional alias replacement case, and removed now unneeded specific alias replacement. 5 years ago
amzn-sj e54963f0a9 Set project_path in the SettingsRegistry in the test SetUp() functions for tests that require a project to be set 5 years ago
Chris Galvan 3d1fa538c2 [LYN-2255] Added extra protection for duplicate replacement of alias logic by bookending the strings. 5 years ago
Chris Galvan 20ee399864 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 5 years ago
chiyenteng 01f31cdc56
Move the basic Prefab workflows out from behind the WIP flag (#769)
* Move the basic Prefab workflows out from behind the WIP flag
5 years ago
Chris Galvan 1a15007dcb Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 5 years ago
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). 5 years ago
amzn-sj ff35804ce3 Change prefab assert to warning 5 years ago
Danilo Aimini 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
5 years ago
Chris Galvan 8d8504aec3 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 5 years ago
Chris Galvan 2d89c60175 [LYN-2255] Updated Prefab Duplicate to select the newly duplicated entities. Also addressed some other PR feedback. 5 years ago
Tom Hulton-Harrop 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
5 years ago
daimini 2112d67b6b Rename variable to make it clearer it's a map 5 years ago
daimini e638c6b0d5 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix 5 years ago
sphrose 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.
5 years ago
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. 5 years ago
AMZN-puvvadar 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
5 years ago
daimini a4953a5204 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
5 years ago
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. 5 years ago
Chris Galvan 0959756f73 [LYN-2255] Implemented duplication of entities with prefabs. 5 years ago
srikappa 761a77a436 Avoid creating a new list for non-container top level entities 5 years ago
srikappa eb873f246a Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 45074c651a Fix bugs with creating prefabs with nested entities 5 years ago
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. 5 years ago
puvvadar 6f3f5268d8 Fix build error on unity builds 5 years ago
daimini d0b6ae47ed Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
5 years ago
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.
5 years ago
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
5 years ago
greerdv 18a6134e2d Merge branch 'main' into non-uniform-scale-manipulators 5 years ago
greerdv 7edef63884 address PR feedback 5 years ago
puvvadar fb51829360 Resolve MP Gem Ctrl+G changes with main 5 years ago
puvvadar 1915b97c16 Cleanup server launch, misc. MP consts, and register Editor Spawnable assets server side 5 years ago
daimini 12760ef6a3 Remove unused container entity retrieval 5 years ago
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
5 years ago
daimini 70c968f829 Fixes issue with relative positioning of children on Prefab creation. Makes CreateLink more generic to facilitate reuse. 5 years ago
greerdv d878932966 merge from main 5 years ago
srikappa 1a456cc9b9 Marked an our parameter correctly and changed a ref to const ref 5 years ago
greerdv f2d415ecb8 add functionality for central scale manipulator 5 years ago
nvsickle cc986f563a Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 5 years ago
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
5 years ago
greerdv c8568a7cf2 add feedback from PR 5 years ago
greerdv 068deea918 remove unnecessary overrides 5 years ago
greerdv e9386bcb9b remove unecessary overrides 5 years ago
greerdv 737178b928 Merge branch 'main' into non-uniform-scale-manipulators 5 years ago
greerdv 5508bf7e1d remove unnecessary non-uniform scale manipulator bus 5 years ago
greerdv d365d00abd hook up non-uniform scale manipulator callbacks 5 years ago
srikappa b72836fa8f Fixed a typo 5 years ago