Commit Graph

4117 Commits

Author SHA1 Message Date
chcurran 2dce2eee2d The Great ScriptCanvas Purge, Part X
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-07 13:43:31 -07:00
chcurran 7aaf265926 The Great ScriptCanvas Purge, Part IX
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-07 11:48:54 -07:00
chcurran 27577a2e49 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 2021-07-07 10:45:38 -07:00
chcurran 29652994d8 The Great ScriptCanvas Purge, Part VIII
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-07 10:45:16 -07:00
Jon B da26231a65 Merge pull request #1882 from aws-lumberyard-dev/pruiksma/fix_punctual_light_unhiding_transform
Fixing simple light types appearing back at 0,0,0 after hiding/unhiding.
2021-07-07 09:13:51 -07:00
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>
2021-07-07 14:28:53 +02:00
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>
2021-07-07 12:39:01 +01:00
SergeyAMZN e9ceee9b32 Merge pull request #1879 from aws-lumberyard-dev/MultiplayerPlayerPrefabBug_LYN-4989
LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem…
2021-07-07 10:31:45 +01:00
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>
2021-07-07 11:21:09 +02:00
chcurran 75933ff7fd The Great ScriptCanvas Purge, Part VII
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-06 21:03:31 -07:00
chcurran 93e91f9c23 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 2021-07-06 19:29:57 -07:00
chcurran 65ad412f3e The Great ScriptCanvas Purge, Part VI
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-06 19:27:58 -07:00
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>
2021-07-06 20:42:09 -05:00
Ken Pruiksma aca8a730a6 Fixing simple light types appearing back at 0,0,0 after hiding/unhiding.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-07-06 19:42:12 -05:00
pereslav 4a42c32a4b LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem when Profiling is on
Signed-off-by: pereslav <pereslav@amazon.com>
2021-07-07 00:12:30 +01:00
chcurran 0a910a31aa The Great ScriptCanvas Purge, Part V
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-06 15:05:37 -07:00
chcurran 360236b89e The Great ScriptCanvas Purge, Part IV
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-06 13:13:16 -07:00
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>
2021-07-06 14:17:21 -05:00
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>
2021-07-06 08:05:11 -07:00
chcurran fa7accf2dc Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 2021-07-06 07:27:29 -07:00
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>
2021-07-06 12:28:24 +01:00
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>
2021-07-05 18:06:20 +01:00
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>
2021-07-05 18:34:41 +02:00
Aaron Ruiz Mora 9d5a9ff925 NvCloth automated tests use default renderer to be more stable and complete (#1850)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-07-05 16:52:24 +01:00
amzn-hdoke 1dfe65a3ef Update AWSNativeSDK-Android revision and enable AWS gems (#1837)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-07-04 15:47:17 -07:00
michabr 39239155e3 Update required mesh service for UiCanvasOnMeshComponent (#1843)
Signed-off-by: abrmich <abrmich@amazon.com>
2021-07-03 20:42:23 -07:00
michabr b31558a086 Disable RTT in LyShine until it's fully supported using Atom (#1840)
Signed-off-by: abrmich <abrmich@amazon.com>
2021-07-03 20:42:02 -07:00
AMZN-Phil 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
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>
2021-07-02 22:22:34 -05:00
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>
2021-07-02 21:46:26 -05:00
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
2021-07-02 19:32:41 -07:00
Pip Potter 0edf0e74bc AWS: Migrate attribution endpoint (#1838)
* Migrate attribution endpoint and update unit tests
2021-07-02 16:54:01 -07:00
Terry Michaels 2d060d7466 Updated splash and about screens (#1839)
Signed-off-by: Terry Michaels <miterenc@amazon.com>
2021-07-02 18:38:28 -05:00
AMZN-Phil 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
michabr 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
Mike Chang 497059bea7 Update 3p CDN to https (#1807)
* Update CDN address to https

Signed-off-by: changml <changml@amazon.com>
2021-07-02 15:37:54 -07:00
jackalbe 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
Sandeep 4c684b1a10 Merge pull request #1657 from aws-lumberyard-dev/carlitosan/scriptcanvas/prefabs
Initial prefab integration
2021-07-02 14:05:25 -07:00
michabr 421e7cb88b Re-add default cursor image as an optional asset (#1831)
Signed-off-by: abrmich <abrmich@amazon.com>
2021-07-02 13:54:44 -07:00
Ken Pruiksma 1f77afae6e Fixing alpha affects specular showing up when the alpha mode is opaque or cut-out. It should only be available when mode is blended or tinted transparent. (#1830)
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-07-02 15:49:43 -05:00
SergeyAMZN 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
antonmic 832a1c36a4 Merge pull request #1756 from aws-lumberyard-dev/2016/antonmic/subsurfaceVulkan
[ATOM-15876] fixed subsurface scattering on vulkan
2021-07-02 13:06:13 -07:00
lumberyard-employee-dm b11cd2d17f O3DE License Scan Updates (#1808)
* Removing Tools/Redistributable folder
None of the files within it are used by O3DE or are needed for
distribution at all

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

* Removing the GetGlyphRangesJapanese function from imgui_draw.cpp

That function is licensed under the
Creative Commons Attribution-ShareAlike 2.1 Japan (CC BY-SA 2.1 JP)

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-02 14:58:31 -05:00
Terry Michaels d686673427 Removed unneeded binaries (#1767)
Signed-off-by: Terry Michaels <miterenc@amazon.com>
2021-07-02 14:14:47 -05:00
antonmic 19638c4697 [ATOM-15876] fixed subsurface scattering on vulkan
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-07-02 11:54:23 -07:00
mrieggeramzn 1d95a4a2ba Merge pull request #1724 from aws-lumberyard-dev/Atom/mriegger/esm16F
Switch directional light to use the same reformulation as projected s…
2021-07-02 11:26:04 -07:00
Junbo Liang 9f2b31e077 [LYN-4915] [iOS] [Android] awscoreconfiguration.setreg, awsMetricsClientConfigurationsetreg and authenticationProvider.setreg couldn't be loaded when the application starts (#1716)
[LYN-4915] [iOS] [Android] awscoreconfiguration.setreg, awsMetricsClientConfiguration.setreg and authenticationProvider.setreg couldn't be loaded when the application starts
2021-07-02 11:12:45 -07:00
AMZN-Phil 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
amzn-victor 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
pereslav 436d9734d2 Fixed clang build error
Signed-off-by: pereslav <pereslav@amazon.com>
2021-07-02 18:06:39 +01:00