26d8a62074
Merge pull request #1914 from aws-lumberyard-dev/cgalvan/FixLuaEditorSettings
...
Ensured EditContext is created for the legacy tools framework application (Lua) so that settings are able to be displayed
2021-07-07 13:41:25 -05:00
02922806a5
Updated gem.json for all top-level Gems. ( #1715 ) ( #1917 )
...
* Updated gem.json for all top-level Gems. All the top level gems now have identical gem.json formats based on the DefautlGem template gem.json. Two additional fields have been added, a type: field and a requirements: field. These fields are for display in Project Mananger. All gem.json files have a default requirements: value of None. Devs are responsible for providing requirements. Gem descriptions and tags have been signed off by developers.
Signed-off-by: Cronin <mikecro@amazon.com >
* Fixed minor formatting issues with RADTelemetry gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to QtForPython gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the Twitch gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to AWSCore gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the AtomTressFX gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the AudioEngineWwise gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CertificateManager gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in summary of CrashReporting gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CustomAssetExample gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in editorPythonBindings gem summary
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ScriptedEntityTweener gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the Gestures gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitetspace in the summary of the GameStateSamples gem
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ExpressionEvaluation gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the ProjectManager PythonBindings.cpp code to reference the
newer fields in the gem.json files
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updating the Gem and Project templates gem.json files to include the
"type" and the "requirements" field.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the default "requirments" field value to be empty string instead
of "None"
This works better with the ProjectManager GemInfoFromPath function.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Correcting "summary" field name
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Added the requirements text to the AudioEngineWwise Gem
This gem requires downloading the Wwise 3rdParty library from AudioKinetic's website
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: Mike Cronin <58789750+micronAMZN@users.noreply.github.com >
2021-07-07 13:29:33 -05:00
cc437d7370
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit
2021-07-07 12:58:28 -05:00
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 >
2021-07-07 11:58:41 -05:00
635473e5cf
[LYN-4990] Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-07 11:29:18 -05:00
ab354f2e9b
Merge pull request #1903 from aws-lumberyard-dev/hultonha_SPEC-7644_disable-ParallelDeepAssetReferences
...
Disable ParallelDeepAssetReferences test until sporadic failures are root caused
2021-07-07 16:52:40 +01:00
9bfb90a513
Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-07 16:25:06 +01:00
40726a32dc
Merge pull request #1898 from aws-lumberyard-dev/hultonha/gitflow_210706_o3de
...
stabilization2106 -> development merge (210706)
2021-07-07 16:08:06 +01:00
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 >
2021-07-07 15:48:33 +01:00
fe9c9f66f1
disable ParallelDeepAssetReferences test
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-07 15:05:17 +01:00
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 >
2021-07-07 13:28:59 +01:00
2ab2503337
Revert "[MeshOptimizer] Determine the original vertex index based on the position ( #1562 )" ( #1902 )
...
This reverts commit ef1f95f1d0jillich@amazon.com >
2021-07-07 14:28:53 +02:00
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 >
2021-07-07 12:39:01 +01:00
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 >
2021-07-07 10:53:21 +01:00
707d153a87
Merge branch 'stabilization/2106' into hultonha/gitflow_210706
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-07 10:30:48 +01:00
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 >
2021-07-07 11:21:09 +02:00
1b8de9fe9a
Merge branch 'stabilization/2106' into hultonha/gitflow_210706
2021-07-06 20:23:14 +01:00
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 >
2021-07-06 14:17:21 -05:00
2ea9bfb144
merge stabilization/2106 into development
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-06 17:34:04 +01:00
77cc0e921c
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit
2021-07-06 10:15:32 -05:00
81f9afdf13
Merge pull request #1849 from aws-lumberyard-dev/jonawals_SPEC-7604
...
Jonawals spec 7604
2021-07-05 22:40:47 +01:00
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 >
2021-07-05 18:06:20 +01:00
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 >
2021-07-05 18:34:41 +02:00
c5a4fd382d
Address PR comments
2021-07-05 16:25:29 +01:00
f86708a812
Fix run payload checking logic
2021-07-05 15:28:20 +01:00
2003d81aba
Fix missing log call site
2021-07-05 15:05:17 +01:00
b63468d95e
Fix API comments
2021-07-05 14:58:42 +01:00
0d7d507889
Fix instrumented non-gtests treated as failures
2021-07-05 14:58:25 +01:00
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 >
2021-07-05 13:08:05 +01:00
4575de137e
Merge pull request #1844 from aws-lumberyard-dev/LYN-4776-gitfix
...
Open editor button and new project and failed warnings.
2021-07-02 20:24:58 -07:00
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 >
2021-07-02 21:46:26 -05:00
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
2021-07-02 19:32:41 -07:00
2d060d7466
Updated splash and about screens ( #1839 )
...
Signed-off-by: Terry Michaels <miterenc@amazon.com >
2021-07-02 18:38:28 -05:00
d0dd80099c
Open editor button and new project and failed warnings.
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-07-02 16:07:26 -07:00
9dbafa72a8
Remove deprecated prefab support from UI Editor ( #1754 )
...
* Remove old prefab support from UI Editor
Signed-off-by: abrmich <abrmich@amazon.com >
* Delete deprecated prefab files that are no longer supported in UI Editor
Signed-off-by: abrmich <abrmich@amazon.com >
2021-07-02 15:42:09 -07:00
81e39df248
{LYN-4456} FIX: assign branch token for LegacyTestAdapter ( #1833 )
...
* fixes AssetProcessorManagerUnitTests unexpectedly fails due to writing out the branch token
* instead, the branch token is calculated ahead of time and added to the settings registry
Tests: --gtest_filter=Test/LegacyTestAdapter.*
2021-07-02 16:32:16 -05:00
f47e71da36
Merged conflicts from pulling down latest development
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 16:29:27 -05:00
40f9761f86
Fixed more copyright header issues caused by script replacement
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 16:21:26 -05:00
4c684b1a10
Merge pull request #1657 from aws-lumberyard-dev/carlitosan/scriptcanvas/prefabs
...
Initial prefab integration
2021-07-02 14:05:25 -07:00
b9e06e70d9
Fixed copyright header issues per new validator
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 15:34:04 -05:00
0a957fb03a
Merge pull request #1762 from aws-lumberyard-dev/MultiplayerEditorFixes2
...
LYN-4866 Fixed net entities indices when creating net spawnable
2021-07-02 21:31:42 +01:00
e9dd032a75
Updated gem.json for all top-level Gems. ( #1715 )
...
* Updated gem.json for all top-level Gems. All the top level gems now have identical gem.json formats based on the DefautlGem template gem.json. Two additional fields have been added, a type: field and a requirements: field. These fields are for display in Project Mananger. All gem.json files have a default requirements: value of None. Devs are responsible for providing requirements. Gem descriptions and tags have been signed off by developers.
Signed-off-by: Cronin <mikecro@amazon.com >
* Fixed minor formatting issues with RADTelemetry gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to QtForPython gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the Twitch gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to AWSCore gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the AtomTressFX gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the AudioEngineWwise gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CertificateManager gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in summary of CrashReporting gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CustomAssetExample gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in editorPythonBindings gem summary
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ScriptedEntityTweener gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the Gestures gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitetspace in the summary of the GameStateSamples gem
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ExpressionEvaluation gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the ProjectManager PythonBindings.cpp code to reference the
newer fields in the gem.json files
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updating the Gem and Project templates gem.json files to include the
"type" and the "requirements" field.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the default "requirments" field value to be empty string instead
of "None"
This works better with the ProjectManager GemInfoFromPath function.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Correcting "summary" field name
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Added the requirements text to the AudioEngineWwise Gem
This gem requires downloading the Wwise 3rdParty library from AudioKinetic's website
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-02 15:23:10 -05:00
04a00e6a54
Resolved latest merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 13:29:55 -05:00
8e86623ee6
Fixed compile issue from merge error
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 13:13:17 -05:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
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 >
2021-07-02 18:17:44 +01:00
dfef909b51
Merge pull request #1610 from aws-lumberyard-dev/LYN-4507
...
Remove deleted projects from project manager
2021-07-02 10:16:06 -07:00
c845517ee7
Merge pull request #1729 from aws-lumberyard-dev/Helios_LYN-4548-FixAPNames
...
[LYN-4548] Changed AP window title and popup message titles
2021-07-02 10:08:21 -07:00
436d9734d2
Fixed clang build error
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-07-02 18:06:39 +01:00
4c3e27f3ca
Merge pull request #1759 from aws-lumberyard-dev/jillich/prism/LYN-4437
...
[LYN-4437] Replaced the background images and added a semi-transparent overlay for the Project Manager
Signed-off-by: Benjamin Jillich <jillich@amazon.com >
2021-07-02 09:56:51 -07:00
Chris Galvan
lumberyard-employee-dm
hultonha
hultonha
AMZN-Alexandre Corcia Aguilera
Benjamin Jillich
amzn-sean
AMZN-Igarri
Chris Burel
Mike Balfour
jonawals
AMZN-Phil
AMZN-nggieber
Terry Michaels
AMZN-Phil
michabr
jackalbe
Sandeep
SergeyAMZN
Mike Cronin
amzn-victor
pereslav