Commit Graph

9736 Commits (d600b1c9fd6659f79ef15fc3eba481b43b51f28c)
 

Author SHA1 Message Date
puvvadar 69dc2ff2f6 Merge commit '9f9aa8f2a69d2adacee58a575be24ae5bb58c69c' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar da15731fd3 Merge commit '823b5bde0b14c33a16a9993e43106eeaf442adae' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 07e99650d0 Merge commit 'a6164ca2cd3f573fd7735c3825568b1e25b12c2b' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar d00a243b01 Merge commit '155fe77f5d0de7288d8b57fff83bff0f17b08a94' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 54c2b549da Merge commit '68a2561dc18ab7943909b49b0523bd3bdc18b4e1' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 5f0823f3c0 Merge commit '551e6010ddf1f04b3d3d289ef73bacbe4477fa2a' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar c6f5bcb3df Merge commit '92510df37386a952a490f72d304dc8d0087a94e4' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 7bad1f6d46 Merge commit '0d17e575a73f0c16774134d313232ed56eb7e604' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 197b7b6bcb Merge commit '2ae8477683394a4cb550c58d6e024fdb7c684db3' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 2f3efa3749 Merge commit '6c1eefe6055675dccc991b7e709e4e5e7b12530a' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 5d579b7e7d Merge commit 'a74fa5c5b840006e45f01becd80d02f1edf7eb28' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar c192a7e3bb Merge commit 'fc805594d02967474c2e31cd228e925d73310fee' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 0623777a51 Merge commit '3ad07a229524b410b5eb2dab0cb0a6197bcdc1a8' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 3751df4269 Merge commit '6651ae3d784d9e2eb7a7f30f36f9729c3cba9852' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 57428158db Merge commit '4854023eb1d48643e8064265eaa7f3ac775d4360' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar c264977eae Merge commit '265f624612fa41c4166c20bb6e7718a07914c368' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 9f886de5f6 Merge commit 'dd1d515e37d4692e587c21df43a674c7134ad43b' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 95c7fe993b Merge commit 'd468cbad85b864d2ca0a97621ea83c4e458c106f' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar ebab2f8cf5 Merge commit 'c73417a9c135e7788d10c1ca57a1a916a2d8c17b' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 8733430e51 Merge commit '34921d680a7eba92622694cd6eb3b979ede06aa8' into puvvadar/gitflow_211118_o3de 4 years ago
Mike Balfour 1b63ca3bc0
Terrain component icon updates. (#5722)
* Terrain component icon updates.
Refreshed using latest icons from UX.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Revised icons from UX.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
moudgils 44d693a444
Fix DOF flickering on Vk due to missing LDS sync (#5723) (#5732)
* Fix DOF flickering on Vk due to missing LDS sync

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

* Added another sync

Signed-off-by: moudgils <moudgils@amazon.com>
4 years ago
srikappa-amzn 91dd00672a
Added more subdirectories and better names for prefab automated tests (#5488)
* Added more subdirectories and better names for prefab automated tests

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Removed an additional prefab directory prefix for tests

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Removed editor_workflows subdirectory and fixed prefab package casing issue

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>
4 years ago
lsemp3d 6c25e08d3f Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard-dev/o3de into scripting/4060 4 years ago
lsemp3d 686fc7c54f Renamed RequestTaggedEntities to 'Get Entity by Tag'
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
AMZN-Phil 78263b7f13
Merge pull request #5681 from aws-lumberyard-dev/Prism/CLIDisplayLastError
Show python errors in Project Manager
4 years ago
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>
4 years ago
John Jones-Steele a54a149877
Changes from comments made after merge (#5738)
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
4 years ago
Tom Hulton-Harrop f18f5318c0
Fix for gizmo axis text not displaying correctly on high dpi screens (#5745)
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
moraaar 489877b82a
O3DE using new 3rdParty PhysX SDK package rev 4 (#5739)
PR with changes to PhysX SDK package: o3de/3p-package-source#66

It adds a new macro LY_PHYSX_PROFILE_USE_CHECKED_LIBS (default OFF) that the user can turn on during cmake configuration to link against the checked version of the libraries.

Signed-off-by: moraaar moraaar@amazon.com
4 years ago
Roman e52cbd2bb3
Render joint names (#5685)
* render solid skeleton option

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

* Fix broken build

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

* CR update

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

* Render joint names

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

* CR update

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

* CR update

Signed-off-by: rhhong <rhhong@amazon.com>
4 years ago
amzn-sean e2772fca21
Fix large delta on next frame when turning t_simulationTickDeltaOverride off. (#5716)
This was due to incorrectly setting m_lastSimulationTickTimeUs when t_simulationTickDeltaOverride was enabled to the override.
m_lastSimulationTickTimeUs is now always set to the current time so the delta calculation will always be correct.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
amzn-sean e4563c0058
Update RPISystem::GetCurrentTime() to use TimeSystem (#5613)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
Olex Lozitskiy 69efe7cf26 Addressing PR
Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com>
4 years ago
greerdv d05d304fe8 highlight the button corresponding to the currently selected collider component mode
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
Tom Hulton-Harrop ca6b7d1d1f
Add test for ViewportInteractionImpl use of ViewportInteractionRequestBus (#5741)
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
Tom Hulton-Harrop bf4f52e146
Updates and fixes to viewport placement (#5712)
* updates to use more modern viewport intersection logic

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

* updates to editor viewport ray intersection for object placement

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

* make ed_defaultEntityPlacementDistance visible to Viewport.cpp

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

* fix link error for AZ_CVAR variable

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

* updates following review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
Artur K dc98a56d45
Clang/Clazy pass over AzCore (#5045)
* Multiple cleanups ( tidy etc. )

Coalesce nested namespaces.

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

* Multiple cleanups ( tidy etc. ) cntd.

Converted Uuid into POD ( defaulted the constructor )
Add `&/const &` to `for` loops that benefit from their use
Some Qt optimizations ( string ref, prevent container detaches, etc. )
Replace `::bind` in a few places.
Replaced the use of AZ_CRC with AZ_CRC_CE in a few places.
Replace a few `typedef`s with `using`s

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

* Linux compilation fix.

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

* Apply review suggestions.

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

* Fix vs2019 build

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

* Small clang re-format in StringFunc.cpp

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

* Apply reviewer's suggestions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
amzn-sean cf540b6f44
Defaulting the joint setup display to ON instead of OFF (#5696)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
Tom Hulton-Harrop b533a9566a
Fix for viewport not updating correctly when switching camera views (#5719)
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
antonmic 8587c8e033 Fixed capsule auxgeom draw for lights and other aux geom issues
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
4 years ago
santorac d222aeef48
Merge pull request #5571 from aws-lumberyard-dev/Atom/santorac/MaterialEditorHandlesMissingTextures
Updated Material Editor and Asset Processor To Gracefully Handle Missing Textures
4 years ago
moudgils 239e0306a8
Fix DOF flickering on Vk due to missing LDS sync (#5723)
* Fix DOF flickering on Vk due to missing LDS sync

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

* Added another sync

Signed-off-by: moudgils <moudgils@amazon.com>
4 years ago
AMZN-Phil a76268287e Change developer preview tag
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
santorac 734c2fb693 Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 4 years ago
santorac 9a887bd690 Removed unused lambda function.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
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>
4 years ago
amzn-mike 4b37e742d3
Add interface to allow disabling global AZ Core test environment trace bus suppression (#5594)
* Add interface to allow disabling global AZ Core test environment trace bus suppression

Update BaseAssetManagerTest class to disable the suppression by default
Update specific asset manager tests that rely on the trace bus suppression to ReEnable it

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

* Remove nodiscard

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

* Remove unique_ptr for disable token

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

* Fix move operator

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

* Switch to having individual flags for suppression of each type of output

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

* Add cvar to force stacktrace output.

Clean up whitespace

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
amzn-mike 555776fd7f
Fix AssetBus connection policy to re-lock the mutex afterward since some destructors in the calling methods are still altering the context (#5575) (#5664)
Also made the unlock conditional.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 63713ca284)
4 years ago
AMZN-Phil c375f07339
Merge pull request #5637 from aws-lumberyard-dev/Prism/FixGemCart
Display Gem Cart in Gem Catalog Right Panel
4 years ago