Commit Graph

1048 Commits (ea0e38aaf4b58d7142e2033d9daeeef9fd5fb58b)

Author SHA1 Message Date
hultonha ab354f2e9b
Merge pull request #1903 from aws-lumberyard-dev/hultonha_SPEC-7644_disable-ParallelDeepAssetReferences
Disable ParallelDeepAssetReferences test until sporadic failures are root caused
5 years ago
hultonha 40726a32dc
Merge pull request #1898 from aws-lumberyard-dev/hultonha/gitflow_210706_o3de
stabilization2106 -> development merge (210706)
5 years ago
hultonha 51733f3809
Fix for rotation matching and resetting also scaling the entity transform (#1856)
* fix issue with rotation matching (ditto)

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix for context menu appearing

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* minor tidy-up in EditorContextMenu

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add option to disable cursor during free-look

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small fixes after PR comments

Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hultonha fe9c9f66f1 disable ParallelDeepAssetReferences test
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
AMZN-Alexandre Corcia Aguilera 4f523e496f
Cherry Picking (lyn1751) (#1854)
* Cherry Picking (lyn1751)

Problem with DCO so we need to cherry pick this branch.

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

* Cherry picking #2

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

* Cherry picking 3

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

* Changed variables reverseurls
This was just changing some name variables.

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

* Changes from past PR

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

* changes from past PR and fixed small bug:
Also removed some legacy code from Resources.h

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

* couple of changes from actual PR

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

* fixed copyright issues for AR

Signed-off-by: aaguilea <aaguilea@amazon.com>
5 years ago
AMZN-Igarri 64697350bc
LYN-4806: Switch Asset Browser Mode Button (Fix) (#1852)
* Adding dropdown for view

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

* Adding Asset Browser Mode selector button

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

* Added display State Enum

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

* changed over to AZStd::unique_ptr

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

* added pointers

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

* Fixing pointers

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

* Fixing parenting

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

* Changes from Code Review Feedback

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

* Fixed wrong condition

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

* Added Button Icon

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

* Fixing Copyright Header

Signed-off-by: igarri <igarri@amazon.com>
5 years ago
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
amzn-sean 636ff587c3
Shape casts correctly report positions of colliders that intersect or in contact of the initial pose (#1848)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
5 years ago
Tom Hulton-Harrop 45b83e49da
Move camera properties from CVars to the Settings Registry (#1766)
* updates to camera inputs

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update test names to include types

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* move all camera input controls to the settings registry

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small fixes before PR

Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
Chris Galvan 40f9761f86 Fixed more copyright header issues caused by script replacement
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Sandeep 4c684b1a10
Merge pull request #1657 from aws-lumberyard-dev/carlitosan/scriptcanvas/prefabs
Initial prefab integration
5 years ago
Chris Galvan b9e06e70d9 Fixed copyright header issues per new validator
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
Chris Galvan 04a00e6a54 Resolved latest merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Tom Hulton-Harrop dafe9f6690
Add customization point for begin/end of camera behaviors (hide cursor with RMB look) (#1758)
* add customization points for begin/end of camera input to all cursor customization

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove cursor experiments, use cursor bus

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* run clang-format

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add additional unit tests for new camera behaviors

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update test name to use snake_case to increase readability

Signed-off-by: hultonha <hultonha@amazon.co.uk>
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
Terry Michaels f93c2f5b60
signoff (#1748)
Signed-off-by: Terry Michaels <miterenc@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
Terry Michaels b331eea9ca
Removed the AmazonStyle executable and files as they are old/invalid (#1733)
* signoff

Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
srikappa-amzn 37a899f5e1
Merge pull request #1709 from aws-lumberyard-dev/Prefab/DisableDestroyGameEntity
Disable support to destroy game entities through behavior context when prefabs are enabled
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
srikappa 6b2c02e477 Merge branch 'stabilization/2106' into Prefab/DisableDestroyGameEntity
Signed-off-by: srikappa <srikappa@amazon.com>
5 years ago
srikappa bab4e5eaf3 Improved function comments
Signed-off-by: srikappa <srikappa@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
chcurran 9efb6248d8 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/scriptcanvas/prefabs 5 years ago
Tom Hulton-Harrop f2242f1ed5
Merge pull request #1684 from aws-lumberyard-dev/hultonha_LYN-4304_viewport_ui_gamemode
Cherry-pick hiding viewport ui change from development to stabilization
5 years ago
greerdv 05a2ce4fe1 update based on PR feedback
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
greerdv 88615f462c merge from stabilization/2106
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
greerdv 899350b5c7 bring across lua raycast improvements from 1.x
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
hultonha e1de075789 Merge remote-tracking branch 'upstream/stabilization/2106' into hultonha_LYN-4304_viewport_ui_gamemode 5 years ago
chcurran 2281330a7c merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
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
srikappa c61e69d794 Add correct prefix for param tag
Signed-off-by: srikappa <srikappa@amazon.com>
5 years ago
srikappa cd3fad20b4 Disable support to destroy game entities through behavior context when prefabs are enabled
Signed-off-by: srikappa <srikappa@amazon.com>
5 years ago
chcurran 0136c92467 PR white space feedback, better Lua print error message, fix ACM static variable culling
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Danilo Aimini 7030f663f5
LYN-4890 | Change all instances of teal blue to correct O3DE branding palette colors (#1672)
* Replace old teal color with correct palette colors from the O3DE branding.

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

* Fix hyperlink color in O3DE About Us dialog to improve visibility.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
5 years ago
Steve Pham 827855f01c
Removal last CryTek references
- 'Crytek application' is now 'O3DE application' in ISystem.h
- 'CryTek' is now 'O3DE' in ProjectDefines.h (comment)
- 'Crytek Legacy' is now 'O3DE Legacy' in LocalizedStringManager.cpp
- 'Crytek extended data' references are now 'O3DE extended data'

Signed-off-by: spham <spham@amazon.com>
5 years ago
chcurran 5b7b989733 use more constexpr in ScriptCanvasAttributes.h, remove superfluous string use in SC user data serialization
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Gene Walters bafcdfe037
Merge pull request #1655 from aws-lumberyard-dev/genewalt/gitflow_210628
Merging Stabilization/2106 into Development
5 years ago
Tom Hulton-Harrop 8d35f31fa6
API documentation pass for CameraInput types (#1681)
* add api comments for new camera system

Signed-off-by: hultonha <hultonha@amazon.co.uk>
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
Esteban Papp 5fa495380c Merge branch 'stabilization/2106' into redcode/SPEC-7563 5 years ago
pereslav 1100e20e26 Merged ctrl+g fixes from MultiplayerEditorFixes
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
chcurran 9d9205d067 SC user nodeables now use __index method does not report error on (allowable) nil table entries LYN-3664
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
alexmontAmazon 69f2e06134
rewrite of the filter code to fix [LYN-4156][LYN-4545] (#1640)
* 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