birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
944 Commits 3 Branches 3 Tags
52864bd92f8f1565ca44dabcb421bb93305e9f7c
Commit Graph

289 Commits

Author SHA1 Message Date
SergeyAMZN 52864bd92f Merge pull request #255 from aws-lumberyard-dev/MultiplayerPipeline 
Added delayed activation for client networked entities. Added ability to specify additional .cfg file to use the same launcher for server & client
 2021-04-28 16:19:34 +01:00
jjjoness 88dcaba8da Merge pull request #317 from aws-lumberyard-dev/LYN-1099 
Lyn 1099
 2021-04-28 16:16:04 +01:00
cgalvan 60d876a05e Merge pull request #375 from aws-lumberyard-dev/cgalvan/ReplaceGetSelectedEntitiesSize 
[LYN-3356] Replaced GetSelectedEntities + size() with new API.
 2021-04-28 10:07:07 -05:00
hultonha 6d624273a9 disabling test causing intermittent failures 2021-04-28 14:43:52 +01:00
jjjoness 1fd6938519 Replaced missing & 2021-04-28 08:56:02 +01:00
pereslav f235174c45 Merge branch 'MultiplayerPipeline' of https://github.com/aws-lumberyard-dev/o3de into MultiplayerPipeline 2021-04-28 07:49:47 +01:00
pereslav b82627a248 Renamed console_command_file to console-command-file 2021-04-28 07:44:11 +01:00
karlberg 6bb51bd9e4 Merging latest origin 2021-04-27 19:14:11 -07:00
mnaumov 793d60f150 Merge main 2021-04-27 17:07:42 -07:00
Danilo Aimini 963e851119 Merge pull request #372 from aws-lumberyard-dev/LYN-3060-cherry 
Cherry-pick: LYN-3060 | Launching the Editor with Prefab System enabled results in asserts
 2021-04-27 15:37:48 -07:00
Chris Galvan 8e88d746a3 [LYN-3356] Replaced GetSelectedEntities + size() with new API. 2021-04-27 16:56:20 -05:00
daimini caa982372f Remove include for removed interface in EditorPrefabComponent.cpp 2021-04-27 14:12:56 -07:00
daimini 797ee26f87 Remove EntityOutlinerWidgetInterface, and replace it with PrefabPublicNotificationBus. Introduce events to notify handlers of when instance propagation begins and ends so that widgets can refresh correctly. 2021-04-27 14:12:46 -07:00
pereslav f1ae3f52b0 Merge branch 'main' into MultiplayerPipeline 2021-04-27 21:23:22 +01:00
Chris Galvan 21d99ea07d [LYN-3348] Removed legacy CObjectPhysicsManager. 2021-04-27 15:16:20 -05:00
Junbo Liang 83f3cbd4a1 Merge pull request #151 from aws-lumberyard-dev/SPEC-6072 
[SPEC-6072] [Crashpad] Migrate crash reporting tool to use Crashpad from 3rdParty
 2021-04-27 12:13:21 -07:00
mnaumov 03e681ca5f Merge from main 2021-04-27 11:26:02 -07:00
mnaumov 5f33337fec Merge main 2021-04-27 11:05:22 -07:00
AMZN-mnaumov a00d47365e Merge pull request #295 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14585 
[ATOM-14585] Enlarged thumbnails on hover
 2021-04-27 10:53:18 -07:00
jjjoness 0607f6efa6 Changed Play Console from comments in PR. 2021-04-27 18:37:14 +01:00
junbo 0b8299ba0b Remove the existing crashpad package and update the package hash 2021-04-27 09:50:20 -07:00
junbo eb0758f63a [SPEC-6071][Crashpad] Make Crashpad available through 3rdParty system for Windows 2021-04-27 09:48:50 -07:00
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
pereslav 44ce664730 Changed handling --console_command_file to use AZ::Console::ExecuteConfigFile 2021-04-27 12:36:17 +01:00
hultonha b85c5f42ed Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only 2021-04-27 11:41:13 +01:00
amzn-sean fbb8727407 Merge branch 'main' into physx_ragdoll_create 2021-04-27 11:04:04 +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
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
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
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
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 73df05529c Completed new Play Console button. 2021-04-26 13:59:05 +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
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