birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 7b3b1cd73e
         Merge pull request #27 from aws-lumberyard-dev/remove-expired-data Alex Peterson 2021-04-13 11:55:33 -0700
  • a3a0f157bd Removing expired installer data alexpete 2021-04-13 11:53:50 -0700
  • f3d0666a63 Add retry to get request shiranj 2021-04-13 11:52:42 -0700
  • 78cadfd1d0 Convert daily metrics pipeline script to use BlueOcean API shiranj 2021-04-13 11:24:31 -0700
  • f6e98d5014 Fix viewport context menu hiding cursor and sometimes popping up repeatedly nvsickle 2021-04-13 11:08:22 -0700
  • 51abef5071 Merge branch 'main' into mbalfour/spec-6178 mbalfour 2021-04-13 13:04:34 -0500
  • 4c4274ef84 Merge branch 'main' of https://github.com/aws-lumberyard/o3de mbalfour 2021-04-13 13:04:08 -0500
  • 0f841656e3 [LYN-2878] Attempt to fix deadlocks that occur when the Editor loads surface tag assets. I wasn't able to reproduce the deadlock, but from the reported callstack, the following lock inversion happens: * EditorSurfaceDataSystemComponent::OnCatalogLoaded locked the AssetCatalogRequestBus mutex by calling EnumerateAssets, and then locked m_assetMutex inside GetAsset->FindOrCreateAsset inside the enumerate callback. * Loading threads would lock m_assetMutex in AssetManager::ValidateAndRegisterAssetLoading, then lock the AssetCatalogRequestBus inside the Asset<T> copy constructor when calling UpdateDebugStatus when the constructor calls SetData->UpgradeAssetInfo->UpdateAssetInfo->AssetCatalogRequestBus::GetAssetInfoById mbalfour 2021-04-13 13:03:43 -0500
  • 16ba08c917 Mac compile fixes, Fix imgui rendering, Introduce a new RHI::BufferBindFlag, Fix a crash in AsyncStreaming, Fix shader build errors moudgils 2021-04-13 11:03:27 -0700
  • 7b165cd40d
         Merge pull request #5 from aws-lumberyard-dev/github/staging Alex Peterson 2021-04-13 10:03:48 -0700
  • 921eb742d4
         Merge branch 'main' into github/staging Alex Peterson 2021-04-13 09:46:26 -0700
  • 60e6f204d2 Cherrypicking AWS fixes from f57af843 alexpete 2021-04-13 09:19:07 -0700
  • a71a5746cc [LY-113714] Jira: LY-113714 https://jira.agscollab.com/browse/LY-113714 sphrose 2021-04-13 17:15:10 +0100
  • 5e08ec2fa8 Merge branch 'github/staging' of https://github.com/aws-lumberyard-dev/o3de into github/staging alexpete 2021-04-13 09:09:00 -0700
  • fba71c0ca4 Removing epb_sanity_smoke_no_gpu_test alexpete 2021-04-13 09:08:01 -0700
  • b68d07ff88 Deleted temp test file pereslav 2021-04-13 16:17:42 +0100
  • 442e15a414 Merge branch 'main' into sceneapi_script_autotest jackalbe 2021-04-13 09:51:05 -0500
  • eb6d586a92 Test file. Will be deleted pereslav 2021-04-13 15:29:35 +0100
  • 063b8a6d54 update some reinterpret_cast calls to static_cast hultonha 2021-04-13 12:16:55 +0100
  • 8846e159e0 Add new ByteStream serializer to support storing binary data in json (for now) hultonha 2021-04-13 11:54:22 +0100
  • 2313471ab9 Merge branch 'main' into non-uniform-scale-visibility greerdv 2021-04-13 10:50:56 +0100
  • 90e52d69bc fixing bug with subdivision level for runtime asset colliders and adding caching for collider aabbs greerdv 2021-04-13 10:50:07 +0100
  • 87a3dfc968 fixing bug in editor bodies for rigid bodies with non-uniformly scaled asset colliders with position offsets greerdv 2021-04-13 09:04:13 +0100
  • a99786fe59 fixing bug with visibility aabb for non-uniformly scaled polygon prism at activation greerdv 2021-04-13 09:00:33 +0100
  • ea7b8309b5 Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter mcgarrah 2021-04-13 00:43:33 -0500
  • 1a7bf94917
         Merge branch 'main' into Atom/mnaumov/ATOM-14904_2 AMZN-mnaumov 2021-04-12 22:27:18 -0700
  • 5de3ff4c61
         Merge pull request #7 from aws-lumberyard-dev/nvsickle/EditorViewportWidgetFixes Nicholas Van Sickle 2021-04-12 17:39:29 -0700
  • 2f117c553d Merge remote-tracking branch 'upstream/main' into nvsickle/EditorViewportWidgetFixes nvsickle 2021-04-12 16:27:40 -0700
  • f188e1c9a7 Fixing ShaderVariantAsyncLoader shutdown not releasing it's assets mnaumov 2021-04-12 16:03:10 -0700
  • 106d14cf57
         Merge branch 'main' into limit_max_scale greerdv 2021-04-12 23:01:44 +0100
  • 9d1a705fab Merge branch 'main' into sceneapi_script_autotest jackalbe 2021-04-12 15:38:31 -0500
  • 9f88698c3a
         Merge pull request #19 from aws-lumberyard-dev/LatestDevMain Aaron Ruiz Mora 2021-04-12 21:22:21 +0100
  • 8e9851d8ea
         Merge branch 'main' into limit_max_scale greerdv 2021-04-12 21:15:57 +0100
  • a7aa6a9747 Merge branch 'main' of https://github.com/aws-lumberyard/o3de mbalfour 2021-04-12 15:04:06 -0500
  • 51a1b19730
         Merge branch 'main' into Atom/mnaumov/ATOM-14904 AMZN-mnaumov 2021-04-12 12:41:52 -0700
  • 63c97d6d3c Merge branch 'main' into sceneapi_script_autotest jackalbe 2021-04-12 14:27:41 -0500
  • 2f1d13e9c1 Merge branch 'main' of https://github.com/aws-lumberyard/o3de jackalbe 2021-04-12 14:27:02 -0500
  • 22684af141
         Merge branch 'main' into nvsickle/EditorViewportWidgetFixes Nicholas Van Sickle 2021-04-12 12:15:45 -0700
  • cb2ee625be Merge branch 'main' of https://github.com/aws-lumberyard/o3de moraaar 2021-04-12 19:51:04 +0100
  • 73e5a3693f Fixing missing execute permissions Alex Peterson 2021-04-12 11:03:50 -0700
  • a25f5b1317
         Merge pull request #10 from aws-lumberyard-dev/SPEC-6230 Shirang Jia 2021-04-12 11:01:37 -0700
  • 77d06ecef7 ATOM-14889: Fix for scriptProcessorRule doesn't save with field empty jackalbe 2021-04-12 12:30:30 -0500
  • 724105a4ef Merge branch 'main' of https://github.com/aws-lumberyard/o3de into main luissemp 2021-04-12 10:01:33 -0700
  • cd12226849
         Merge branch 'main' into github/staging Alex Peterson 2021-04-12 08:48:09 -0700
  • b8e508c2ee Cherrypicking MeshCompiler fix alexpete 2021-04-12 08:45:38 -0700
  • 62330d8386 Merge branch 'main' of https://github.com/aws-lumberyard/o3de mbalfour 2021-04-12 09:59:41 -0500
  • 90bcfb4c2e
         Merge pull request #1 from aws-lumberyard-dev/jackalbe_scene_api_tests jackalbe 2021-04-12 09:28:12 -0500
  • aa0b54838c
         Fix PhysXDebug and PhysXEditor loading order (#14) Ulugbek Adilbekov 2021-04-12 14:16:01 +0100
  • 8ee92978f4 setting max value for scale greerdv 2021-04-12 13:07:40 +0100
  • 5fc4aeaf09 add alias for AZStd::vector<u8> before potential change hultonha 2021-04-12 11:03:46 +0100
  • a92da4bcf5
         Merge pull request #13 from aws-lumberyard-dev/scale-gizmo-uniform greerdv 2021-04-12 10:13:35 +0100
  • b444c68fd3 Merge branch 'main' into scale-gizmo-uniform greerdv 2021-04-10 16:13:44 +0100
  • 51f1183ff4 making scale gizmo apply uniform scale to transform greerdv 2021-04-10 15:58:42 +0100
  • 0dd57ae901 Adding mutex to ImageProcessingBus mnaumov 2021-04-09 21:18:30 -0700
  • c8a3bc036a
         Merge pull request #11 from aws-lumberyard/main Shirang Jia 2021-04-09 18:58:59 -0700
  • fb4468b041
         Merge branch 'main' into SPEC-6230 Shirang Jia 2021-04-09 18:26:42 -0700
  • 038540c922
         Merge pull request #9 from aws-lumberyard-release/remove_packaging_scrubbing_validation Shirang Jia 2021-04-09 18:18:36 -0700
  • 37379d9d76
         Fix indentation in Jenkinsfile Shirang Jia 2021-04-09 18:17:03 -0700
  • 7c5e555a40
         Fix indentation in Jenkinsfile Shirang Jia 2021-04-09 18:14:14 -0700
  • 82a73c7ece
         Merge branch 'main' into remove_packaging_scrubbing_validation Shirang Jia 2021-04-09 17:56:06 -0700
  • 74c7e99ab7
         Merge branch 'main' into SPEC-6230 Shirang Jia 2021-04-09 17:52:52 -0700
  • 54233f5838 Merge branch 'github/staging' of https://github.com/aws-lumberyard-release/o3de into github/staging alexpete 2021-04-09 17:37:46 -0700
  • 84c42018c7 Revert AutomatedReview/Jenkinsfile shiranj 2021-04-09 17:37:25 -0700
  • 71bd6c67b8 Removed external projects from build_config alexpete 2021-04-09 17:36:59 -0700
  • 53d3ae436d Pipeline fails when using a new empty ebs volume shiranj 2021-04-09 17:35:47 -0700
  • f7651a6d0f
         Cleaning up Jenkinsfile (#8) Esteban Papp 2021-04-09 17:25:49 -0700
  • 33331b75d9 Merge branch 'main' of https://github.com/aws-lumberyard-release/o3de into SPEC-6230 shiranj 2021-04-09 17:23:56 -0700
  • 04d171ecef Pipeline fails when using a new empty ebs volume shiranj 2021-04-09 17:09:14 -0700
  • 3dc9ae7c0f
         Merge branch 'main' into remove_packaging_scrubbing_validation Shirang Jia 2021-04-09 15:48:44 -0700
  • 9f42a8f9bd Remove scrubbing/validation from packaging script shiranj 2021-04-09 15:46:41 -0700
  • 674b9d6fdf Remove scrubbing. It cannot run in the o3de repo. Brian Herrera 2021-04-09 14:52:20 -0700
  • ae04211f8c Merge branch 'main' into github/staging Brian Herrera 2021-04-09 14:42:18 -0700
  • 6f836e4614 Re-add change removed in latest merge. Brian Herrera 2021-04-09 14:40:18 -0700
  • 1c47a26494 Clarify the reason for the default view juggling in SetAsActiveViewport nvsickle 2021-04-09 14:19:41 -0700
  • 2190787c40 Fix build nvsickle 2021-04-09 14:19:05 -0700
  • d09dc500d3 fake commit jackalbe 2021-04-09 14:55:39 -0500
  • 1dabb39b98 Migrate fixes from CodeCommit branch nvsickle 2021-04-09 12:40:43 -0700
  • e8f6463db0
         SPEC-3580 Move Jenkins pipeline files to another folder (#4) Esteban Papp 2021-04-09 12:17:34 -0700
  • 8caec43f2a Updating 3rdparty link in README to rev12 alexpete 2021-04-09 12:04:41 -0700
  • c5b955d281 Integrating github/staging through commit b0dd7ed alexpete 2021-04-09 12:03:26 -0700
  • 1044dc3da1 Integrating github/staging through commit ab87ed9 alexpete 2021-04-09 11:27:37 -0700
  • 302c0aef80
         Merge pull request #2 from aws-lumberyard-release/test_metrics_param_removal evanchia-ly-sdets 2021-04-09 11:06:46 -0700
  • 69fdd42d59
         Set default repo to o3de Brian Herrera 2021-04-09 08:30:29 -0700
  • 0d6a0f4836 Merge branch 'main' into test_metrics_param_removal evanchia 2021-04-08 20:47:36 -0700
  • 733899636c Merge branch 'main' into test_metrics_param_removal evanchia 2021-04-08 20:44:15 -0700
  • ae62a97894
         Merge pull request #3 from aws-lumberyard-release/build/multi-repo-support Brian Herrera 2021-04-08 19:35:34 -0700
  • aef10339d5 Use complete Jenkins project name when creating EBS volumes Brian Herrera 2021-04-08 17:36:00 -0700
  • b32aa9beda
         Merge pull request #1 from aws-lumberyard-release/update-lfs-config Brian Herrera 2021-04-08 16:51:11 -0700
  • 43d39096eb Removing unused arg for test metrics evanchia 2021-04-08 15:13:39 -0700
  • 4caeb3ffe4 Updating lfs endpoint alexpete 2021-04-08 10:45:16 -0700
  • afc51ab0d3
         Merge pull request #19 from aws-lumberyard-test/metrics_setup evanchia-ly-sdets 2021-04-07 20:27:53 -0700
  • 041714c614
         Merge branch 'main' into metrics_setup evanchia-ly-sdets 2021-04-07 18:24:54 -0700
  • 4016d6da2f
         Merge pull request #20 from AMZN-alexpete/github/staging Brian Herrera 2021-04-07 17:59:29 -0700
  • 4eae31c376
         Remove git prune step Brian Herrera 2021-04-07 16:51:02 -0700
  • 91ae6d2771
         Remove scrubbing job from the pipeline Brian Herrera 2021-04-07 15:19:09 -0700
  • 20828a0bf4 Add credential id to the checkout step for the mars repo Brian Herrera 2021-04-07 14:49:22 -0700
  • edc77e3366 Fixing syntax error alexpete 2021-04-07 14:43:14 -0700
  • 004db04c06 Restoring LFS functionality lost in merge alexpete 2021-04-07 14:37:21 -0700
  • ae652cc62a Updating 3rdParty link in README alexpete 2021-04-07 14:06:18 -0700
  • c2cbd430fe Integrating up through commit 90f050496 alexpete 2021-04-07 14:03:29 -0700