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

8523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hershey5045 9c57c9e64f Fix track view bug where postfxs do not render correctly. (#5465) 
* Fix track view bug where postfxs do not render correctly.

Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com>

* Reduce scope and add comments.

Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com>
 2021-11-10 16:03:50 -08:00
Danilo Aimini 27f0aa7f13 LYN-7468 | Viewport manipulators for the container of the focused prefab should be hidden (#5432) 
* Extend the level entity behavior to open prefab containers in focus mode. Disable manipulators for these entities too.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor adjustments

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix enum casing in Entity Inspector.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Split views between for Level and FocusedContainer entities.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Slightly different fix to support components on focused containers.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor fixesto RefreshSelectedEntityIds.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-11-10 14:43:32 -08:00
antonmic 0712bc7f87 Merge pull request #5482 from aws-lumberyard-dev/Atom/antonmic/skinMeshSrgFix 
Fixed issue where skin material wouldn't render if applied to a model with several submeshes and those submeshes had different material types applied to them.
 2021-11-10 14:28:51 -08:00
jiaweig d5081a47db Fix/update swapchain recreation on vsync interval changes (#5502) 
Signed-off-by: jiaweig <51759646+jiaweig-amzn@users.noreply.github.com>
 2021-11-10 13:32:23 -08:00
Qing Tao 21a254e9dc Fixed a type with pass filter (#5506) 
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
 2021-11-10 13:15:04 -08:00
Junbo Liang cf58398c6c [AWSMetrics] Fail to build the project when include AWSMetricsBus header in the project C++ code (#5468) 2021-11-10 13:05:32 -08:00
AMZN-Phil cd2b1fa91c Merge pull request #5503 from aws-lumberyard-dev/Prism/CLIDelFileFolderFix 
Fix trying to remove a cache file
 2021-11-10 12:21:31 -08:00
antonmic 3fd03479de Addressed PR feedback 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-11-10 11:56:45 -08:00
sphrose 2fe40929e6 Merge pull request #4625 from aws-lumberyard-dev/terrain/sphrose/dependency_tests 
Add missing shape failure test, tidying up.
 2021-11-10 19:52:26 +00:00
amzn-mike e0cc86e898 Remove AssetProcessorManagerTest AssertAbsorber and update test to use the one from the base class instead (#5216) (#5381) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit b3301414ad)

# Conflicts:
#	Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
 2021-11-10 13:21:42 -06:00
Guthrie Adams 87c7023e3c Merge pull request #5109 from aws-lumberyard-dev/Atom/guthadam/material_editor_loads_source_data2 
Material editor creates material assets from source JSON data instead of relying on AP
 2021-11-10 12:31:17 -06:00
Chris Galvan 314861699d Merge pull request #5492 from aws-lumberyard-dev/cgalvan/FixedScriptCanvasEntityIdSlotNames 
Updated some Script Canvas node slot names to EntityID for consistency.
 2021-11-10 12:30:43 -06:00
AMZN-Phil f2e191ea77 Fix trying to remove a cache file 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-10 10:28:32 -08:00
Shirang Jia 576248a870 Merge Jenkinsfile from development to stabilization (#5391) 
Signed-off-by: shiranj <shiranj@amazon.com>
 2021-11-10 10:26:44 -08:00
SJ 0c546828d6 1. Add nullptr checks to prevent crashes when non-critical shaders fail to compile. (#5451) 
2. Add a higher "launch_ap_timeout" for Mac because launching a newly built/downloaded AP can take a while.

Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-11-10 11:31:59 -06:00
sphrose 7159e3fe57 Moving to stabilization 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-11-10 17:22:55 +00:00
Guthrie Adams f0b4eb1712 update comment and error message 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 10:54:53 -06:00
Chris Galvan 847e13154f Updated some Script Canvas node slot names to EntityID for consistency. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-10 09:55:49 -06:00
jonawals adf3357176 Merge pull request #5486 from aws-lumberyard-dev/viewport/ghi_5239 
Fix for Issue #5239: Component Edit Mode does not disable Entity Inspector interaction
 2021-11-10 14:50:36 +00:00
AMZN-Igarri 027b0f86ae Activate AssetBrowserTableView feature (#5367) 
Signed-off-by: igarri <igarri@amazon.com>
 2021-11-10 13:41:59 +00:00
John 0e3df14ea2 Add missing bus connection/disconnection. 
Signed-off-by: John <jonawals@amazon.com>
 2021-11-10 11:59:28 +00:00
sphrose c28e92bf51 Merge pull request #5441 from aws-lumberyard-dev/terrain/sphrose/field_name_fix_LYN-8004 
Various bug fixes.
 2021-11-10 10:30:01 +00:00
antonmic 1f72001cdb Added two missing MeshDataInstance to ModelDataInstance renames in error message 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-11-10 00:56:25 -08:00
antonmic dcbcab68d2 merging latest to resolve auto-merge conflict 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-11-10 00:52:59 -08:00
santorac 0ae2d75261 Merge pull request #5393 from aws-lumberyard-dev/Atom/santorac/FixSkinScreenshotTests 
Updated 002_wrinkle_regression_test.material to avoid subsurface scattering artifacts

Having subsurface scattering into a completely back area is an unrealistic scenario and caused colored artifacts. I changed the material to mask out the black areas from applying SS. Corresponding changes will be made to the expceted screenshot in AtomSampleViewer as well.
 2021-11-09 19:28:40 -08:00
antonmic dadf06edda Fixed issue where skin material wouldn't render if applied to a model with several submeshes and those submeshes had different material types applied to them. 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-11-09 19:03:26 -08:00
santorac d6348384c3 Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/FixSkinScreenshotTests 2021-11-09 16:11:23 -08:00
Ken Pruiksma 31439eb7c8 Adding m_exposure field to terrain's object srg to sync it with the default object srg. (#5462) 
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2021-11-09 17:52:26 -06:00
moraaar 15586ee53e Adding missing pragma once at XcbInputDeviceMouse.h (#5448) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-11-09 15:42:01 -08:00
Alex Peterson 461b63c61a Temporarily disable the platform filter (#5454) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-09 14:14:13 -08:00
Chris Galvan 4a4a6d1873 Merge pull request #5458 from aws-lumberyard-dev/cgalvan/FixedPythonToolGemDependencyOnQtForPython 
Ensure QtForPython is a proper dependency for the PythonToolGem.
 2021-11-09 16:09:25 -06:00
AMZN-Phil 93c5627c14 Merge pull request #5347 from aws-lumberyard-dev/Prism/clouddownloadicon 
Create download UI once
 2021-11-09 14:01:05 -08:00
chiyenteng caf1c18fbe Prevent track editor view's default size to be zero (#5453) 
* Prevent track editor view's default size to be zero

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

* minor rewording

Signed-off-by: chiyteng <chiyteng@amazon.com>
 2021-11-09 12:40:56 -08:00
dmcdiarmid-ly 897fd955e2 Merge pull request #5431 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16247 
ReflectionProbe exposure controls
 2021-11-09 12:39:46 -08:00
Chris Galvan 7cc9c584b7 Ensure QtForPython is a proper dependency for the PythonToolGem. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-11-09 13:53:04 -06:00
Brian Herrera 770378959a Merge pull request #5450 from aws-lumberyard-dev/retry-failure-fix 
Remove timeout in the mount step
 2021-11-09 11:47:55 -08:00
AMZN-Phil c7e5a0fe12 Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/clouddownloadicon 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-09 11:39:51 -08:00
jiaweig e3b1c4b7d0 Move swapchain and image recreation to the end of the frame (#5388) 
Signed-off-by: jiaweig <jiaweig@amazon.com>
 2021-11-09 11:27:32 -08:00
dmcdiar eb60dd404b Moved probe exposure to specular only, since it's not used by the diffuse 
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
 2021-11-09 12:17:58 -07:00
santorac 68ceb9ed94 Merge pull request #5437 from aws-lumberyard-dev/Atom/santorac/CherrypickFixSceneSrgTime2 
Cherrypick: Fixed potential render scene time precision issues
 2021-11-09 11:00:31 -08:00
AMZN-Phil e9c3a453c5 Merge pull request #5341 from aws-lumberyard-dev/Prism/CheckGemUpdates 
Add ability to overwrite o3de object when downloading
 2021-11-09 10:41:35 -08:00
lumberyard-employee-dm 5fc4551ac0 [LYN-8041] Enable relocation of the Project Game Release Layout (#5380) 
* Enable relocation of the Project Game Release Layout

Relocating the Project Game Release Layout to another directory on the file system failed due to the querying of the engine root failing due to the ComponentApplication::m_engineRoot not using the project path stored in the SettingsRegisry if the engine root cannot be detected

Removed the ApplicationRequestBus GetEngineRoot function.
The ComponentApplicationRequestBus has a function of the same name that returns the same path.

Removed the deprecated GetAppRoot function.
The path it returns has no defined value. It was not the engine root or the project root.
Removed unused CFileUtil and CFileUtil_impl functions that were invoking the ApplicationREquestBus GetEngineRoot function.
On the way to update the functions it was discovered that they aren't called

Added a CalculateBranchToken overload that can populate a fixed_string to avoid heap allocations

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

* Protect against an empty list of artifacts to remove when generating the
engine.pak

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-09 12:03:52 -06:00
brianherrera c182b213ad Remove timeout in the mount step 
We no longer need a timeout here. A timeout mechanism was added to the mount script to raise an exeception if the EBS volume is not mounted in the configured timeframe.

This also causes a bug with the retry mechanism where Jenkins will hit this timeout in the event the node goes offline during the setup stage instead of raising an exception.

Signed-off-by: brianherrera <briher@amazon.com>
 2021-11-09 10:02:11 -08:00
Alex Peterson d053a03b5f Don't update status filter when filling gem model (#5427) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-09 09:38:23 -08:00
Nicholas Van Sickle ec74d363f3 Merge pull request #5297 from aws-lumberyard-dev/nvsickle/FixEntityOrdering 
Fix Entity Outliner sort order with Prefabs enabled
 2021-11-09 09:29:12 -08:00
santorac 6a28587a56 Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/CherrypickFixSceneSrgTime2 2021-11-09 09:21:33 -08:00
sphrose bff8a2e147 improved fix 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-11-09 16:00:26 +00:00
John Jones-Steele c35f74e9ce Physics/test axis aligned box shape configuration works #7378a (#5366) 
* Safety commit before merging

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Moved from Physics to Terrain

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR + AR fix

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fixed another AR bug

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fixed another AR compilation bug

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* More PR changes

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Added virtual destructor

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Added TestSuite_main_Optimized.py

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Further fixes for PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fix to editor_test.py

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Testing prefab level

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Testing slice level

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Testing prefab level

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Disabled orefab loading for the time being.

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2021-11-09 14:11:33 +00:00
John Jones-Steele 938899a495 Minor fixups for terrain physics collide lyn 7692 (#5413) 
* First commit

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* completed changes

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2021-11-09 13:24:10 +00:00
lumberyard-employee-dm 1998c53882 Non MSVC Release build fix (#5428) 
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-09 10:19:04 +00:00