Commit Graph

9736 Commits (d600b1c9fd6659f79ef15fc3eba481b43b51f28c)
 

Author SHA1 Message Date
Luis Sempé cbe40935ee
Merge pull request #5842 from aws-lumberyard-dev/scripting/text_updates_pass5
Fixed generated property names, pull argument names from BC when available, auto-reload on asset change
4 years ago
Mike Balfour 1f2385ca1a
Added missing doc links. (#5841)
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
lsemp3d 99a706c2a5 Merge branch 'development' into scripting/text_updates_pass5 4 years ago
lsemp3d 5d09e8d42e Fixed generated property names, pull argument names from BC when available, auto-reload on asset change
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
Roman a3a4038aca
Added joint orientation rendering (#5821)
* Render joint orientation

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

* fix build error

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

* CR feedback

Signed-off-by: rhhong <rhhong@amazon.com>
4 years ago
Nicholas Lawson 1a0d466443
Adds simple stats tracking to AssetProcessor (#5573)
* Adds simple stats tracking to AssetProcessor

The system captures cumulative and individual processing times.
It avoids touching any part of the app which affects decision
making or flow, or altering any structures such as JobEntry which
are involved in processing, in order to keep it as simple and
small as possible.

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
4 years ago
AMZN-Phil bf3a511806
Merge pull request #5817 from aws-lumberyard-dev/Prism/CMakePATH
Fix Project Manager not finding CMake on Windows
4 years ago
lsemp3d 20a2a79003 Updated more node names, no longer return data type string to control tooltip display in SC
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
greerdv 03e5fd213c feedback from PR
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
chiyenteng ab76254b43
Make prefab system enabled as default for automated tests (#5670)
* Make prefab system enabled as default for automated tests

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Modify auto tests after preventing regset saved into disk after editor main window closed

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Uncomment xfail

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Use --regset for editor tests

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
4 years ago
greerdv bd4e012eeb run clang format
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv 52846b146e merge from development
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
AMZN-Phil d958502f2c Check return value of qputenv
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Steve Pham b3c0200345
Restore missing variable 'target_filename_ext' needed to determine if RPATH fix is necessary or not (#5824)
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
4 years ago
amzn-phist 5c71a7481d
Modify resource limit function to warn (#5807)
The function that modifies resource limits will return true always and warn instead
of giving an error.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
AMZN-Phil c2145a6387 Use QStringList to avoid false matches against a partial path
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Terry Michaels 85681703dc
Merge pull request #5802 from o3de/mcphedar-patch-1
Updating the name of the AR bug template
4 years ago
moraaar ab1b6d057d
Fixed unused variable warning in Release configuration in Linux. (#5830)
Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
moraaar bcce0678c4
Fix collider component validation function by checking if the asset is ready (#5795)
Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
moraaar 5145fceedc
Fix some compilation errors due to warnings of potentially returning unitialized variables. (#5796)
Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
Roman bb906da58c
when follow up camera option is on, then load another character, it should zoom to this character. (#5758)
Signed-off-by: rhhong <rhhong@amazon.com>
4 years ago
Gene Walters 0bd86cf0a4 small edit: removing pragma optimize offs
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Gene Walters 02590a1766 AzCoreLogSink will check if it's running in an editor-server and will allow stdouts
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
AMZN-Phil def5b3a65d Fix additional left over references to QProcessEnvironment
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-Phil 74e1ee1862 Fix non-Windows platforms
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Gene Walters 6005a4e08b Merging last dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
AMZN-Phil e1b6054ff8 Fix Project Manager not finding CMake on Windows
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Steve Pham a0ab5920da
Add trait to enable/disable the Resource Mapping Tool (#5814)
* Add trait to enable/disable the Resource Mapping Tool

Signed-off-by: spham <82231385+spham-amzn@users.noreply.github.com>

* Moving ly_install_directory(DIRECTIORES Tools/ResourceMappingtool) into of the PAL_TRAIT_ENABLE_RESOURCE_MAPPING_TOOL block

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
4 years ago
Esteban Papp 7100d48e16
Cherry-picking some changes from stabilization into development (#5810)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
puvvadar 6eec6c8f8e
Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de
Merge stabilization/2110
4 years ago
Esteban Papp dbc5d7a8bc
Cherry-pick of Linux deb package to stabilization (#5778)
* Cherry-pick 49e8f35858

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

* Merging differences from development of other changes that need to be there for deb packaging

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

* Picks a needed change for the installer

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

* Fixes warning in mac

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

* Takes version from environment if defined

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

* Do not pick up version if it is empty string since that will also break version comparison

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

* creating temp directories if they dont exist

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

* removing a dependency to itself (Multiplayer.Builders is an alias of Multiplayer.Editor)

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

* Filters which runtime dependencies are passed from private build dependencies to only those that are actual targets.
This avoids something like a "d3d12" private build dependency from being passed to the runtime dependencies

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Luis Sempé 59819d1677
Merge pull request #5804 from aws-lumberyard-dev/scripting/text_updates_pass4
Improved text generation to split up CamelCase names + updated more node names
4 years ago
Steve Pham 3cf3e45b38
Enable Resource Mapping Tool on Linux (#5779)
* Enable and fix AWS Resource Mapping Tool on Linux
- Enable the trait AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED for Linux
- Add additional traits to handle launching o3de local python on Linux
- Update the resource_mapping_tool.py to support preloading the shared libraries for Pyside (like the QtForPython gem) in order to resolve the local pyside2 libraries

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Update pyside2 to a RUNTIME dependency

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Update special linux preloading comments for clarity

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Add CR at the end of traits files

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* - Remove unnecessary extra argument '--executable-path' and use '--binaries-path' instead
- Add linux only loading of pyside modules to 'setup_qt_environment' instead
- Update README.md

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Updated unit tests for test_environment_utils.py

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Fix indentation for Linux specific logic in environment_utils.py

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Fix (more) indentation for Linux specific logic in environment_utils.py

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Replace exit with return in setup_qt_environment

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
4 years ago
puvvadar 1aa444d669 Update build copy back to Developer Preview
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
amzn-mike af85060856
[SPEC-7644] Cherry Pick - ParallelDeepAssetReferences is failing intermittently (#5797)
* [SPEC-7644] ParallelDeepAssetReferences is failing intermittently (#5721)

* Fixed race condition caused by trying to handle asset ready event before asset container has finished filling out all the data structures.

Added check to only handle asset ready once init is complete
Added unit test to verify fix

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

* Re-enable test

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

* Add missing space to error message

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

* Add comment on sleep

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

* Collapse nested namespace

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

* Collapse nested namespace

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 56900484fc)

# Conflicts:
#	Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp

* Fix indentation

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
lsemp3d d9aa1ee5b4 Merge branch 'scripting/text_updates_pass4' into scripting/text_updates_pass5 4 years ago
Allen Jackson 95da7fcb64
{lyn7060} adding 'Save as Prefab' for ProcPrefab (#5678)
This adds the context menu to the Asset Browser to "Save as Prefab.." so that a Procedural Prefab
asset template can be saved in the source assets folder


Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
4 years ago
Guthrie Adams d0bf5e9eba
Merge pull request #5764 from aws-lumberyard-dev/Atom/guthadam/include_material_asset_in_version_warnings
Updated material version warning messages to include the affected asset
4 years ago
lsemp3d 99d2605a81 Improved generation by splitting up CamelCase text for names, updated more node names
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
mcphedar 278fdb63b4
Updating the title of the template
Signed-off-by: mcphedar <mcphedar@amazon.com>
4 years ago
Shirang Jia c0080d6b1f
Archive ap logs on s3 (#5620)
* Archive ap logs on s3

Signed-off-by: Shirang Jia <shiranj@amazon.com>

* Update copy_file.py

Signed-off-by: Shirang Jia <shiranj@amazon.com>

* Fix syntax from bad copy

Signed-off-by: Shirang Jia <shiranj@amazon.com>

* Change underscore in argument name to dash

Signed-off-by: Shirang Jia <shiranj@amazon.com>

* Add a general ArchiveArtifactsOnS3 function so we can use it to archive any files on S3

Signed-off-by: Shirang Jia <shiranj@amazon.com>

* Swap order of excludes and includes

Signed-off-by: Shirang Jia <shiranj@amazon.com>

* Change artifactsSourceDir to artifactsSource since the value can be either a file or a directory

Signed-off-by: Shirang Jia <shiranj@amazon.com>

* Fix parameter

Signed-off-by: Shirang Jia <shiranj@amazon.com>
4 years ago
Danilo Aimini 4be1e68bad
Fix oversight from recent change to PrefabFocusHandler internals. (#5794)
* Fix oversight from recent change to PrefabFocusHandler internals.

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

* Introduce check for null instance in case this is called before the Prefab Focus Handler is initialized.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
AMZN-Phil 5e8c8484be
Merge pull request #5792 from aws-lumberyard-dev/Prism/JenkinsBuildNumber
Make version string settable from Jenkins
4 years ago
mcphedar 5af76000aa
Updating the name of the AR bug template
Signed-off-by: mcphedar <mcphedar@amazon.com>
4 years ago
Ken Pruiksma 8705b57f71
Adding unit tests for IndexedDataVector (#5724)
* Rename IndexedDataVectorTests -> MultiIndexedDataVectorTests

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

* Adding unit tests for IndexedDataVector. Updated fixture for MultiIndexedDataVector.

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

* Fixed a bug in the test. Updated IndexedDataVector with more/better comments and removed a non-const function that wasn't necessary.

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

* Further updates to some comments

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
4 years ago
puvvadar edea1e560b Remove build debugging
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
Nicholas Van Sickle 4ee2f341dc
Fix several Prefab outliner ordering issues (#5747)
* Fix several Prefab outliner ordering issues

This change does a few things to address instability in entity order when prefabs are enabled:
- Changes ordering behavior on entity add to always be "insert after the last selected sibling of the new entity, or at the end if there is no selected sibling"
- Adds some logic to ensure selection stays frozen during prefab propagation to allow this behavior to be used
- Alters delta generation in `PrefabPublicHandler::CreateEntity` to use the template instead of reserializing the DOM - this avoids a whole bunch of patching issues caused by EditorEntitySortComponent doing post-hoc order fix-up and should generally be safer/faster as we're producing patches for the actual target for those patches
- Because the duplicate action is DOM-driven, and there's some thorniness around making changes that will affect the template during propagation, this adds `PrefabPublicHandler::AddNewEntityToSortOrder` to directly patch the DOM for the duplicate case

Two bits of this come from patches from the incredibly helpful @AMZN-daimini
- Alters `PrefabPublicHandler::GenerateUndoNodesForEntityChangeAndUpdateCache` behavior for determining what's an override: we now check to see if we're part of the current focused instance but *not* owned by the focus instance directly. This lets entity order for nested prefabs get saved to the owning prefab instead of as an override. I'm putting this up for discussion without a feature flag gating it, but we may wish to make this a toggle or disable it outright for stabilization (in which case entity order won't be saved to the owning prefab)
- Adds a custom serializer for EditorEntitySortComponent. This isn't strictly necessary now, but it was very useful for debugging and ended up receiving much more manual testing its migration path and save/load path more than I've tested without using the serializer.

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Add missing serializers

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Address some review feedback

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Generate patch in `PrefabPublicHandler::CreateEntity` using the instance's fully evaluated template in-memory

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix up comment

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix Linux build

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Try to make test less timing dependent (haven't been able to repro failure locally)

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix another build issue

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix unit test failures

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix a duplicate issue with sanitization that was causing sporadic test failure (thanks, test!)

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* One more Linux fix...

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
John Jones-Steele 4ad35f424e
Adds check to make sure that there are not too many samples created. (#5789)
* Adds check to make sure that there are not too many samples created.

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

* Changes made from PR

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

* Changes made from PR 2

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
4 years ago
lumberyard-employee-dm b0dc1ea6fa
CMake Xcode Generator fix (#5771)
Removed the generator expression from the `LY_ARCHIVE_FILE_SEARCH_MODE` define as Xcode doesn't support per-config per-file definitions.

Updated the #else block in ArchiveVars to default to PakOnly mode if the `LY_ARCHIVE_FILE_SEARCH_MODE` define isn't set.

Moved the the `LY_ARCHIVE_FILE_SEARCH_MODE` Cache Variable from cmake/Deployment.cmake to feature_options.cmake within the AzFramework folder.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
puvvadar 6817684d73 Merge commit '7749f3c4a7f6b2a7acfde58ae8c04ea8a9a4b968' into puvvadar/gitflow_211118_o3de 4 years ago