Commit Graph

6652 Commits

Author SHA1 Message Date
chcurran e1e1779ec6 Fix for file size limit in JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-03 14:04:06 -07:00
chcurran c8ed6d287c Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-09-02 18:14:39 -07:00
chcurran f4dbeb6538 Fix list of manual inspection graphs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-02 18:14:00 -07:00
chcurran e69a5bc092 fix progress bar for upgrades
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-02 17:44:52 -07:00
chcurran 3822f92882 fix manual inpsection window
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-02 17:32:53 -07:00
chcurran 6cc627a643 remove reference to old test
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-02 16:44:13 -07:00
chcurran a353005296 only track dependent assets with valid ids, as sanity check
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-02 16:43:07 -07:00
chcurran 9de22d5e54 Fix dependency errors after conversion to JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-02 16:39:04 -07:00
SJ daf901e809 Set target_file variable since it's still being used in Mac runtime dependencies cmake file (#3905)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-09-02 14:16:13 -07:00
chcurran e7135832f6 remove unit tests with old style assets
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-02 13:56:31 -07:00
chcurran b5a32e1c4c remove temporay files in all cases
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-09-02 13:33:11 -07:00
Artur K 567c0ae24d Modernization + AZStd::function compare fix. (#3680)
* Modernization + small fix.

Modernize ( `bool`/`override`/other) code in AzCore, AzFramework, AzQtComponents, AzToolsFramework, etc.
Replaced a `bind` or two, use `using` in a few places as well.

Fix nullptr comparison of AZStd::function.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply review-based changes

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-09-02 14:55:09 -05:00
Chris Galvan b3c8b0f5f3 Merge pull request #3889 from aws-lumberyard-dev/cgalvan/FixMacApplicationIcons
Updated legacy Editor and Asset Processor icons on Mac to O3DE icons.
2021-09-02 12:52:37 -05:00
Esteban Papp 188f54fee0 Fixes Ninja non-multi config generator and potentially other non-multi config generators (#3867)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-02 08:56:29 -07:00
cgalvan d577702935 Updated legacy Editor and Asset Processor icons on Mac to O3DE icons.
Signed-off-by: cgalvan <cgalvan1337@gmail.com>
2021-09-02 09:39:15 -05:00
moraaar 34dc8e3cbc Fixed unused variable warnings (#3880)
- Fixed error in iOS profile non-unity build error: unused variable 'INVALID_OFFSET'. The global variable is static const only visible to the cpp, removed since it's not used.
- Fixed error in windows release 'timeoutSeconds': unreferenced formal parameter

Signed-off-by: moraaar <moraaar@amazon.com>
2021-09-02 13:15:14 +01:00
evanchia-ly-sdets 95f3477831 Moving physics test from sandbox to main (#3858)
Signed-off-by: evanchia <evanchia@amazon.com>
2021-09-02 12:08:37 +02:00
moraaar 9a0ea2c4c5 Fixed NvCloth assets, NvCloth automated test scripts, ModelAsset cloning and UI reverse overrides menu crash (#3851)
- Fixed cloth asset, which stopped working due to Updated skeleton logic: #2957 which changes how fbx graph nodes are collected (affecting its names, which is used by cloth modifier).
- Fixed cloth test suite active call to base's run_test function. It stopped working when its signature was changed here: 182d410#diff-3f5d93b0a76c838893693f19f2eacfe3e67040d445d6463c5c425ef5075cb409
- Renamed nvcloth TestSuite_Active.py to TestSuite_Main.py to be consistent with the other test folders.
- Fixed ModelAsset creator clone function. It was missing to copy the material slots, ultimately causing Material Component to show 0 material slots.
- Fixed crash where the revert overrides menu was not created when checking changes for selected component and selected entities.

Signed-off-by: moraaar moraaar@amazon.com
2021-09-02 09:35:12 +01:00
Gene Walters 7e61197450 Fix Blast Gem Compiler Error (#3855)
* Fix blast compiler error

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Fixed typo in DamageManager Interface.h include

Signed-off-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-09-01 22:46:48 -05:00
hershey5045 4249ceeae7 Add material property names to material assets, disable FBX dependency on materialtype files. (#3408)
* Add material property names to material assets, disable FBX dependency on materialtype files.

Signed-off-by: Robin <rbarrand@amazon.com>

* Add reflection for MaterialAssets. Update member variable comment.

Signed-off-by: Robin <rbarrand@amazon.com>

* Switch cvar to using bus value. Refine comments.

Signed-off-by: Robin <rbarrand@amazon.com>

* Refactor functions and refine comments.

Signed-off-by: Robin <rbarrand@amazon.com>

* Realign property values when material property names are populated.

Signed-off-by: Robin <rbarrand@amazon.com>

* Switch PostLoadInit check to on asset status ready. Add realign property values code to PostLoadInit as well.

Signed-off-by: Robin <rbarrand@amazon.com>

* Stash@{1} code.

Signed-off-by: Robin <rbarrand@amazon.com>

* Refactor realignment code into the right places.

Signed-off-by: Robin <rbarrand@amazon.com>

* Remove pragma optmize off.

Signed-off-by: Robin <rbarrand@amazon.com>

* More refactoring.

Signed-off-by: Robin <rbarrand@amazon.com>

* Refactor comments and remove code no longer needed.

Signed-off-by: Robin <rbarrand@amazon.com>

* Refactor comments and remove unused include.

Signed-off-by: Robin <rbarrand@amazon.com>

* Comment refactor, corrected some code.

Signed-off-by: Robin <rbarrand@amazon.com>

Co-authored-by: Robin <rbarrand@amazon.com>
2021-09-01 16:01:33 -07:00
michabr 413e82428c Reenable blend mode and depth state options in Draw2d (#2254)
* Reenable blend mode and depth state options in Draw2d
* Add back compile warning fix from last merge

Signed-off-by: abrmich <abrmich@amazon.com>
2021-09-01 15:42:16 -07:00
michabr f58b51b8ad Fix blend mode options for LyShine's image component (#2377)
* Fix blend mode options for LyShine's image component
* Fix Lighten blend mode
* Fix errors from last merge

Signed-off-by: abrmich <abrmich@amazon.com>
2021-09-01 15:41:44 -07:00
Qing Tao a54fceccc6 Add atom_rpi_tools to install package. (#3852)
Signed-off-by: qingtao <qingtao@amazon.com>
2021-09-01 14:22:25 -07:00
kberg-amzn 18d8f2124d Merge pull request #3157 from aws-lumberyard-dev/GitIssue3155_MultiplayerComponentsUsingNetInputRequirePlayerInputComponent
Multiplayer Auto-Components Using NetworkInput Now Require MultiplayerInputDriver Service
2021-09-01 12:49:40 -07:00
amzn-phist 2d623590e8 Fix the DefaultGem template's Editor target (#3853)
Removes the OUTPUT_NAME from the .Editor target in the Gem template.
Removes the same from Gems that have it currently.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-09-01 14:33:23 -05:00
Gene Walters 2770877478 Merge branch 'upstream/development' into GitIssue3155_MultiplayerComponentsUsingNetInputRequirePlayerInputComponent 2021-09-01 09:55:30 -07:00
Esteban Papp 451f267d58 Changes the cast for WinAPI mutex (#3843)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-01 09:47:53 -07:00
bosnichd 82659f24e9 Add support for a custom path root separator using a trait. (#3678)
* - Add support for a custom path root separator using a trait.
- Ensure to set both FilePathKey_ProjectUserPath and FilePathKey_ProjectLogPath to a writeable storage location on non-host platforms.

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

* Remove az_trait_validator.py, as our PAL guidance no longer dictates that all traits must be defined for all platforms.

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

* Updated based on review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-09-01 10:24:29 -06:00
Qing Tao b9c0b2a5f7 Fixed a crash issue with RHI::Fence when trying to capture screenshot which null renderer is used. (#3802)
ATOM-16292, ATOM-16243, ATOM-15493

Signed-off-by: qingtao <qingtao@amazon.com>
2021-09-01 09:06:06 -07:00
Nicholas Lawson 043a2c65ff Updates zlib to rev2 of the package, static only (#3725)
The previous version of the package was dynamic on some platforms,
and static on others.  This makes it static across the board and
also makes it compatible with other 3p libraries wanting to use
zlib.

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2021-09-01 09:04:20 -07:00
SJ eae08c4b54 [Mac] Fix crash in Editor and AssetProcessor. (#3786)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-09-01 11:03:21 -05:00
lumberyard-employee-dm 0ad2fe2294 Set enable gem variants feature (#3631)
* Implemented the RFC to allow projects to need to specify the Gems

Projects no longer need to specify CMake Targets to associate a Gem
variant with.

In order to associate a CMake Target with a gem variant a new
`ly_set_gem_variant_to_load` function has been added that maps CMake
Targets -> Gem Variants.

This allows CMake Targets to self describe which gem variants they
desire to build and load

This implementation is backwards compatible:
The `ly_enable_gems` function still accepts the TARGETS and VARIANTS
arguments which it will forward to the new `ly_set_gem_variant_to_load`
function to allow the input Targets to be associated with input Gem
Variants

This changes fixes the issue with gems that are required by an
Application regardless of the Project in use, not replicating it's
"requiredness" to the SDK layout

Fixes #3430

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

* Added an LY_PROJECT_NAME property to the Launcher targets

The `ly_enable_gems_delayed` now command queries the LY_PROJECT_NAME property
associated with each target to determine if the gems being enabled are
match the project the target is associated with.
In this case the target only adds dependencies if the gems is being enabled
without a specific project or if the gems is being enabled for the
matching project.

If the LY_PROJECT_NAME property is not set for target, it indicates the
gems for each project can be added as dependencies to the target.

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

* The INSTALL step now forwards the LY_PROJECT_NAME property for a target

The Install_common.cmake has been updated to support configuring
TARGET_PROPERTIES into the generated CMakeLists.txt for install targets.

Furthermore the indentation of the generated CMakeLists.txt has been
normalized to help with readability

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

* Updating the Atom_Bootstrap CMakeLists.txt to enable the Atom_Bootstrap Gem


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

* Added a deprecation message to ly_enable_gems when supplying TARGETS and
VARIANTS

Added a define_property call for the LY_PROJECT_NAME target property
Removed the .Builders alias for the PrefabBuilder and renamed the
GEM_MODULE target o PrefabBuilder.Builders.

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

* Removed superflous space from AutomatedTesting Gem CMakeLists.txt

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-09-01 11:01:50 -05:00
Brian Herrera d950dc2aac Merge pull request #3691 from aws-lumberyard-dev/nbftemplate
Adding a template for nightly build failures
2021-09-01 09:01:33 -07:00
amzn-phist f0fc906510 Misc fixes for Linux SDK (#3764)
* Fix rpath for lrelease binary

This fixes the rpath for lrelease which is used to compile the qt translation file.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix a LocalFileIO path casing issue

LocalFileIO was lowercasing the entire path after substituting aliases.
This caused files to not be found and many failures in AP.
Fixed to only lowercase the trailing relative path after the substitution.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Removed a message line

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-09-01 08:23:47 -07:00
Esteban Papp 2d2a7f4623 XCode doesnt support files per configuration, using the old method (#3789)
- some warn fixes
- fixed release linking issue

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-01 08:19:08 -07:00
Allen Jackson 26241e95ac {LYN2076} Add Material data types Behavior for the scene graph (#3605)
* {LYN2076} Add Material data types Behavior for the scene graph

Adding behavior to expose GraphData MaterialData to Python scripts so that scripters can read in the material properties from a scene graph

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* new warning fixed in code

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
2021-09-01 08:18:38 -05:00
moraaar 564925c285 Fix assert: Avoid doing operations over invalid Aabb (#3757)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-09-01 09:43:47 +01:00
AMZN-Igarri 2d45a6b4cb [Experimental] Asset Picker Flatten View (#3589)
* Adding Asset Browser Table View to AssetPicker

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

* Adding connections

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

* Adding CVar to hide/show path column

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

* Added Feedback from codereview

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

* Changed m_showColumn name to m_ShownColumns

Signed-off-by: igarri <igarri@amazon.com>
2021-09-01 09:39:44 +01:00
Gene Walters ffd0bbc165 Merge branch 'upstream/development' into GitIssue3155_MultiplayerComponentsUsingNetInputRequirePlayerInputComponent 2021-08-31 19:52:58 -07:00
chcurran f277cf59dc multi threaded fix for upgrader
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-31 18:38:39 -07:00
Shirang Jia c1c6fa3615 Auto-cut Github issue on build failures from main/development (#3730)
* Send SNS topic on build failure

* send build failure root cause data to SNS topic that triggeres lambda function to automatically create Github issues

* Change SNS topic subject to Build failure and add build url to the message

* Change SNS topic name
2021-08-31 17:37:25 -07:00
chcurran 205c09e200 Better upgrade tool messaging and continuity on failure; fix for serialization
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-31 17:24:02 -07:00
carlitosan 16d2895bd4 Merge pull request #3792 from aws-lumberyard-dev/sc-json-hotfix
hot fix for json AZ::Event (as input into nodes) serialization
2021-08-31 17:10:19 -07:00
Ken Pruiksma 0c7dfce5a0 First pass terrain cleanup (#3753)
* First pass cleanup of some terrain components.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Adding basic culling to terrain sectors

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Adding default value for m_transform

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-08-31 17:05:03 -07:00
Esteban Papp d838a0fcbc Android release fixes (#3788)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-31 16:51:57 -07:00
Sean Sweeney 873654a9fc Merge pull request #3116 from aws-lumberyard-dev/benchmark_metrics_jenkins
Adds the MARS benchmark script in AR
2021-08-31 15:58:20 -07:00
chcurran 800b33b8b9 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-08-31 15:01:11 -07:00
Jonny Galloway 37e5ef29bb Atom/gallowj/color grading dev (#3751)
* color grading workflow assets, python scripts, ~and test data for Nuke and PS.

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* minor changes

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* pep8 reformate code style, clean up, address CR

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* Pep8 refactor, some DRY refactoring.

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* simplification write_azasset()

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* corrected code and further simplified ()

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* updated readme.txt, I was mistakenly converting the wrong lut to engine

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* refactoring, simplification and some re-org

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* fixed bad loop in old_lut_helper

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* improve the lut_helper and corrected lut shaping

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* skip non-digit metadata in 3DL files

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* file name fix

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* nit: renamed a tag in comment

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* style

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* cleanup, cmd readme

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* fixed WINGHOME

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* Updated the readme with basic instructions

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* fixed py bootstrapping errors

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* removed log file (shouldn't be there)

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* re-gen bad test lut (forgot)

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* simplify bootstrap, enhance initialize and oiio access, remove lrg .PSD files

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* bump py rev2 in bat files for colorgrading

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

* removed debug flag not used, caused failure

Signed-off-by: Jonny Gallowy <~gallowj@amazon.com>

Co-authored-by: Jonny Gallowy <~gallowj@amazon.com>
2021-08-31 16:50:07 -05:00
Esteban Papp 39cf45e544 Setting /permissive- to make MSVC more "standard" (#3701)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-31 14:46:50 -07:00
chcurran 3b119b6f32 hot fix for json event input serialization
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-31 14:07:19 -07:00