Commit Graph

4581 Commits (e18bcc63f2a2b294e87f4328ea2f787cc8e1b82e)
 

Author SHA1 Message Date
Jose e18bcc63f2 Fixed a bug in the ReflectedPropertyError that was preventing groups from opening correctly
Signed-off-by: Jose <jotamkin@amazon.com>
5 years ago
Jose 36dee3d492 Merge branch 'development' of https://github.com/o3de/o3de into GroupToggleSwitch 5 years ago
Terry Michaels 8ffb25248b
Merge pull request #1906 from aws-lumberyard-dev/hultonha/gitflow_210707_o3de
Merge from stabilization/2106 to development (2021/07/07)
5 years ago
Jose 0502475fa6 Created a toggle switch to enable and disable groups through the EditContext
Signed-off-by: Jose <jotamkin@amazon.com>
5 years ago
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 9bfb90a513 Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de
Signed-off-by: hultonha <hultonha@amazon.co.uk>
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
Benjamin Jillich 2ab2503337
Revert "[MeshOptimizer] Determine the original vertex index based on the position (#1562)" (#1902)
This reverts commit ef1f95f1d0.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
5 years ago
amzn-sean 23c0440371
tick system while in track view batch render. (#1899)
As the batch render will disable Editor idle processing which handles the tick.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
5 years ago
jonawals a3d14e217e
Change TIAF seed criteria. (#1857)
We currently cannot predict when a given snapshot will be taken. This is
problematic as test impact analysis assumes that the coverage data will
be updated after each run. As we have no control over when our coverage
data will persist we will instead always seed when the pipeline and
branch is one of the seeding pipelines, otherwise we will attempt to
read that seed data and perform test impact analysis (if no seed data is
present we will fall back to a regular, uninstrumented run of all test
targets).

This approach has the following implications:

1. PR builds will benefit from test impact analysis as the seed data is
    (hopefully) available at the time the snapshot is created.

2. Builds for the aforementioned seeding branches and pipelines will not
    benefit from test impact analysis and will incur the cost of seeding
    regardless of whether or not that generated seed data ends up in the
    snapshot.

Signed-off-by: John <jonawals@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
SergeyAMZN e9ceee9b32
Merge pull request #1879 from aws-lumberyard-dev/MultiplayerPlayerPrefabBug_LYN-4989
LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem…
5 years ago
hultonha 707d153a87 Merge branch 'stabilization/2106' into hultonha/gitflow_210706
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
Chris Burel ef1f95f1d0
[MeshOptimizer] Determine the original vertex index based on the position (#1562)
* Determine the original vertex index based on the position

The Assimp library does not expose the FBX control point indices. This
change causes vertices that are close enough in their position to be
considered as coming from the same control point. This allows the mesh
optimizer to consider vertices with the same control point index (or
"original vertex index" as it is called in the code) for deduplication.

Signed-off-by: Chris Burel <burelc@amazon.com>

* Use a filter view instead of reimplementing a filter view

Signed-off-by: Chris Burel <burelc@amazon.com>

* Don't attempt to weld similar vertices if there's blendshapes

Signed-off-by: Chris Burel <burelc@amazon.com>

* Add test for the mesh optimizer's ability to weld nearby vertices

Signed-off-by: Chris Burel <burelc@amazon.com>

* Add logging call to show mesh optimizer effect on vertex count

Signed-off-by: Chris Burel <burelc@amazon.com>

* Use a bunch of temporaries in order to make `position` `const`

Signed-off-by: Chris Burel <burelc@amazon.com>
5 years ago
hultonha dee65914f0 Merge remote-tracking branch 'upstream/stabilization/2106' into hultonha/gitflow_210706 5 years ago
lumberyard-employee-dm 8592e4fbbe
Added if checks in the get_project* and get_engine* function to protect against None being returned from get_project_json_data and get_engine_json_data respectively (#1880)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
pereslav 4a42c32a4b LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem when Profiling is on
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
Brian Herrera 88725210c1
Merge pull request #1875 from brianherrera/add-issue-templates
Add issue templates for bugs and features
5 years ago
brianherrera a014aed03d
Add feature request template
Signed-off-by: brianherrera <briher@amazon.com>
5 years ago
brianherrera f8753a609e
Add bug issue template
Signed-off-by: brianherrera <briher@amazon.com>
5 years ago
hultonha 1b8de9fe9a Merge branch 'stabilization/2106' into hultonha/gitflow_210706 5 years ago
Mike Balfour 71c6b3e506
Refresh cached transforms before saving. (#1858)
If the prefab template saves default values for a cached transform, but *shouldn't* have default values, it will get patch application errors at runtime due to missing cached transform fields.

Signed-off-by: mbalfour <mbalfour@amazon.com>
5 years ago
hultonha 2f34a35aed removing .orig file from previous merge
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
Nicholas Lawson 5fdb33b1d7
o3de stabilization/2106 - update licenses (#1661)
Not to be committed before 7/6/2021

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
5 years ago
Nicholas Lawson eb0b7346c4
o3de development - update licenses (#1665)
Not to be committed before 7/6/2021

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
5 years ago
amzn-sean 827805ed83
fix C12712452 - re-link script canvas to correct entities (#1855)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
5 years ago
jonawals 81f9afdf13
Merge pull request #1849 from aws-lumberyard-dev/jonawals_SPEC-7604
Jonawals spec 7604
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
Benjamin Jillich 049469463e
[LYN-4439] Added tags to gem item delegate (#1853)
* Added new helper function to draw the feature tags below the summary for each gem item.
* In case no feature tags belong to a gem, the available space will be used by the summary.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
5 years ago
Aaron Ruiz Mora 9d5a9ff925
NvCloth automated tests use default renderer to be more stable and complete (#1850)
Signed-off-by: moraaar <moraaar@amazon.com>
5 years ago
John c5a4fd382d Address PR comments 5 years ago
John f86708a812 Fix run payload checking logic 5 years ago
John 2003d81aba Fix missing log call site 5 years ago
John b63468d95e Fix API comments 5 years ago
John 0d7d507889 Fix instrumented non-gtests treated as failures 5 years ago
John 17fde4e228 Move source of truth logic from TIAF to job 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
amzn-hdoke 1dfe65a3ef
Update AWSNativeSDK-Android revision and enable AWS gems (#1837)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
5 years ago
michabr 39239155e3
Update required mesh service for UiCanvasOnMeshComponent (#1843)
Signed-off-by: abrmich <abrmich@amazon.com>
5 years ago
michabr b31558a086
Disable RTT in LyShine until it's fully supported using Atom (#1840)
Signed-off-by: abrmich <abrmich@amazon.com>
5 years ago
AMZN-Phil 4575de137e
Merge pull request #1844 from aws-lumberyard-dev/LYN-4776-gitfix
Open editor button and new project and failed warnings.
5 years ago
amzn-phist 4403e9d4d4
Fix the CMake configuration for Microphone Gem (#1835)
* Fix the CMake configuration for Microphone Gem

The configuration was causing AudioSystem Gem to be loaded at runtime
regardless of whehter AudioSystem.Editor Gem was set to get loaded as
well.  Gives Microphone Gem an Editor module to sort out the proper
runtime dependencies.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Removes an unnecessary comment

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix platforms that don't build tools

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Use aliases to better express runtime depends

Cleans it up and removes the need for a Microphone.Editor module.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
5 years ago
lumberyard-employee-dm d73a98aa2f
Added detection of gems which are not directly under an external subdirectory root (#1841)
* Added proper detection of the list of Gems in the Project Templates
enabled_gems.cmake file

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a CMake alias target for the Atom Gem and the AtomLyIntegration

Both of those targets just aliases the Atom_AtomBridge gem
Therefore they turn on Atom

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Replacing the Atom_AtomBridge gem in the project template with the Atom gem

The Atom gem is just an alias to the Atom_AtomBridge gem

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the manifest.py gem gathering logic to recurse through the external subdirecotories locating gem.json files to discover all gems in a subdirectory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
AMZN-nggieber d4e4ebc2a7
Change Standard Project Template to Default and Change Open 3D Foundation to Open 3D Engine in gem catalog (#1842)
Made Standard Template Always Show First and Default Selection
    Changed Open 3D Foundation to Open 3D Engine in Gem Catalog and setup detection of Origin based on gem creator
5 years ago
Pip Potter 0edf0e74bc
AWS: Migrate attribution endpoint (#1838)
* Migrate attribution endpoint and update unit tests
5 years ago
Chris Galvan d36323b8b6
Merge pull request #1809 from aws-lumberyard-dev/cgalvan/gitflow_210702_dev
Merged stabilization/2106 to development
5 years ago