birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,791 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'dbc5d7a8bc'
${ noResults }
Commit Graph

8791 Commits (dbc5d7a8bc5404b80fbc38b6b004aaa1f9e06df9)
 

Author SHA1 Message Date
greerdv 5054cfe9b5 fix typo 
Signed-off-by: greerdv <greerdv@amazon.com>
 4 years ago
santorac 2783248f03 Merge remote-tracking branch 'origin/Atom/amzn-tommy/ATOM-16289_SkyboxHotReloading' into Atom/santorac/MaterialEditorHandlesMissingTextures 4 years ago
santorac cd28d210ab Working on making Material Editor able to open materials that have missing textures. 
Made it a warning instead of an error when MaterialAssetCreator can't find a texture.
Updated the Material Editor's MaterialDocument class to not elevate warnings to errors.
Material Editor uses new features in TraceRecorder to show a message dialog when warnings are detected so the user is notified of the missing texture.

Next I will work on making MaterialAssetCreator put a "missing" texture in place of the requested one.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 4 years ago
Tommy Walton 98ca3aab6b Adding the stubbed in fallback textures 
Signed-off-by: Tommy Walton <waltont@amazon.com>
 4 years ago
jiaweig d5081a47db
Fix/update swapchain recreation on vsync interval changes (#5502) 
Signed-off-by: jiaweig <51759646+jiaweig-amzn@users.noreply.github.com>
 4 years ago
Tommy Walton 9a470f35ad Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/amzn-tommy/ATOM-16289_SkyboxHotReloading 
Signed-off-by: Tommy Walton <waltont@amazon.com>
 4 years ago
Tommy Walton 09b9d371e0 Use a different fallback image depending on the status of the asset. Including a setting to use a friendly image that is less obnoxious for anything that might have been missed in a release build 
Signed-off-by: Tommy Walton <waltont@amazon.com>
 4 years ago
Qing Tao 21a254e9dc
Fixed a type with pass filter (#5506) 
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
 4 years ago
Junbo Liang cf58398c6c
[AWSMetrics] Fail to build the project when include AWSMetricsBus header in the project C++ code (#5468) 4 years ago
nggieber 2913d72d17 Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 4 years ago
AMZN-Phil 0bc3e6a18f Let cart overlay be opened to view downloads even when there are no gems to be added or removed 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
nggieber f470351d0c Hook up Gem Updating and Uninstallation and fix lots of minor bugs between gem catalog and gem repos 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil cd2b1fa91c
Merge pull request #5503 from aws-lumberyard-dev/Prism/CLIDelFileFolderFix 
Fix trying to remove a cache file
 4 years ago
antonmic 3fd03479de Addressed PR feedback 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 4 years ago
sphrose 2fe40929e6
Merge pull request #4625 from aws-lumberyard-dev/terrain/sphrose/dependency_tests 
Add missing shape failure test, tidying up.
 4 years ago
greerdv d945a031c1 prevent twist limits being created with equal lower and upper limits 
Signed-off-by: greerdv <greerdv@amazon.com>
 4 years ago
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
 4 years ago
AMZN-Phil 541e501b06 Re-add the line to open the cart overlay automatically when a new download starts 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
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
 4 years ago
Chris Galvan 314861699d
Merge pull request #5492 from aws-lumberyard-dev/cgalvan/FixedScriptCanvasEntityIdSlotNames 
Updated some Script Canvas node slot names to EntityID for consistency.
 4 years ago
AMZN-Phil f2e191ea77 Fix trying to remove a cache file 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Shirang Jia 576248a870
Merge Jenkinsfile from development to stabilization (#5391) 
Signed-off-by: shiranj <shiranj@amazon.com>
 4 years ago
John 3ced915f8e Fix attempted rendering of invalid Entity selection boxes. 
Signed-off-by: John <jonawals@amazon.com>
 4 years ago
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>
 4 years ago
sphrose 7159e3fe57 Moving to stabilization 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 4 years ago
Guthrie Adams f0b4eb1712 update comment and error message 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 4 years ago
AMZN-Phil 0102894a83 Handle servers with no content length and make downloading more obvious 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Chris Galvan 847e13154f Updated some Script Canvas node slot names to EntityID for consistency. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
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
 4 years ago
AMZN-Igarri 027b0f86ae
Activate AssetBrowserTableView feature (#5367) 
Signed-off-by: igarri <igarri@amazon.com>
 4 years ago
John 0e3df14ea2 Add missing bus connection/disconnection. 
Signed-off-by: John <jonawals@amazon.com>
 4 years ago
sphrose c28e92bf51
Merge pull request #5441 from aws-lumberyard-dev/terrain/sphrose/field_name_fix_LYN-8004 
Various bug fixes.
 4 years ago
antonmic 1f72001cdb Added two missing MeshDataInstance to ModelDataInstance renames in error message 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 4 years ago
antonmic dcbcab68d2 merging latest to resolve auto-merge conflict 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 4 years ago
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.
 4 years ago
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>
 4 years ago
santorac d6348384c3 Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/FixSkinScreenshotTests 4 years ago
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>
 4 years ago
moraaar 15586ee53e
Adding missing pragma once at XcbInputDeviceMouse.h (#5448) 
Signed-off-by: moraaar <moraaar@amazon.com>
 4 years ago
Gene Walters c99071533d Small: fix typo 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
Gene Walters c8b9f05079 Ensuring the 4 types of RPCs (1)Autonomous->Authority (2)Authority->Autonomous (3)Authority->Client and (4)Server->Authority all compile. Invoking anything that starts from Autonomous or Authority requires a controller (otherwise just requires a component), and anything handled by Authority or Autonomous requires a controller for Handle on OnEvent methods (otherwise OnEvent and Handle occurs on the component) 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
Alex Peterson 461b63c61a
Temporarily disable the platform filter (#5454) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Chris Galvan 4a4a6d1873
Merge pull request #5458 from aws-lumberyard-dev/cgalvan/FixedPythonToolGemDependencyOnQtForPython 
Ensure QtForPython is a proper dependency for the PythonToolGem.
 4 years ago
AMZN-Phil 93c5627c14
Merge pull request #5347 from aws-lumberyard-dev/Prism/clouddownloadicon 
Create download UI once
 4 years ago
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>
 4 years ago
dmcdiarmid-ly 897fd955e2
Merge pull request #5431 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16247 
ReflectionProbe exposure controls
 4 years ago
Chris Galvan 7cc9c584b7 Ensure QtForPython is a proper dependency for the PythonToolGem. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 4 years ago
Brian Herrera 770378959a
Merge pull request #5450 from aws-lumberyard-dev/retry-failure-fix 
Remove timeout in the mount step
 4 years ago
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>
 4 years ago
nggieber a253bfc2f5 Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 4 years ago