Commit Graph

9534 Commits

Author SHA1 Message Date
puvvadar 6943db86b5 Merge commit 'a54a149877ee2054b315e9b9276dfec255713f62' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:27 -08:00
puvvadar 27648dea0e Merge commit 'f18f5318c0559c1a899fcf04f219bea387f454f4' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:21 -08:00
puvvadar 3cfb94009e Merge commit 'ca6b7d1d1f6659f5711677482f688ac35c95bf8e' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:15 -08:00
puvvadar d38b390409 Merge commit 'bf4f52e146b09a3171c98926e29d0101be868dc8' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:09 -08:00
puvvadar de6c1213a7 Merge commit 'cf540b6f44c7e439505a29d8d2ce4989c4ae8232' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:03 -08:00
puvvadar 5e0acc11ef Merge commit 'b533a9566a0a221dd4f70486ab2a3d397bcae5c7' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:56 -08:00
puvvadar 724ff3b011 Merge commit 'd222aeef48ad10224958e682294e704c10ee06df' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:47 -08:00
puvvadar a1aeec3381 Merge commit '555776fd7f24f7a89aa637c68d746b7d647fdea5' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:41 -08:00
puvvadar 9b2193653b Merge commit 'c375f073395b88ada7b1b5b01ce3142992af97a9' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:35 -08:00
puvvadar c1081ebd5d Merge commit 'a8dcfbbb1390bca0a2ed3629b0c47c1af6358e77' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:29 -08:00
puvvadar b37f75f060 Merge commit '713a3916f5c101c324f8e2f2e06b49bf521da783' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:23 -08:00
puvvadar ccf208debe Merge commit '95c8398c791a305b33205776c8b7959b263e6f62' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:17 -08:00
puvvadar 29562fd7c5 Merge commit '6b1fb04a1c3a8515a60fa06fc8cac242e441cba9' into puvvadar/gitflow_211118_o3de 2021-11-18 09:41:49 -08:00
puvvadar bdded3e051 Merge commit 'a1cf76ec653da9229f24ba82863724a65d24859a' into puvvadar/gitflow_211118_o3de 2021-11-18 09:39:24 -08:00
puvvadar f44a9e196c Merge commit '33abae100880cf835fd6feb53e3fc03af68d0961' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:50 -08:00
puvvadar 01a31f2c7b Merge commit 'd0ebe4ee10741eac2d0a623610b89a44f0f3cb49' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:44 -08:00
puvvadar 59744429f9 Merge commit '1457ef6ee9f0e18b3fcebdb0c7c19b2cac5a19ed' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:38 -08:00
puvvadar 33cb674355 Merge commit 'e34ea3bcaa0306699804072c6bce6eb01f65fc52' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:30 -08:00
puvvadar 3c60638dca Merge commit 'ef16207ac58e4d38b8bf3641e982ba1af8ad11c1' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:24 -08:00
puvvadar 93ce3fa82f Merge commit 'a051bdeeb0687d07851c0034fe9dc7e14dbf541f' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:17 -08:00
puvvadar 4c8bb5694b Merge commit '593f03efb4996ae8bb8e1f53a55e2ba00e022449' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:11 -08:00
puvvadar 69dc2ff2f6 Merge commit '9f9aa8f2a69d2adacee58a575be24ae5bb58c69c' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:05 -08:00
puvvadar da15731fd3 Merge commit '823b5bde0b14c33a16a9993e43106eeaf442adae' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:59 -08:00
puvvadar 07e99650d0 Merge commit 'a6164ca2cd3f573fd7735c3825568b1e25b12c2b' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:53 -08:00
puvvadar d00a243b01 Merge commit '155fe77f5d0de7288d8b57fff83bff0f17b08a94' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:47 -08:00
puvvadar 54c2b549da Merge commit '68a2561dc18ab7943909b49b0523bd3bdc18b4e1' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:41 -08:00
puvvadar 5f0823f3c0 Merge commit '551e6010ddf1f04b3d3d289ef73bacbe4477fa2a' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:35 -08:00
puvvadar c6f5bcb3df Merge commit '92510df37386a952a490f72d304dc8d0087a94e4' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:29 -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 2f3efa3749 Merge commit '6c1eefe6055675dccc991b7e709e4e5e7b12530a' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:08 -08:00
puvvadar 5d579b7e7d Merge commit 'a74fa5c5b840006e45f01becd80d02f1edf7eb28' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:02 -08:00
puvvadar c192a7e3bb Merge commit 'fc805594d02967474c2e31cd228e925d73310fee' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:55 -08:00
puvvadar 0623777a51 Merge commit '3ad07a229524b410b5eb2dab0cb0a6197bcdc1a8' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:47 -08:00
puvvadar 3751df4269 Merge commit '6651ae3d784d9e2eb7a7f30f36f9729c3cba9852' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:41 -08:00
puvvadar 57428158db Merge commit '4854023eb1d48643e8064265eaa7f3ac775d4360' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:35 -08:00
puvvadar c264977eae Merge commit '265f624612fa41c4166c20bb6e7718a07914c368' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:28 -08:00
puvvadar 9f886de5f6 Merge commit 'dd1d515e37d4692e587c21df43a674c7134ad43b' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:21 -08:00
puvvadar 95c7fe993b Merge commit 'd468cbad85b864d2ca0a97621ea83c4e458c106f' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:14 -08:00
puvvadar ebab2f8cf5 Merge commit 'c73417a9c135e7788d10c1ca57a1a916a2d8c17b' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:08 -08:00
puvvadar 8733430e51 Merge commit '34921d680a7eba92622694cd6eb3b979ede06aa8' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:02 -08:00
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>
2021-11-18 22:32:07 +05:30
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
John Jones-Steele a54a149877 Changes from comments made after merge (#5738)
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
2021-11-18 16:06:54 +00:00
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>
2021-11-18 15:34:30 +00:00
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
2021-11-18 15:00:36 +00:00
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>
2021-11-18 06:42:41 -08:00
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>
2021-11-18 14:31:14 +00:00
amzn-sean e4563c0058 Update RPISystem::GetCurrentTime() to use TimeSystem (#5613)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-11-18 14:31:02 +00:00
Tom Hulton-Harrop ca6b7d1d1f Add test for ViewportInteractionImpl use of ViewportInteractionRequestBus (#5741)
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-18 13:09:06 +00:00