Commit Graph

8791 Commits (dbc5d7a8bc5404b80fbc38b6b004aaa1f9e06df9)
 

Author SHA1 Message Date
AMZN-Igarri a5adf33427
Deactivate new Asset Picker View by default in the Editor (#5614)
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
4 years ago
santorac 224e0bd20f Removed the 'data-warnings' concept for checking before saving a material document. It's no longer necessary since we no longer replace the original data with placeholders.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac a789d7b762 Minor code cleanup.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac 2657620846 Minor code cleanup.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac 1b9526a1e2
Merge pull request #280 from aws-lumberyard-dev/Atom/santorac/MaterialEditorHandlesMissingTextures2
Changed the overall strategy for how to handle missing image references
4 years ago
santorac aa85963a2b Fixed MaterialPropertyValue::FromAny to preserve the Hint string when converting Asset objects. This fixed an issue where the hint didn't show up in the Material Component's instance inspector.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
nggieber 7f57548023 Adds triangle under cart button when cart is shown
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
santorac 7d849cc0d2 Changed the overall strategy for how to handle missing image references. Instead of replacing it with one of the placeholder assets, we replace it with an random UUID which will be interpreted as a missing asset (unless some discovers discovers a UUID collision). This eventually gets replaced by one of the placeholder textures at runtime. This approach gives more consistent results in how missing texture are handled between Material Editor and Material Component.
I actually tried this approach before and it didn't seem to work the way we needed, but I realized that's because PropertyAssetCtrl wasn't handling missing assets properly. I fixed a few issues there including showing the error button when the asset can't be found, and fixing a broken reference to the error icon file.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
Chris Galvan 7031147e32
Added event to signal when the Editor is fully initialized so test scripts can listen for that instead of needed arbitrary wait commands. (#5623)
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
allisaurus e1fb2ad368
Update resource mapping schema to make default account ID optional (#5475)
Signed-off-by: Stanko <stankoa@amazon.com>
4 years ago
amzn-mike 8b7e538dd3
Cherry Pick: [LYN-7463] Fix insert streaming request failure (#5604) (#5622)
* Fix race condition where asset would finish loading and another request would start before the streamer request could be cleared

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Re-enable disabled test which was failing for the same reason.

Fix test timeout which was way too long.
Reduce test iterations to keep test time safely under 5 seconds.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Instead of using a mutex, re-order the statements to remove the streamer request first

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 0cea59d669)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
carlitosan 82c83b2c5a
Merge pull request #5600 from aws-lumberyard-dev/carlito_fix_sc_rt_asset_load
Move SC runtime asset static initialization out of data loading threads
4 years ago
amzn-sj fc547d902c
Add message to indicate Json serialization of bitset is not supported (#5590)
Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
AMZN-Phil 18cf128854 Remove some code duplication
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Guthrie Adams bc82afa87a
Merge pull request #5606 from aws-lumberyard-dev/Atom/guthadam/fixing_double_registration_of_hair_asset
Fixing double registration of hair asset
4 years ago
Guthrie Adams 3d84876e87
Merge pull request #5615 from aws-lumberyard-dev/Atom/guthadam/material_editor_taking_focus_when_opening_new_document
Bug fix for material editor not taking focus when opening a new docum…
4 years ago
Mikhail Naumov b3e2c3f075
SetComponentProperty is now supported by undo operation (#5599)
* Adding undo support to SetComponentProperty to make it function with prefab system

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Renaming a variable

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* PR feedback

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
nggieber 1ed0e09399 Merge branch 'stabilization/2110' into Prism/FixGemCart 4 years ago
nggieber e62af4260b Moves Cart to Right Panel with Gem Inspector
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
mrieggeramzn 5c0fe6a54f
Fix for CSM shimmering (#5607)
* Fix for CSM shimmering

Signed-off-by: mrieggeramzn <mriegger@amazon.com>

* removing debug code

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
4 years ago
mrieggeramzn 533b80095b
Fix for cascade shadow map clipping out too close to the camera (#5509)
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
4 years ago
AMZN-stankowi c44d03a40d
Asset bundler test fixes (#5548)
* Cleaning up errors with default assets, used in bundled release builds

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated simple asset references to be to the product, not source assets

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed test_WindowsAndMac_FilesMarkedSkip_FilesAreSkipped to pass again.

Updated the test to verify the assets are actually skipped and not just missing, by having it first run without the skip command and verify they are in the first run. Also updated logging to print out sorted lists, to make it easier to debug failures on Jenkins in the future.

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed a test marked skip for legacy levels that featured a lot of assets that are no longer valid.

I don't think we need this specific test anymore in the future because prefabs replace the level system, and prefabs should have their own tests for product dependencies.

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated project path to use absolute path (#5459)

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Updated project path to work with latest project path changes

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Changed to workspace.paths.project() for getting full path to projects

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

Co-authored-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Guthrie Adams d9746647e1 Bug fix for material editor not taking focus when opening a new document from the main editor or outside of the material editor
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
AMZN-Phil 07c142b975 Remove temporary changes and remove key before building
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-Igarri f2068397fa
CameraRigComponent - Disable Component Checkbox when the two others are toggled (#5546)
* Disable component checkbox when the other two components are already ignored.

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed EditContext Indents

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed Header file

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed Spaces

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* fixed new line

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
4 years ago
Guthrie Adams 1925d08f41 Fixing double registration of hair asset
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
AMZN-nggieber 76b7e73f6f
Fully Replaces Remote Gems in Model and Selects Them When Downloading and Deleting (#5593)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
carlitosan d0cf18e778 remove test code artifact
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan c140b882d2 Fix mis-spelled comment
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
Danilo Aimini 5ec5824849
Hide the "up one level" button temporarily. (#5595)
Signed-off-by: Danilo Aimini <daimini@amazon.com>
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
carlitosan 9898b6ee45 Move SC runtime asset static initialization out of data loading threads
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
Guthrie Adams 4d3c977d58
Merge pull request #5585 from aws-lumberyard-dev/Atom/guthadam/cherrypick_material_relative_paths_to_stab
Cherry pick material editor saves relative paths to external references and test support to stabilization
4 years ago
galibzon b0dfe26232
The Build Time Stamp of ShaderAsset And (#5373)
* The Build Time Stamp of ShaderAsset And
ShaderVariantAsset Should Be Based On
GetTimeUTCMilliSecond()

GetTimeNowMicroseconds() is useful to measure time stamp differences.
GetTimeUTCMilliSecond() is for time stamps based on absolute clock/wall time.

* Updated DiffuseGlobalIllumination precompiled shaders

Co-authored-by: dmcdiar <dmcdiar@amazon.com>
Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
4 years ago
Guthrie Adams 520c2b52d4
Merge pull request #5584 from aws-lumberyard-dev/Atom/guthadam/remove_mtl_references
Removing references and builders for legacy MTL assets
4 years ago
kberg-amzn cb1a45f9ec
Merge pull request #5578 from aws-lumberyard-dev/LYN-7816_FixNoParamRPCCompilation
RPCs Without Parameters Compile
4 years ago
Alex Peterson c0df1846f4
Create desktop shortcut functionality (#5536)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
santorac 282c93c20c Removed source art files for default textures.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac 013b0c97e0 Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 4 years ago
Esteban Papp b44ce82435
Private dependencies are not propagated to other targets in generated install layout (#5581)
* transfering private dependencies as runtime dependencies for the generated targets in the install layout

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Update cmake/Platform/Common/Install_common.cmake

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

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

* Update cmake/Platform/Common/Install_common.cmake

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

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

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp bceadf7597
Fixes for CMake 3.22rc (#5314) (#5580)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Guthrie Adams 198f225bbe Updating parent path usage has part of cherry picked from stabilization combining source data changes with relative path changes
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams 172ec938cc moved AssetSystemStub to TestUtils folder
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams 01ce02ffec Added basic unit test for relative path function
Moved asset system stub to RPI utils

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams 7d51912a6e updated comments
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams 1689b880fe added version to material component exporter
deleted unnecessary checks

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams b3f3a4245b updated image paths to use new function
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams b379c489b5 updated comment
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams ed4f7965da Created function to get relative paths to referenced files that will fall back to asset folder relative paths under certain conditions
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams f18f838da6 material editor and exporter save source materials with relative paths
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Danilo Aimini a544800536
LYN-4946 | Merge Game Mode buttons in the Play Controls toolbar (#5557)
* LYN-4946 Double play buttons - Tranformer style into one.

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

* compile fix

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

* Changes as per review.

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

* Address minor confusion points.

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

* Fix rename operation missing some matches...

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

* Remove extra newline.

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

Co-authored-by: sphrose <82213493+sphrose@users.noreply.github.com>
4 years ago