Commit Graph

938 Commits

Author SHA1 Message Date
Nicholas Lawson c492d644da Fixes #5909 hash file stats missing from AP stats log (#5913)
The "begin and end" markers were removed due to a merge conflict.  This restores them.
It also stops printing out sections that are empty - for example, if the AP runs without
processing anything, there will no longer be a "top 10 processed files" section.
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2021-12-01 08:18:39 -08:00
AMZN-nggieber 57d688fbc1 Added Tests for Gem Catalog Filtering (#5999)
* Added Tests for Gem Catalog Filtering

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Addressed PR feedback, Renamed all tests to Osherove naming pattern

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
2021-12-01 17:03:36 +01:00
Gene Walters 7c445d9c7d Merge pull request #5820 from aws-lumberyard-dev/LYN-8025_PipeEditorServerLogsToEditor
Pipe Editor-Server Logs Back to the Editor
2021-12-01 07:36:02 -08:00
amzn-mike 2065225099 Fixed LodRuleBehavior using wrong loop index (#5915)
* Fixed LodRuleBehavior using wrong loop index

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

* Add  unit test for LOD auto-add crash

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

* Fix macro usage

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

* Fix include

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-12-01 09:04:49 -06:00
AMZN-nggieber b3bf02a4d5 Adds Warning Dialog When Following an External Link in Project Manager (#6003)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-30 13:13:42 -08:00
Esteban Papp 7c30adb66c Removes _vs2019 from jenkins jobs and documentation (#5855)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-30 11:10:02 -08:00
John 7fa80ee501 Merge commit '99d0c39273fed3742acffa0fafd07038e5ef4b25' into jonawals/gitflow_211125_o3de 2021-11-25 10:22:55 +00:00
Artur K eca2e36687 Fix clang 13 compilation problems (#5791)
* Fix clang 13 compilation problems

Re-instated ShowPlayedSequencesDebug logic by introducing no-op lambda
which replaces missing `Draw2dLabel` functionality ( added TODO marker
there )

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

* apply review suggestions

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

* Fix type in assert message

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-11-25 09:24:39 +00:00
Gene Walters 4b9aae5a1a merging latest dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-23 19:11:02 -08:00
lumberyard-employee-dm 99d0c39273 O3DE.exe Project-Centric "Open Editor" fix (#5852)
* The O3DE.exe Open Editor button now attempts to open the Editor in the
build directory of the project being opened.

If their is no Editor within the build directory of the Project, it uses
the Editor.exe in the current O3DE.exe executable directory if it exists

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

* Engine .gitignore now ignores the build directory if placed in the
AutomatedTesting project

Previously it was just ignoring a `[Bb]uild` directory if it was
directly within the engine root.
This change matches the behavior of the project templates.

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

* Renamed the ProjectUtils GetEditorDirectory function to
GetEditorExecutablePath

Added a platform specific implementation for retrieving the path to the
Editor executable in the GetEditorExectuablePath function.

It first attempts to locate the Editor via checking the project build
directory for an Editor executable before falling back to checking the
binary directory of the currently running O3DE executable.

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

* Correct the MacOS GetEditorExecutablePath to return the Editor path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-23 18:25:00 -06:00
Junbo Liang 2bdee5c9e6 Merge commit 'bf3a5118069d287c013febd94a977966e4d1f944' into junbo/gitflow_211123_o3de 2021-11-23 13:29:23 -08:00
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>
2021-11-22 11:18:19 -08:00
AMZN-Phil d958502f2c Check return value of qputenv
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-22 09:26:34 -08:00
AMZN-Phil c2145a6387 Use QStringList to avoid false matches against a partial path
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-22 08:31:12 -08:00
AMZN-Phil def5b3a65d Fix additional left over references to QProcessEnvironment
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-20 10:37:55 -08:00
AMZN-Phil 74e1ee1862 Fix non-Windows platforms
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-20 10:23:50 -08:00
Gene Walters 6005a4e08b Merging last dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-19 23:12:59 -08:00
AMZN-Phil e1b6054ff8 Fix Project Manager not finding CMake on Windows
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-19 19:13:19 -08:00
puvvadar 6eec6c8f8e Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de
Merge stabilization/2110
2021-11-19 15:46:16 -08:00
puvvadar ab58773388 Merge commit '092d125acf2eb23099e08f0d93e9b2a3b90ce016' into puvvadar/gitflow_211118_o3de 2021-11-19 09:18:52 -08:00
puvvadar e8cdff627c Merge commit '4ad6d3e9f75880558d4003474621b9ada3aef060' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:31 -08:00
AMZN-Phil 092d125acf Merge pull request #5769 from aws-lumberyard-dev/Prism/RemoteGemWarning
Extra gem download failure handling
2021-11-19 07:30:25 -08:00
AMZN-Phil a465bf30a7 Iterate over dependent gems
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-18 17:30:52 -08:00
Alex Peterson 4ad6d3e9f7 Updated project manager backgrounds (#5770)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-18 16:54:04 -08:00
AMZN-Phil 7e43b53d16 Extra gem download failure handling
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-18 15:01:11 -08:00
amzn-mike ae50187fba [LYN-7520] Wildcard Source Dependencies include files in cache/excluded files (#5349)
* Add folder exclusion for wildcard source dependencies

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

* Exclude ignored files.  Add unit tests

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

* Add handling for ignored folders being added/removed

Add unit tests

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

* Add ExcludedFolderCacheInterface to cmake

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

* Fix include

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

* Add error message

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

* Cleanup includes

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

* Revert traits include

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

* Fix missing include, minor cleanup

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

* Add missing includes

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-11-18 13:37:48 -06:00
puvvadar 5aee691cd8 Merge commit '78263b7f13bf5d0fac824a4c025c46c88138a59c' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:33 -08:00
puvvadar 9b2193653b Merge commit 'c375f073395b88ada7b1b5b01ce3142992af97a9' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:35 -08:00
puvvadar ccf208debe Merge commit '95c8398c791a305b33205776c8b7959b263e6f62' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:17 -08:00
puvvadar 01a31f2c7b Merge commit 'd0ebe4ee10741eac2d0a623610b89a44f0f3cb49' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:44 -08:00
puvvadar 69dc2ff2f6 Merge commit '9f9aa8f2a69d2adacee58a575be24ae5bb58c69c' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:05 -08:00
puvvadar 7bad1f6d46 Merge commit '0d17e575a73f0c16774134d313232ed56eb7e604' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:23 -08:00
puvvadar 197b7b6bcb Merge commit '2ae8477683394a4cb550c58d6e024fdb7c684db3' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:16 -08:00
puvvadar c192a7e3bb Merge commit 'fc805594d02967474c2e31cd228e925d73310fee' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:55 -08:00
puvvadar 57428158db Merge commit '4854023eb1d48643e8064265eaa7f3ac775d4360' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:35 -08:00
lumberyard-employee-dm 9d22c98c26 Add support for configuring default Archive File Search Mode through a Cache Var (#5668)
* Renamed ArchiveLocationPriority enum to FileSearchPriority and made it a proper enum class

Added an ArchiveVars.cpp which checks the a new define: `LY_ARCHIVE_FILE_SEARCH_MODE_DEFAULT`
That define represents the default value to use for the Archive system search mode

Moved the FileSearchLocation enum to the ArchiveVars.h header

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

* Updated the AssetBundleComponent to use AZ::IO::Path for level dirs

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

* Added a LY_ARCHIVE_FILE_SEARCH_MODE cache variable

The Cache Variable default value is to Archive File Search Mode to PakOnly
in Release. This can be overridden using a value for all configurations
by specifying a number of 0, 1 or 2.
Alternatively a generator expression can be used to set the Archive File
Search Mode in specific configurations.
For example to set the FileSearchMode to 1 in profile and 2 in release
the following LY_ARCHIVE_FILE_SEARCH_MODE value can be used
`$<$<CONFIG:profile>:1>$<$<CONFIG:release>:2>`

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

* Updated AssetBundler(Batch) VS Debugger arguments to populate the
project-path optoin if a single project is configured.

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

* Add support for serializing older versions of the AssetBundleManifest

This is done by attaching the "ObjectStreamWriteElementOverride"
attribute to the AssetBundleManifest reflection.
That attribute contains a function which outputs an older serialized
version of the AssetBundleManifest based on the `m_bundleVersion` member
value.

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

* AZStd::variant Serialization fix

The AttributeData<T> type is no longer suitable for storing the
ObjectStreamWriterOverrideCB function

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-18 10:22:08 -06:00
AMZN-Phil 7787ceb04c Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/CLIDisplayLastError
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-17 14:43:03 -08:00
AMZN-Phil c375f07339 Merge pull request #5637 from aws-lumberyard-dev/Prism/FixGemCart
Display Gem Cart in Gem Catalog Right Panel
2021-11-17 14:30:43 -08:00
AMZN-Phil e9ec37f20b Moved global vector inside PythonBindings
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-17 14:03:24 -08:00
AMZN-Phil 95c8398c79 Merge pull request #5673 from aws-lumberyard-dev/Prism/AddEditGemsButton
Adds Configure Gems Options to Project Dropdown + Misc. Project Manager Fixes
2021-11-17 12:14:24 -08:00
AMZN-nggieber 7de4628747 Merge branch 'stabilization/2110' into Prism/FixGemCart 2021-11-17 10:19:47 -08:00
nggieber 8d26251c93 Include DownloadController
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-17 10:16:41 -08:00
AMZN-Phil 6819a1956d Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/CLIDisplayLastError
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-17 10:01:00 -08:00
Qing Tao d0ebe4ee10 Follow up fix for ATOM-13512 (#5689)
* Follow up fix for ATOM-13512
Update the file mask mapping in ImageBuilder.settings.
Change Reflectance.preset to use BC4 format since it only needs once channel.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-11-17 10:00:31 -08:00
AMZN-Phil a7e90fd6c8 Fix copy paste variable name
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-17 08:15:41 -08:00
Chris Burel 9f9aa8f2a6 [Linux] Avoid duplicating inotify watches in forked AssetBuilder processes (#5683)
The AssetProcessor on Linux uses `inotify` to monitor for file updates.
The AssetProcessor also uses a `ProcessWatcher` to launch child
AssetBuilder processes. `ProcessWatcher` accomplishes this by calling
`fork()`, which duplicates the current process, then calling `exec()`.
The `fork()` call also appears to duplicate any inotify fds. This
results in the subprocess consuming duplicate inotify watches, which is
a limited system resource (Ubunut 20 defaults
`/proc/sys/fs/inotify/max_user_watches` to 65536). The AssetProcessor
still has issues with this max, but this should free up at least half of
the uses.

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-11-17 07:34:56 -08:00
AMZN-Phil ba5102b37d Change to optionally show all python error strings
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-16 17:40:12 -08:00
nggieber dcd50d90c9 Forward declared QVBoxLayout
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 17:08:36 -08:00
nggieber c2308de8ee Added in missed suggestions from previous PR
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 16:29:12 -08:00
nggieber a3d3423ff7 Merge branch 'stabilization/2110' into Prism/AddEditGemsButton 2021-11-16 16:04:06 -08:00