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

8597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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>
 2021-11-15 10:54:34 -06:00
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>
 2021-11-15 10:51:16 +00:00
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>
 2021-11-12 16:23:04 -08:00
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>
 2021-11-12 14:16:44 -08:00
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
 2021-11-12 14:54:36 -06:00
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>
 2021-11-12 13:51:07 -06:00
Guthrie Adams 520c2b52d4 Merge pull request #5584 from aws-lumberyard-dev/Atom/guthadam/remove_mtl_references 
Removing references and builders for legacy MTL assets
 2021-11-12 13:47:50 -06:00
kberg-amzn cb1a45f9ec Merge pull request #5578 from aws-lumberyard-dev/LYN-7816_FixNoParamRPCCompilation 
RPCs Without Parameters Compile
 2021-11-12 11:37:04 -08:00
Alex Peterson c0df1846f4 Create desktop shortcut functionality (#5536) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-12 11:03:43 -08:00
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>
 2021-11-12 08:40:56 -08:00
Esteban Papp bceadf7597 Fixes for CMake 3.22rc (#5314) (#5580) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-12 08:40:10 -08:00
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>
 2021-11-11 21:48:47 -06:00
Guthrie Adams 172ec938cc moved AssetSystemStub to TestUtils folder 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 21:47:21 -06:00
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>
 2021-11-11 21:46:40 -06:00
Guthrie Adams 7d51912a6e updated comments 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 21:46:17 -06:00
Guthrie Adams 1689b880fe added version to material component exporter 
deleted unnecessary checks

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 21:45:53 -06:00
Guthrie Adams b3f3a4245b updated image paths to use new function 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 21:45:32 -06:00
Guthrie Adams b379c489b5 updated comment 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 21:45:04 -06:00
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>
 2021-11-11 21:44:25 -06:00
Guthrie Adams f18f838da6 material editor and exporter save source materials with relative paths 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 21:43:51 -06:00
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>
 2021-11-11 17:36:12 -08:00
Guthrie Adams 320ae45989 Removing material type asset info 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 19:20:09 -06:00
Guthrie Adams 44f2cbae47 Removing material builder and related tests 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 19:20:07 -06:00
Guthrie Adams 92c0e598d5 Starting to remove MTL asset references 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 19:20:04 -06:00
Alex Peterson 2fa3c134e0 Terrain depends on SurfaceData and GradientSignal (#5476) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-11 17:18:36 -08:00
Gene Walters 2cd732de6c Fixing RPC autogen so that RPCs without parameters compile (and function). 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-11 16:43:49 -08:00
Junbo Liang b8f7767cd6 [Resource Mapping Tool] make top-level Account id optional in ResourceMapping tool schema (#5569) 
* [Resource Mapping Tool] make top-level Account id optional in ResourceMapping tool schema

Signed-off-by: junbo75 <68558268+junbo75@users.noreply.github.com>
 2021-11-11 16:11:52 -08:00
rgba16f e4ca568433 cherry pick atom optimizations 
Pull over the changes to move some expensive validation to debug builds only, and use finer grained jobs for the frame scheduler work.
 2021-11-11 17:22:08 -06:00
Allen Jackson 6ffee4b0a8 {lyn7352} adding more logging around mock_asset_builder.py (#5103) (#5566) 
o3de\AutomatedTesting\Gem\PythonTests\PythonAssetBuilder\mock_asset_builder.py
- adding more logging
- updated keys for platforms (pc, server)

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2021-11-11 16:07:02 -06:00
galibzon e0d736dd84 Fixed the other call to CreateVariable (#5561) 
in favor of CreateVariableEx

Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
 2021-11-11 16:04:22 -06:00
AMZN-Phil 0b211d3743 Merge pull request #5513 from aws-lumberyard-dev/Prism/DeleteUpdateGemsUI 
Adds Update and Uninstall Options for Downloaded Remote Gems to Gem Catalog
 2021-11-11 14:01:42 -08:00
Tommy Walton e3c3db4ba6 In Atom_Feature_Common.static, get cvar values from cvar system instead of reading directly (#5350) 
Signed-off-by: Tommy Walton <waltont@amazon.com>
 2021-11-11 12:55:23 -08:00
Tommy Walton f1d9e7ae28 Skybox hot reloading - fix black screen when running the editor for the first time with a clean cache (#5529) 
* Add a default fallback image when a StreamingImageAsset fails to load

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Don't release a missing/invalid texture reference in the skybox component. Hold on to the reference so that it can hot-reload

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Don't release a missing/invalid texture reference in the ibl component. Hold on to the reference so that it can hot-reload

Signed-off-by: Tommy Walton <waltont@amazon.com>

* 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>

* Adding the stubbed in fallback textures

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Updated the seedlist for the RPI to include the fallback images. It only needs the default and the missing asset images, since the AP doesn't run in release builds, the asset status will always be unknown, not processing or failed to process, so if an asset is not bundled, it is just missing.

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Switched to GetAssetIdByPath and removed some tabs

Signed-off-by: Tommy Walton <waltont@amazon.com>
 2021-11-11 12:55:06 -08:00
rgba16f 394ba9a8bc Atom CPU threading optimization (#5481) 
* Small change to make the RasterPass Scope jobs split the work more evenly over the cores

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update with PR feedback. Remove scale of EstimatedItemCount, modify the command list cost threshold instead

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-11-11 14:32:42 -06:00
rgba16f 71eedb895d Move PipelineStateCache validation of set uniqeness to only be active in debug builds (#5472) 
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-11-11 14:32:30 -06:00
nggieber 2b248ac485 Fix merge issue and validation issue 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-11 12:09:24 -08:00
nggieber 3d21a9f4bd Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 2021-11-11 11:52:49 -08:00
Steve Pham cbe2948ba8 Merge pull request #5555 from aws-lumberyard-dev/ghi-4320/ProjectManagerLinuxDefaultClang 
Project Manager Fixes for Linux
 2021-11-11 11:21:06 -08:00
nggieber d71196102f More PR feedback changes 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-11 10:20:46 -08:00
AMZN-Phil 08848ac781 Merge pull request #5493 from aws-lumberyard-dev/Prism/AdditionalProgressFixes 
Handle servers with no content length and make downloading more obvious
 2021-11-11 10:00:08 -08:00
sphrose fac3d0b1bf Merge pull request #5543 from aws-lumberyard-dev/terrain/sphrose/lost_unit_tests 
Redoing tests that got lost when TerrainPhysicsManager was merged.
 2021-11-11 17:46:38 +00:00
Steve Pham 289d783f25 Fixes for Project Manager on Linux 
- Fix error with EngineFinder using the wrong path to locate project.json
- Simplified and expanded clang detection
- Remove forcing clang-12 for builds and will rely on the new cmake detection of clang by default

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-11-11 09:41:45 -08:00
Tom Hulton-Harrop 2812ec2024 Fix brute force mesh intersection function (#5447) 
* fix brute force mesh intersection function

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add test for brute force ray intersection fix

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* refactor tests to remove as much duplication and provide API for future tests if required

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* small updates after review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update following review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for pointer offset

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-11 16:33:08 +00:00
AMZN-Phil c07b666bec Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/AdditionalProgressFixes 2021-11-11 08:19:21 -08:00
Esteban Papp 4e1825a3fe Better compiler detection on Linux (#5376) 
* Better compiler detection on Linux
Moving EngineFinder.cmake to cmake/ in the templates

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

* skipping detection if compiler is passed through environment

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

* Fixes condition, needs to be in quotes since is the value of the sttring

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-11 08:17:33 -08:00
AMZN-stankowi 6e70097ad7 Fixed all errors with default seeds (#5489) 
* 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>
 2021-11-11 07:50:25 -08:00
AMZN-stankowi 2df8d5b620 Fixed crash if you save a bundle outside the default bundle folder (#4974) (#5255) 
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
 2021-11-11 07:50:16 -08:00
jonawals de4e2d6308 Merge pull request #5544 from aws-lumberyard-dev/viewport/LYN-7989 
Remove SurfaceManipulator.
 2021-11-11 13:36:55 +00:00
sphrose 398decd06e review changes 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-11-11 12:57:48 +00:00
AMZN-Igarri 4e0e3c7904 Entering the Game Mode when the SlideAlongAxisBasedOnAngle in the Camera Rig is set results in an assert (#5410) 
* Fixed assert and added None behavior.

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

* cleaned up file

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

* Switched over to checkboxes

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

* Fixed naming.

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

* Fixed naming

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

* Fixed serialize version and zero vector normalization

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

* Cleaned up format.

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

* Fixed Warnings

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
 2021-11-11 12:16:11 +00:00