3453 Commits

Author SHA1 Message Date
amzn-sean 6987dac6f3 Merge pull request #242 from aws-lumberyard-dev/physx_ragdoll_create
Ragdoll now uses Add/Remove SimulatedBody
2021-04-27 15:53:23 +01:00
Aaron Ruiz Mora 00fca9489c Fix editor crashing by protecting gEnv->g3DEngine 2021-04-27 14:52:10 +01:00
amzn-sean 82fce4a90c Merge branch 'main' into physx_ragdoll_create 2021-04-27 14:21:10 +01:00
hultonha 1b946818a2 more tidy-up to CameraInput.cpp 2021-04-27 13:58:17 +01:00
hultonha 80108fd848 Merge branch 'main' into hultonha_LYN-2315_camera-phase-2 2021-04-27 13:13:53 +01:00
pereslav 44ce664730 Changed handling --console_command_file to use AZ::Console::ExecuteConfigFile 2021-04-27 12:36:17 +01:00
igarri d6ed9d100e Merge branch 'main' into LYN-1767-AB 2021-04-27 12:29:37 +01:00
hultonha b85c5f42ed Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only 2021-04-27 11:41:13 +01:00
hultonha 0acaac14d8 Merge branch 'main' into hultonha_PR-37_follow-up 2021-04-27 11:39:28 +01:00
hultonha 0952b7bd87 update Cluster file name to ButtonGroup 2021-04-27 11:32:53 +01:00
amzn-sean fbb8727407 Merge branch 'main' into physx_ragdoll_create 2021-04-27 11:04:04 +01:00
hultonha 0da9a05d87 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 2021-04-27 11:02:20 +01:00
hultonha 56477b7cc7 merge from main and resolve conflicts 2021-04-27 10:58:35 +01:00
hultonha c898318377 updated camera changes 2021-04-27 10:30:07 +01:00
jjjoness 275d99359d Merge branch 'main' into LYN-1099 2021-04-27 09:43:05 +01:00
mnaumov fdcb19f45a Reverting some unused code 2021-04-26 17:48:49 -07:00
mnaumov 91f027a05c PR feedback 2021-04-26 17:42:49 -07:00
AMZN-koppersr 6dfa33816b Fixed a bug with type ids for inherited classes with a custom serializer.
The code that adds a $type field for pointers where needed was still assuming that custom serializer were always for primitives, which isn't the case anymore. This changes updates the behavior to allow $type to be added to those as well as long as they use an object. This does now however rely more heavily on earlier checks that the data needs a $type because it otherwise can't tell the difference between a primitive getting a default value (an empty object). In the original code this situation would have resulted in failed serialization though, so it's unlikely to be a problem.
2021-04-26 15:26:18 -07:00
mbalfour f76b69d480 Added a handful of null checks to let new level creation succeed. 2021-04-26 16:15:25 -05:00
pereslav 1e43095123 Merge branch 'main' into MultiplayerPipeline 2021-04-26 21:49:27 +01:00
pereslav 2b77d43435 Exposed exec console command to AZ Console 2021-04-26 21:30:52 +01:00
AMZN-daimini 44f1a627e7 Merge pull request #300 from aws-lumberyard-dev/Prefab/LYN-3100
KEYSTONE USE CASE | Save changes to non-root container entities in the link to the parent instance
2021-04-26 13:20:35 -07:00
nvsickle 33d210b793 Fix "Configure Layout..." being greyed out in the viewport menu 2021-04-26 12:53:52 -07:00
mnaumov c4e3c39ee2 PR feedback 2021-04-26 12:44:51 -07:00
bosnichd e5b5067748 Change LOAD_LEGACY_RENDERER_FOR_EDITOR from true -> false (#315)
Change LOAD_LEGACY_RENDERER_FOR_EDITOR from true -> false, and added some null checks to protect against gEnv->pRenderer and gEnv->p3DEngine now being null in the editor as well as the launcher.
2021-04-26 13:15:32 -06:00
cgalvan d27c43e595 Merge pull request #316 from aws-lumberyard-dev/cgalvan/GetSelectedEntitiesCount
[LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API.
2021-04-26 13:50:48 -05:00
hultonha 15afcc341d fixes and updates to CameraInput 2021-04-26 19:46:57 +01:00
Chris Galvan 5d2db78f74 [LYN-3272] Added missing call in unit test. 2021-04-26 13:25:55 -05:00
jackalbe a1685ecca9 {LYN-2074} Add Animation data types Behavior for the scene graph (#253)
{LYN-2074} Add Animation data types Behavior for the scene graph  (#253)
* https://jira.agscollab.com/browse/LYN-2074

* moved scene API color to centeralized location
BlendShapeDataFace
BlendShapeData
2021-04-26 12:08:43 -05:00
Chris Galvan 9d57095e1c [LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API. 2021-04-26 11:49:48 -05:00
hasareej c85fbe86ba Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 2021-04-26 17:30:51 +01:00
hasareej 9cf8070c9e Styling and Review Feedback Changes 2021-04-26 16:25:44 +01:00
pereslav 1db6c9236a Made Launcher use AZ Console instead of CryConsole. Updated the exec function according to PR comments 2021-04-26 15:50:41 +01:00
jjjoness 734cd63494 Merge branch 'main' into LYN-1099 2021-04-26 15:44:45 +01:00
AMZN-AlexOteiza 3f32cc929c Fixed All Physics automated tests (#129)
* Fixed all Tests.
* Fixed tests stdout redirection
* Changed return code for failed tests to be 0xF
* Small improvements on automated testing code
* Created Periodic test suite and moved tests
* Made physics main to only have one test for now
* Renamed all tests to have leading AutomatedTesting::
2021-04-26 15:25:34 +01:00
jjjoness 051cc0bce2 Merge branch 'main' into LYN-1932 2021-04-26 15:17:15 +01:00
hultonha fbaa59f28f updates following review feedback 2021-04-26 15:03:29 +01:00
jjjoness 73df05529c Completed new Play Console button. 2021-04-26 13:59:05 +01:00
igarri f24ae99b3e Merge branch 'main' into LYN-1767-AB 2021-04-26 12:45:41 +01:00
hultonha fc591e292e tidy-up to some naming for types 2021-04-26 11:44:13 +01:00
hultonha a4b8db2f94 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 2021-04-26 11:01:48 +01:00
hultonha 662934afbe Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only 2021-04-26 10:03:23 +01:00
jjjoness fd87ffc971 Merge branch 'main' into LYN-1099 2021-04-25 10:27:14 +01:00
hultonha b27daeead5 updates to viewport ui switcher id and usage 2021-04-24 18:35:24 +01:00
rgba16f 92199d9f2e Merge pull request #240 from aws-lumberyard-dev/DisableAtomShim
Delete CryRenderAtomShim, Atom is no longer reachable through Cry rendering interfaces
2021-04-24 09:39:39 -05:00
mnaumov 0bcc85e4d8 scope pointer 2021-04-23 21:55:14 -07:00
mnaumov 30458bc1be PR feedback 2021-04-23 21:40:27 -07:00
daimini 833ca2767d Fix a bug with level save erasing link information on Instances. All changes to non-root container entities are now saved as patches in the link to the parent instance. 2021-04-23 20:14:17 -07:00
Esteban Papp 29bf58cffc SPEC-6517 RedCode: some more folders identified for removal 1 (#290) 2021-04-23 17:11:28 -07:00
rgba16f bc40dd7e5e Merge remote-tracking branch 'upstream/main' into DisableAtomShim 2021-04-23 18:35:18 -05:00