birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,877 Commits 3 Branches 3 Tags
dbb4e76a3da883f4b0c196798cbf234294e7f602
Commit Graph

11877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
evanchia-ly-sdets dbb4e76a3d updating python packages py, pillow, and urllib3 (#7155) 
* updating python packages py, pillow, and urllib3

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

* updating dependencies versions as well

Signed-off-by: evanchia <evanchia@amazon.com>
 2022-02-11 09:02:22 -08:00
moraaar 7150a28ed6 Mesh Component: Add button to the Mesh Asset field to open mesh FBX settings (#7547) 
This is an UX improvement for Mesh Component as the user can quickly access FBX settings of the mesh to modify it if they so desire.

Video
https://user-images.githubusercontent.com/27999040/153414278-f7996b9a-8a28-49d4-92a8-daeb9924b148.mp4

Signed-off-by: moraaar moraaar@amazon.com
 2022-02-11 09:08:33 +00:00
dmcdiarmid-ly 257f3cb1ce Merge pull request #7541 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-17288 
Application MSAA state
 2022-02-10 19:34:30 -07:00
Steve Pham 27abad7564 Fix Mac SQL Package (#7538) 
* Update mac SQLite3 package to fix bad version

Signed-off-by: spham <82231385+spham-amzn@users.noreply.github.com>
 2022-02-10 13:32:22 -08:00
Jeremy Ong f709ba07a9 Merge pull request #7545 from aws-lumberyard-dev/Atom/GraphicsDevMode 
Introduce Atom/GraphicsDevMode settings registry key
 2022-02-10 11:48:44 -07:00
dmcdiarmid-ly 0789fbfa85 Merge pull request #7544 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-17278 
Fix for Vulkan startup failure on non-RT platforms
 2022-02-10 11:13:06 -07:00
Mike Balfour 6791b652cc Fix memory allocation that caused benchmark runs to crash. (#7535) 
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2022-02-10 10:17:01 -06:00
SergeyAMZN a715897699 Merge pull request #7439 from aws-lumberyard-dev/TerrainMaterialsFix 
LYN-8403 Prevent the same Surface Tag from getting reused
 2022-02-10 15:59:24 +00:00
amzn-sj 396ec8a247 [Terrain] Optimize bulk queries to the Terrain System to retrieve height, surface weights, and normals (#7357) 2022-02-10 05:53:21 -08:00
moraaar dac3bc4ba6 Added option to disable edit button in asset widgets when there are no asset selected. (#7521) 
Added new attribute "DisableEditButtonWheNoAssetSelected" to PropertyAssetCtrl. By default it's false, keeping the original behavior of leaving the edit button enabled and if it's clicked while there is no asset assigned it'll try to create a new one.

PhysX mesh asset property uses now this new feature.

Signed-off-by: moraaar moraaar@amazon.com
 2022-02-10 12:23:38 +00:00
Sergey Pereslavtsev c964d2085f Removed pragma once from cpp 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2022-02-10 10:45:25 +00:00
Sergey Pereslavtsev 469fcc4fb2 Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix 2022-02-10 10:40:38 +00:00
Jeremy Ong aec7b58c39 Introduce Atom/GraphicsDevMode settings registry key 
When `"Atom": {"GraphicsDevMode": true}` is found in a `.setreg` file,
PDBs for all shaders will be emitted to their corresponding output
locations. This allows global PDB generation without needing to
explicitly modify each `.shader` file to include the `GenerateDebugInfo`
compilation option.

Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2022-02-10 02:27:49 -07:00
dmcdiarmid-ly 3ad7888107 Checked the device raytracing feature flag before initializing the visualization raytracing objects 
Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com>
 2022-02-09 22:11:43 -07:00
Danilo Aimini 1c3a61983a Refactor EditorEntityUiHandlerBaseto be explicitly Outliner-focused. This lays the groundwork for multiple widget-based handlers in the future. (#7443) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-02-09 20:50:32 -08:00
Chris Galvan a4a1514729 Merge pull request #7509 from aws-lumberyard-dev/daimini/FocusMode/boxSelectAndManipulatorsHidingTests 
Focus Mode | Create an integration test for Box Select while in Focus Mode
 2022-02-09 21:44:21 -06:00
evanchia-ly-sdets 5ef2b12dca Collects failed assets on LyTestTools test failures (#7368) 
* Collects failed assets on LyTestTools test failures

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

* Changed query to all lines because of current asset logging bug

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

* fixes per pr feedback

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

* testing removing change for AR failure

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

* Moved asset log artifact collection to after the results have been collected

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

* Adding debug line to help debug AR failure

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

* Made asset log collection non failing

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

* moved asset log collection after test result collection

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

* changed asset saving to non failing

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

* improved logging and comments

Signed-off-by: evanchia <evanchia@amazon.com>
 2022-02-09 18:13:01 -08:00
Luis Sempé cdedd38767 Merge pull request #7523 from aws-lumberyard-dev/scripting/xfail_tests 
Disabled tests that are reported failing on nightly builds
 2022-02-09 16:21:49 -08:00
Ken Pruiksma dc5d50a4ce Terrain default surface material (#7481) 
Terrain default surface material
This adds the ability to set a default material on detail material regions as a fallback material for when there are no materials for an assigned surface tag, or there's only one surface tag but its weight is less than 1.0.

This also fixes some issues
- The terrain surface list component now correctly sends notifications on tag changes.
- The terrain area material notifications bus now has two separate change notifications - one for material, the other for tag
- The terrain renderer will now only consider a single region per point queried instead of any region that might have a matching surface tag.
 2022-02-09 17:41:38 -06:00
michabr e5800d738a Fix position of newly created UI element (#7510) 
Signed-off-by: abrmich <abrmich@amazon.com>
 2022-02-09 15:27:53 -08:00
dmcdiarmid-ly 9d6062d96f Added an RPISystemInterface method to set the application-wide MSAA state 
The Editor will now properly apply the MSAA state from MainRenderPipeline.azasset
Corrected a race condition with the cubemap baking pipeline

Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com>
 2022-02-09 16:18:43 -07:00
carlitosan 51bac9a6c0 remove code that loads member variables on SC editor component twice (#7506) 
* remove code that loads member variables on SC editor component twice

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>

* fix unused variable release build error

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2022-02-09 14:45:56 -08:00
Benjamin Jillich caae0b0ec3 Motion Matching: Fix for test build on nightly linux builds (#7522) 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2022-02-09 16:18:19 -06:00
Chris Galvan daee055a97 Merge pull request #7526 from aws-lumberyard-dev/cgalvan/ImproveImageGradientGetValuesPerformance 
Improved image gradient GetValue(s) performance by using cached image data
 2022-02-09 16:11:45 -06:00
Mike Balfour f79fa57b4a Fix race condition crash with the gradient preview. (#7530) 
When duplicating an entity with a Gradient SurfaceData Component, it's possible to get a hang/crash due to a race condition between entity deactivation and the gradient preview job refresh. This change ensures that the preview job is canceled on deactivation.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2022-02-09 16:09:08 -06:00
Chris Galvan 2e762ba0eb Modified activate logic from PR feedback 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-02-09 14:35:34 -06:00
Sean Sweeney 2a977510de Merge pull request #7527 from aws-lumberyard-dev/physics_fix 
Prevent unsafe calls to AssetProcessor
 2022-02-09 12:21:14 -08:00
sweeneys f5463bd903 Prevent unsafe calls to AssetProcessor 
Signed-off-by: sweeneys <sweeneys@amazon.com>
 2022-02-09 10:40:11 -08:00
carlitosan f74e980659 fix errors when generic nodes fail to add slots (#7508) 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2022-02-09 10:23:16 -08:00
Chris Galvan 2f3c4d37df Improved image gradient GetValue(s) performance by using cached image data 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-02-09 12:22:38 -06:00
carlitosan 8cd8638316 initial locale safety for translating to Lua on multiple platforms (#7490) 
* initial locale safety for translating to Lua on multiple platforms

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>

* fix android build error

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2022-02-09 10:19:39 -08:00
lsemp3d 08a9f908a2 Disabled tests that are reported failing on nightly builds 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2022-02-09 09:16:21 -08:00
jromnoa fee95f3f5e sandboxing the sponza level from the level test because it causes a hardlock 4%-12% of the time (#7513) 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2022-02-09 08:10:33 -08:00
Chris Galvan 39777e7afb Merge pull request #7406 from aws-lumberyard-dev/cgalvan/ImageGradientStreamingImageSupport 
Updated the image gradient component to use a streaming image asset
 2022-02-09 09:40:54 -06:00
moraaar b2206be14d Fixed range-loop-analysis warninig reported as error on mac/ios (#7511) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2022-02-09 13:37:34 +00:00
Danilo Aimini 220eeef386 Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/boxSelectAndManipulatorsHidingTests 2022-02-08 18:39:33 -08:00
Danilo Aimini 8c54513867 Add box selection tests for Editor Focus Mode 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-02-08 16:59:25 -08:00
santorac 3f32669883 Merge pull request #7449 from aws-lumberyard-dev/Atom/santorac/RemixableMaterialTypes4_FlatMaterialFiles 
Changed the Material File Format to Use a Flat Property List
 2022-02-08 16:19:55 -08:00
Jeremy Ong d666b7a1e8 Merge pull request #7437 from aws-lumberyard-dev/Atom/ShaderRefactor 
Shader refactor (no functional changes)
 2022-02-08 17:05:34 -07:00
Nicholas Van Sickle bc3f957270 Merge pull request #7093 from aws-lumberyard-dev/nvsickle/DomPatch 
Add AZ::Dom::Patch, a Generic DOM analog to JSON patch
 2022-02-08 18:49:57 -05:00
chiyenteng 90503f2bef Remove error message from InMemorySpawnableAssetContainer (#7499) 
* Remove error message from InMemorySpawnableAssetContainer

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Fix nits

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2022-02-08 15:25:35 -08:00
Nicholas Van Sickle 42c2243eaa Fix benchmark non-unity build 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2022-02-08 14:34:04 -08:00
Sean Sweeney 25016112ca Merge pull request #7446 from AMZN-scspaldi/scspaldi_launcher_sanity_tests 
Added server launcher sanity test.
 2022-02-08 14:23:50 -08:00
santorac 1894cd60c7 Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes4_FlatMaterialFiles 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2022-02-08 14:07:32 -08:00
Jeremy Ong 5f914e8e1a Add README to describe upcoming material type changes 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2022-02-08 14:55:50 -07:00
Jeremy Ong faa65bca1b Refactor shader definitions to be more consistent with other shaders 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2022-02-08 14:55:48 -07:00
Jeremy Ong 86d8ececfb Resolve incorrect SHADOWS definitions 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2022-02-08 14:55:46 -07:00
Jeremy Ong 9ed9bcbb2f Fix incorrect include header casing 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2022-02-08 14:55:44 -07:00
Jeremy Ong 4bcc83e7ac Address PR feedback, ensure all ASV tests pass 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2022-02-08 14:55:42 -07:00
Jeremy Ong 7aace39c2f Consolidate alpha retrieval and clip 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2022-02-08 14:55:41 -07:00