birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,295 Commits 3 Branches 3 Tags
b71e307de57724260e014c100a71ee437ca9d0aa
Commit Graph

8295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guthrie Adams b71e307de5 Fix issue setting enum values on material component from script 
Replaced get and set functions with explicit types with templates
Added special case handling for setting enum values as strings or numbers from script

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-10-28 13:53:21 -05:00
Ken Pruiksma a661189ea9 Fix for rendering artifacts on height map update. (#5066) 
* Fix for rendering artifacts on height map update. This was being caused by not always lining up update aabbs with the query resolution correctly. In the future the float -> integer aabb calculations should be abstracted away. Some of this is done in the detail material ID work, but doesn't exist in the stabilization branch so we can circle around to it later.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* PR review updates - fixing cast, making constexpr for bytes per pixel.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2021-10-28 10:53:57 -05:00
greerdv 8d7eb4767a Merge pull request #5081 from aws-lumberyard-dev/ragdoll-joint-rotation 
make sure joint frame rotations are editable for ragdoll setup
 2021-10-28 15:38:09 +01:00
Olex Lozitskiy 837831a919 Bug fix: hierarchical components serve as multiplayer input drivers 
- Network Hierarchy Root and Child components can now act as MultiplayerInputDriver for components with NetworkInputs
 2021-10-28 09:33:06 -04:00
greerdv 9b2afbc39b fix explicit qualification of member function addresses 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-10-28 12:51:33 +01:00
greerdv dd0780f6ec make sure joint frame rotations are editable for ragdoll setup 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-10-28 12:26:05 +01:00
Chris Galvan caab78d930 Merge pull request #5065 from aws-lumberyard-dev/cgalvan/RenameToolGemTemplates 
Renamed the C++ and Python tool gem templates
 2021-10-27 21:15:14 -05:00
Chris Galvan 8bbd8f9807 Renamed the C++ and Python tool gem templates after review. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-10-27 16:01:02 -05:00
Alex Peterson 59c898fc48 Fix notification queue and add gem action (#4985) (#5024) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-27 13:55:32 -07:00
Chris Galvan d23df465dd Merge pull request #5043 from aws-lumberyard-dev/cgalvan/CherryPickPythonGemTemplate 
Cherry picked PythonGem template to stabilization.
 2021-10-27 14:00:06 -05:00
John Jones-Steele 35467b63d9 Unit tests for Heightfield collider (#5042) 
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
 2021-10-27 19:31:30 +01:00
Qing Tao 9e0756f3c1 ATOM-16656 PassTree tool: ParentPass image attachment preview doesn't work (#5032) 
Move imageAttachmentCopy instance from RenderPass to Pass so it can support preview image for all passes but not only for RenderPass.
Fixed an issue with image attachment preview when switching render pipeline with attachment preview on.

Signed-off-by: Qing Tao <qingtao@amazon.com>
 2021-10-27 11:28:21 -07:00
Vincent Liu 30c366366e Improve gamelift unit test by checking handler invocation (#5030) 
Signed-off-by: onecent1101 <liug@amazon.com>
 2021-10-27 09:56:30 -07:00
AMZN-Phil 3165cf2838 Merge pull request #5011 from aws-lumberyard-dev/Prism/FixGemSelectedFilter 
Gem Catalog Selected Gems Now Filters For Gems to be Enabled in Current Session
 2021-10-27 09:28:16 -07:00
AMZN-Phil 7fc0f14a1b Merge pull request #5006 from aws-lumberyard-dev/Prism/FixRemovedProjectStillShown 
Fix Issue When Removed Project is Still Shown if it Was The Last Project
 2021-10-27 09:28:06 -07:00
AMZN-Olex 1190fb5c91 Merge branch 'stabilization/2110' of https://github.com/o3de/o3de into Network/olexl/hierarchy_as_multiplayer_input_driver 2021-10-27 11:54:22 -04:00
Chris Galvan ee57885d64 Cherry picked PythonGem template to stabilization. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-10-27 10:10:59 -05:00
galibzon cf90d7a594 ShaderVariantAssetBuilder: Provide registry property to disable (#5029) 
The registry property name is:
"/O3DE/Atom/Shaders/BuildVariants"
Default value is <true>.

Signed-off-by: garrieta <garrieta@amazon.com>
 2021-10-27 10:05:26 -05:00
Chris Galvan d332f7c4c7 Merge pull request #5023 from aws-lumberyard-dev/cgalvan/AddComponentTypeIconAPI 
Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls.
 2021-10-27 08:04:53 -05:00
moraaar a29623e5f0 Fixed editor crash using cylinder shape component (#5037) 
Fixed cylinder shape by considering shape config list to be empty.

The crash came from clearing shape config list when cylinder height is zero, but when the height is restored to zero it was expecting an element in the list.

The code to set the shape configuration was the same for many shape types, so it has been refactored to a helper function.

Fixes #4999
 2021-10-27 13:34:43 +01:00
santorac 049112d8fa Merge pull request #5027 from aws-lumberyard-dev/Atom/santorac/MoveDoubleSided 
Removed reference to opacity.doubleSided property that no longer exists.
 2021-10-26 18:54:12 -07:00
Chris Burel e4c69a29fa [Linux] Update Qt package to include xcb GL integration plugin (#4976) 
Fixes #3132.

Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-10-26 18:45:33 -05:00
AMZN-Olex 250a91dd96 Network Hierarchy Root and Child components can now act as MultiplayerInputDriver for components with NetworkInputs 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-10-26 19:10:46 -04:00
galibzon 42a14079f2 Fix naming for DisableOptimizations vs DxcDisableOptimizations (#5016) 
Signed-off-by: garrieta <garrieta@amazon.com>
 2021-10-26 17:48:28 -05:00
santorac 8fd3461863 Removed reference to opacity.doubleSided property that no longer exists. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-10-26 15:38:09 -07:00
Chris Galvan 78b0683313 Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-10-26 15:47:17 -05:00
Adi Bar-Lev 707730ebbc Hair - bug fix resulted from change in pass fetch using the new pipeline filter (#5013) 
Signed-off-by: Adi-Amazon <Adi Bar-Lev barlev@amazon.com>

Co-authored-by: Adi-Amazon <Adi Bar-Lev barlev@amazon.com>
 2021-10-26 15:26:54 -04:00
AMZN-Phil 856318005c Merge pull request #5000 from aws-lumberyard-dev/Prism/RemoteGemWarning 
Adds Warning to Add Repo Dialog
 2021-10-26 11:01:02 -07:00
hershey5045 e22235ec5b Add OpenImageIO as runtime dependency in AtomLyIntegration. (#4987) 
* Add OpenImageIO as runtime dependency in AtomLyIntegration.

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

* Place 3rdparty import inside if block.

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

* Add platform cmake files for other platforms to prevent compile errors.

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

Co-authored-by: rbarrand <rbarrand@amazon.com>
 2021-10-26 10:40:30 -07:00
sphrose e9b5a51d9f Fix console warning when adding TerrainWorldRendererComponent (#4964) 
* Fix console warning when adding TerrainWorldRendererComponent

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Change default value

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-10-26 12:39:39 -05:00
santorac 3913d91251 Merge pull request #4983 from aws-lumberyard-dev/Atom/santorac/MoveDoubleSided 
Moved DoubleSided Flag Out Of Opacity Group

The double-sided flag was hidden inside the opacity property group, and only exposed when you set the opacity to non-opaque. Here we move doubleSided from opacity to general making it easier to find and set.

Also...
- Fixed a bug with the material version auto-update, where it could rename properties but could not move them to another group.
- Added another "default" texture map to the Common/Feature gem that is directional, so better for understanding UV/tangent space. These were copied from the AtomLyIntegration gem.
 2021-10-26 10:36:41 -07:00
galibzon a945fd9f1b Removed ShaderAsset related unncessary warning (#5008) 
Removed ShaderAsset related unncessary warning that pollutes the logs.

Signed-off-by: garrieta <garrieta@amazon.com>
 2021-10-26 12:27:40 -05:00
galibzon b541d69efc DXC Validation Error Difficult to See in AP Window (#4982) 
* DXC Validation Error Difficult to See in AP Window

Renamed ReportErrorMessages() as ReportMessages()
All the message will be printed as a single AZ_Error()
or AZ_Warning() instead of mingled AZ_Error/AZ_Warning/AZ_TRacePrintf
which was making the output hard to read.

Signed-off-by: garrieta <garrieta@amazon.com>
 2021-10-26 12:19:12 -05:00
nggieber 866fd8a420 Fix selected gem filtering 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-26 09:46:54 -07:00
jonawals a2eca9de3d Merge pull request #4998 from aws-lumberyard-dev/LYN-5265_state_tracker_impl 
Add Focus Mode integration tests.
 2021-10-26 17:16:25 +01:00
santorac b80e55229f Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MoveDoubleSided 2021-10-26 09:07:23 -07:00
nggieber b3c9573b10 Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard-dev/o3de into stabilization/2110 2021-10-26 08:58:18 -07:00
Steve Pham 22a287d046 Fix to set the Taskbar name and Game Launcher window title to the name of the Project (#4986) 
Signed-off-by: Steve Pham <spham@amazon.com>
 2021-10-26 08:56:37 -07:00
nggieber 3ff469c55e Fix issue with project still displaying when last project is removed 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-26 08:42:22 -07:00
AMZN-Phil 767466c57b Merge pull request #4979 from aws-lumberyard-dev/Prism/jsonpythonexceptionfix 
Fix old references to gem_list
 2021-10-26 08:31:44 -07:00
AMZN-Phil 6b3fc0ff8b Merge pull request #4981 from aws-lumberyard-dev/Prism/gemdownloadcallfix 
Re-add call used to initiate gem download
 2021-10-26 08:31:03 -07:00
Chris Burel f3499011ac [Mac] Fix QtEditorApplication_mac include (#4978) 
Commit 8e03d6f306 missed updating the
platform-specific mac QApplication implementation file to include the
class declaration from the new header.

Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-10-26 08:30:51 -07:00
nggieber 77d05b0bc9 Merge branch 'stabilization/2110' into Prism/RemoteGemWarning 2021-10-26 07:39:56 -07:00
nggieber cd295cc38b Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard-dev/o3de into stabilization/2110 2021-10-26 07:34:36 -07:00
John c2105b0631 Address PR comments. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-26 15:30:08 +01:00
nggieber 75ebf77b59 Added warning message when adding repositories 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-26 07:22:47 -07:00
moraaar 057c8e0d4e Fixed error: unused variable 'physxMaximumMaterialIndex' (#4989) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-10-26 13:58:21 +01:00
santorac 5cbbbb4f20 Merge pull request #4980 from aws-lumberyard-dev/Atom/santorac/UnusedVariable 
Fixed potential unused variable 'originalVersion'
 2021-10-25 19:46:28 -07:00
Danilo Aimini 1bc2968330 Resolve minor hover state bugs on the Entity Outlier (branches detect hover state separately from the rest of the columns) (#4977) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-25 17:47:54 -07:00
santorac eb542bfe69 Merge branch 'stabilization/2110' into Atom/santorac/MoveDoubleSided 2021-10-25 16:10:45 -07:00