Commit Graph

459 Commits (5b44ea9b9ab99b5f285158afe88fca35219c33c5)

Author SHA1 Message Date
sphrose 83d1bc0fbf Merge branch 'stabilization/2106' into LYN-3718 5 years ago
Chris Galvan 91656ded9f Ensured EditContext is created for the legacy tools framework application (Lua) so that settings are able to be displayed
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
SergeyAMZN 0a957fb03a
Merge pull request #1762 from aws-lumberyard-dev/MultiplayerEditorFixes2
LYN-4866 Fixed net entities indices when creating net spawnable
5 years ago
pereslav 436d9734d2 Fixed clang build error
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
Danilo Aimini 3c959832a3
Reparenting - introduce loop detection on instance reparenting (DCO fix) (#1752)
* Detect loops in reparenting code and assert.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add warning when detecting a cyclical dependancy. Revert reparenting on loop.

Signed-off-by: daimini <82231674+AMZN-daimini@users.noreply.github.com>
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Use GetActiveWindow helper to handle window edge cases

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
5 years ago
pereslav d17390befb LYN-4866 Fixed net entities indices when creating net spawnable
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
Danilo Aimini 02f340abbd
Fix resource registration for the EntityOutlinerWidget class in AzToolsFramework. Also moves icons to a more appropriate location. (#1731)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
5 years ago
alexmontAmazon 9ef25cb5c4
rewrite of the filter code to fix [LYN-4156][LYN-4545] (#1640) (#1726)
* rewrite of the filter code to fix [LYN-4156][LYN-4545]

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* improved onRowCountChanged() per comments

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
5 years ago
Mike Balfour d34d088191
Miscellaneous prefab/converter bugfixes to support TrackView (#1701)
This has a small bundle of bugfixes and improvements all based around improving prefab TrackView support:

* JsonMerger - improved the error message when patch remove operations fail to make the specific failure more obvious
Instance - swapped the order of destroying entities vs clearing the lookup tables so that lookups still produce valid results during destruction. (This could happen while creating undo caches)
* InstanceEntityIdMapper - in the case where an id isn't found, it now returns an invalid id instead of an "attempted-valid" one that still generally turned out to be not-valid
* PrefabUndo - downgraded a potential crash to an error message if for some reason the patch contains changes to an entity that doesn't currently have an alias. (This case can be caused occasionally by other bugs and error conditions)
* EditorSequenceComponent - downgraded a potential crash to an assert for the times when it tries to remove components, fails, but thinks it succeeded. (This case can currently be caused by using Maestro with Prefabs enabled)
* EditorSequenceAgentComponent - added an undo cache refresh whenever the component deletes itself, so that deleting itself during an EditorSequenceComponent destruction chain of events leaves the undo cache in the correct state.
* SliceConverter - fixed the conversion of entity references in top-level slice instance entities that refer down to nested slice entities. There was a chicken-and-egg problem in terms of which entities need to be created first to make the references and the prefab patching & serialization happy. This was worked around by creating placeholder top-level entities, then the nested slice entities, then replacing the top-level entities with the fully-realized ones.

Specific changes:
* Added more informative error message.

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 672608a6c833c07295996cd9b3449825222b74d0)

* Changed the error condition to produce a "valid" invalid id instead of a deterministic but not-valid id

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 3673950c949de8e067b32ddafaffd07e648a13d8)

* Guard against invalid reference assert/crash

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 268d4ef3447f268a1372d07e028b9e67bac5c64e)

* Downgrade an invalid reference crash to an assert

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 38c9303770845f4e863273dd6fb8fc7e83380425)

* Improved logic for handling entity references across nested slices.

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 7e89a016d95fb72cb5f119e1e3768daa60e6bfb4)

* Changed order of entities.clear() call so that instance lookups are still valid during entity destruction.

Signed-off-by: mbalfour <mbalfour@amazon.com>

* Add undo cache notification when removing Maestro components.

Signed-off-by: mbalfour <mbalfour@amazon.com>
5 years ago
hultonha e1de075789 Merge remote-tracking branch 'upstream/stabilization/2106' into hultonha_LYN-4304_viewport_ui_gamemode 5 years ago
Steve Pham b4a2edec6a
Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
5 years ago
hasareej 8408f6b815 PR feedback changes 2.0
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hasareej 32687cbcb2 PR feedback changes
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hasareej df0fede8d2 Hiding the 2 Clusters during Gameplay mode
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
sphrose 7bb4e0562b Update AssetBrowserTreeView.cpp
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
5 years ago
Esteban Papp d14229c67e some replacements and fixes that were referring Sandbox/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Terry Michaels 7a2a2dc0d7
Updated branding for application names (#1617) 5 years ago
AMZN-mnaumov 83d142d7dc
Merge pull request #1609 from aws-lumberyard-dev/Atom/mnaumov/cherryPick1571
Cherry-picking thumbnail performance improvements
5 years ago
Yuriy Toporovskyy 2dd8d03654 Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest 5 years ago
Terry Michaels 21ebff5709
Updated help search and all docs.o3de.org links to o3de.org (#1594) 5 years ago
Danilo Aimini 9b6ef150ff
LYN-2480 | Minor fixes to the Prefab system (#1581)
Remove warning when entities that aren't registered to instances get passed to the Prefab Undo Cache (just ignore them to avoid noise in the console).
Also avoid marking templates dirty when they are added.
5 years ago
sconel 2a1a523091
Merge pull request #1539 from aws-lumberyard-dev/Prefabs/GameModeNewProjectCrash
Fix issue where new projects would crash when exiting game mode
5 years ago
Tom Hulton-Harrop 1dfb41b6f8
Merge pull request #1512 from aws-lumberyard-dev/hultonha_LYN-4389_imgui-viewport-ui
Change to move Viewport UI elements to no longer overlap with ImGui menu
5 years ago
sconel ad181205f8 Add extra space to error message for better formatting 5 years ago
sconel f91e640741 Fix issue where new projects would crash when entering game mode 5 years ago
Terry Michaels 1e457928f5
Update help URLs and remove unneeded links (#1520) 5 years ago
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
hasareej e0dd33b084 Comment Update 5 years ago
hasareej 6ae20b9c9c Fixing Issue with TopRight & BottomLeft Corners 5 years ago
hasareej 1cb780b215 Layout right side bug fix. 5 years ago
hasareej 9e0dccbf39 Initial bug fix - Added a margin. 5 years ago
Danilo Aimini a0f4f16b98
Fix Duplicate function to correctly replace the aliases in patches that get ported over. Also correctly undo/redo link creation. (#1449) 5 years ago
sconel e357dea06c
Merge pull request #1447 from aws-lumberyard-dev/Spawnable/GameModeLoadErrorFix
Spawnable/game mode load error fix
5 years ago
greerdv 0e5ec11cdc
Merge pull request #1455 from aws-lumberyard-dev/non-uniform-scale-hydra
exposing non-uniform scale component id as a behavior constant for hydra
5 years ago
amzn-sean 9f934a6f63
add Draw Helpers changed notification + physx draw helpers listens to it (#1456) 5 years ago
greerdv 772a75b5bc exposing non-uniform scale component id as a behavior constant for hydra 5 years ago
sconel bb0c60d1d4 Correctly add generated spawnables to asset manager in game mode 5 years ago
srikappa-amzn 8f3c227842
Merge pull request #1438 from aws-lumberyard-dev/Prefab/DetachPrefabBugFixes
Fix bug with DetachPrefab incorrectly replacing old entity aliases in patches
5 years ago
Danilo Aimini acd23698ea
Prefab Serialization | Remove "Source" parameter from prefab source file (#1387)
* When loading a template to memory, store the current Source (potentially overriding what was stored to disk)

* Before storing the prefab disk, remove the Source parameter from the Dom (as it's no longer necessary to save it).
5 years ago
sconel 49b3c4d11f Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into Spawnable/GameModeLoadErrorFix 5 years ago
srikappa 4d90b7cfb6 Fix bug with detachPrefab incorrectly replacing old entity aliases in patches 5 years ago
Tom Hulton-Harrop 108b6f8e0c
Updates to ensure OnEntityTransformChanged is called correctly (LYN-2644) (#1405) 5 years ago
sconel f825e698c9 WIP fix for referenced assets being loaded before their registration 5 years ago
pappeste 6ea8017646 Update qt versions and add missing dependency 5 years ago
srikappa-amzn bd8b6aea8e Moved vector declartion inside state for loop 5 years ago
srikappa-amzn 9f9c01e781 Used reserve instead of resize 5 years ago
srikappa-amzn 5b4333e4b1 Added a comment and gave a variable better name 5 years ago
srikappa-amzn c8ba42d04f Merge branch 'stabilization/2106' into BenchMarksReset 5 years ago
sconel bd2a2ebcf5
Merge pull request #1293 from aws-lumberyard-dev/Prefabs/RemoveEditorInfoFromNestedContainerEntities
Fix nested container entities not getting editor info removed during prefab processing
5 years ago
sconel e4921c8d0a Fix nested container entities not getting editor info removed during prefab processing 5 years ago