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

Commit Graph

  • 3f49553b46 Merge branch 'main' into non-uniform-scale-visibility greerdv 2021-04-15 17:07:25 +01:00
  • 582b098ed2 removing unused local variable greerdv 2021-04-15 17:06:56 +01:00
  • ebebc05cd1 Reenable Blast Automated tests (#42) Ulugbek Adilbekov 2021-04-15 16:16:31 +01:00
  • 3bbef11d15 Merge branch 'main' into non-uniform-scale-visibility greerdv 2021-04-15 14:17:11 +01:00
  • e989a2e697 Merge branch 'limit_max_scale' of https://github.com/aws-lumberyard-dev/o3de into limit_max_scale greerdv 2021-04-15 14:00:44 +01:00
  • 10ab7666db Merge branch 'main' into limit_max_scale greerdv 2021-04-15 13:44:53 +01:00
  • 2bfb93e5e1 fixing non-uniform scale for mesh on activation greerdv 2021-04-15 12:34:35 +01:00
  • 23cf2d5d68 SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects. amzn-sean 2021-04-13 15:03:21 +01:00
  • 20c1454e4b Added the ShaderRead buffer bind flag to the static and dynamic input assembly pools, and one creation of a static input assembly buffer. dmcdiar 2021-04-15 03:41:20 -07:00
  • 390aa36480 Merge branch 'main' into LYN-1901 jjjoness 2021-04-15 11:08:04 +01:00
  • 11081aeddd Changed logo to O3DE jjjoness 2021-04-15 11:01:08 +01:00
  • 7c5f7181eb updates following review feedback - remove explicit resize and update concrete type to alias hultonha 2021-04-15 10:32:46 +01:00
  • 4c582a2b0a Merge branch 'main' into non-uniform-scale-mesh greerdv 2021-04-15 08:29:57 +01:00
  • 79a34f87b0 fixing merge conflicts greerdv 2021-04-15 08:28:50 +01:00
  • d8169e08fb merging from main greerdv 2021-04-15 08:18:11 +01:00
  • b6492121ca Merge branch 'main' into Prefab/CreatePrefab srikappa 2021-04-15 00:07:29 -07:00
  • fa7f61cf0d ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines - Added pause/resume button to ImGui Profiler to pause/resume profiling - Added showing pass execution timeline - Change TimestampResult to include both begin tick and duration tick. Update some function names of TimestampResult. - Update some functions names in Pass. - Stop showing accumulated time for ParentPass. - Fixed a crash issue with ImGuiManager which doesn't have default font. qingtao 2021-04-14 22:48:46 -07:00
  • 243af5f697 ATOM-15240 Fixing thumbnails attempting to use a feature processor that no longer exists. Adding simple point and simple spot feature processors to the thumbnail scene descriptor. pruiksma 2021-04-14 23:13:31 -05:00
  • 3d3f43b0b9 Merge pull request #36 from aws-lumberyard-dev/Atom/moudgils/MacRuntimeFixes moudgils 2021-04-14 20:57:40 -07:00
  • 8019312b35 Merge pull request #28 from aws-lumberyard-dev/LYN-2883 lumberyard-employee-dm 2021-04-14 20:55:27 -05:00
  • c97dae47b7 Merge pull request #22 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14904_2 AMZN-mnaumov 2021-04-14 18:53:23 -07:00
  • 2410d299c1 Make creation of new prefabs use a relative path to the project srikappa 2021-04-14 17:51:15 -07:00
  • 45faa26ffd Some initial updates for eventual support of locally predicted input processing karlberg 2021-04-14 17:50:04 -07:00
  • 88120999f9 Merge remote-tracking branch 'origin' into MultiplayerComponents karlberg 2021-04-14 17:47:58 -07:00
  • a23a2fba65 PR feedback mnaumov 2021-04-14 17:47:37 -07:00
  • 8b265d2e8d Initial version that I need to test out (#60) Esteban Papp 2021-04-14 17:38:57 -07:00
  • be85d2ea58 Merge pull request #57 from aws-lumberyard-dev/build/SPEC-5588 Brian Herrera 2021-04-14 17:30:13 -07:00
  • a371edd07f Initial commit of CreatePrefab work srikappa 2021-04-14 17:26:14 -07:00
  • f7aabebb37 Fix context menu popping up when it shouldn't nvsickle 2021-04-14 16:56:23 -07:00
  • f5c8bf068d Merge branch 'main' into cpack_installer scottr 2021-04-14 17:00:19 -07:00
  • 03aaf33b6e Merge pull request #62 from aws-lumberyard-dev/SPEC-6295 SJ 2021-04-14 16:47:12 -07:00
  • d1a65c8dc4 Merge main to Multiplayer Editor branch puvvadar 2021-04-14 16:25:53 -07:00
  • fa781fabc5 Add MultiplayerGem Editor components for Ctrl+G support puvvadar 2021-04-14 16:20:45 -07:00
  • b5386fd53b Merge pull request #54 from aws-lumberyard-dev/Atom/dmcdiar/LYN-2735 dmcdiarmid-ly 2021-04-14 15:51:04 -07:00
  • 7484a983b8 Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport Nicholas Van Sickle 2021-04-14 15:47:56 -07:00
  • d29fe24396 Merge remote-tracking branch 'upstream/main' into LYN-2883 mcgarrah 2021-04-14 17:43:20 -05:00
  • 7609248c49 Fix build errors amzn-sj 2021-04-14 15:42:24 -07:00
  • 11b6874d92 [cpack_installer] initial support for installable components scottr 2021-04-14 15:39:22 -07:00
  • 828bedf7a9 Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline SergeyAMZN 2021-04-14 22:59:39 +01:00
  • a1f0baeeff Prevent skipping build if it's from a pull request Brian Herrera 2021-04-14 14:43:01 -07:00
  • 4a3d24f189 SPEC-6276 Move ci_build and ci_build_metrics to scripts\build Esteban Papp 2021-04-14 14:40:42 -07:00
  • 0f13a71bd2 [LYN-2255] Refactored some EditorEntityHelpers so they can be re-used. Chris Galvan 2021-04-14 16:01:26 -05:00
  • fff97cda3b Cache runtime dependencies for targets to speed up iOS configuration. amzn-sj 2021-04-14 13:09:21 -07:00
  • 12725feb48 Merge branch 'main' of https://github.com/aws-lumberyard/o3de mbalfour 2021-04-14 15:02:23 -05:00
  • 9c01e993db Convert etc2comp to new 3p system (#44) Chris Burel 2021-04-14 12:58:03 -07:00
  • 78e5a069fa Removed Cry branding on error messages (#41) Terry Michaels 2021-04-14 14:31:44 -05:00
  • 2c3a98878f SPEC-6137 Add a non-unity build for Linux in AR gating runs Esteban Papp 2021-04-14 12:29:31 -07:00
  • 12088d88a0 SPEC-6275 Remove AutomatedReview folder Esteban Papp 2021-04-14 12:27:14 -07:00
  • 042241a119 SPEC-6268 Remove check for 3rdParty.txt Esteban Papp 2021-04-14 12:26:20 -07:00
  • 6541ca4cb0 Merge pull request #18 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14904 AMZN-mnaumov 2021-04-14 12:23:25 -07:00
  • 28ccb5d381 Fixing camera panning and zooming mnaumov 2021-04-14 12:17:45 -07:00
  • 90ad9f5141 SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD Esteban Papp 2021-04-14 12:14:38 -07:00
  • be0ba6ace9 [LYN-2878] Attempt to fix deadlocks that occur when the Editor loads surface tag assets. Mike Balfour 2021-04-14 14:10:08 -05:00
  • 2e58b255cf Merge branch 'main' of https://github.com/aws-lumberyard/o3de mbalfour 2021-04-14 14:06:34 -05:00
  • bf0db7a3c6 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport nvsickle 2021-04-14 10:47:18 -07:00
  • 97d0f42671 Enable EditorViewportWidget by default nvsickle 2021-04-14 10:45:54 -07:00
  • bbec18d030 Fix initial camera position when working directly with Atom nvsickle 2021-04-14 10:45:22 -07:00
  • 217009de2b adding tests for transforming Aabb with Matrix3x4 and fixing bug in implementation greerdv 2021-04-14 18:25:38 +01:00
  • 70c2d5ee40 SPEC-5789 Remove inclusion of CMakeParseArguments Esteban Papp 2021-04-14 10:24:23 -07:00
  • efe5715e68 Merge branch 'main' into mbalfour/spec-6178 Mike Balfour 2021-04-14 12:07:58 -05:00
  • bd4c813dc6 Merge branch 'main' into Atom/moudgils/MacRuntimeFixes moudgils 2021-04-14 09:46:00 -07:00
  • 6f67aabd67 Minor cleanup moudgils 2021-04-14 09:42:13 -07:00
  • 2961e31f45 Merge pull request #20 from aws-lumberyard-dev/sceneapi_script_autotest jackalbe 2021-04-14 11:17:30 -05:00
  • a947007861 Darken line sphrose 2021-04-14 15:15:42 +01:00
  • cc25f9ee61 Merge branch 'main' of https://github.com/aws-lumberyard/o3de mbalfour 2021-04-14 08:54:13 -05:00
  • e8f4fac16a Merge branch 'sceneapi_script_autotest' of https://github.com/aws-lumberyard-dev/o3de into sceneapi_script_autotest jackalbe 2021-04-14 08:34:17 -05:00
  • a7a22bfcc0 Merge branch 'main' into sceneapi_script_autotest jackalbe 2021-04-14 08:32:59 -05:00
  • 2fb2813b48 updating atom mesh component to support non-uniform scale component greerdv 2021-04-14 14:05:59 +01:00
  • 59252235d5 Fixed dangling pointer in InitializeCatalog pereslav 2021-04-14 13:13:01 +01:00
  • 9c8fd1f9e4 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab hultonha 2021-04-14 12:31:57 +01:00
  • e1e746066d add some preliminary tests for ByteStreamSerializer hultonha 2021-04-14 12:04:23 +01:00
  • 2655aaa633 update ByteStreamSerializer to use Base64 encoding hultonha 2021-04-14 11:30:40 +01:00
  • 21f861a702 Merge branch 'main' into MultiplayerPipeline pereslav 2021-04-14 10:25:11 +01:00
  • 9aec30a608 Merge branch 'main' into Atom/moudgils/MacRuntimeFixes moudgils 2021-04-13 21:48:17 -07:00
  • e4db6829fb Merge pull request #35 from aws-lumberyard-dev/github/staging Alex Peterson 2021-04-13 21:20:15 -07:00
  • 7b6ecc036b Minor updates moudgils 2021-04-13 21:16:04 -07:00
  • ca3df5d6c8 Various bug fixes to get entity replication working karlberg 2021-04-13 20:24:08 -07:00
  • 68d58f48ae Merge branch 'main' into Atom/moudgils/MacRuntimeFixes moudgils 2021-04-13 19:45:18 -07:00
  • 957945f809 Clarified the error message that is output when the project.json is not found mcgarrah 2021-04-13 19:50:06 -05:00
  • 92b8e590ce Added better error message around when the Unified Launcher target for a Project cannot be configured due to issues querying the project name from the provided project path mcgarrah 2021-04-13 19:42:30 -05:00
  • fa9366b810 Updating the AutomatedTesting project to support being built as an External Project mcgarrah 2021-04-13 19:35:59 -05:00
  • 774580cea2 Updating README to mention 3p rev13 alexpete 2021-04-13 17:30:43 -07:00
  • 8469c9ca0a Integrating github/staging through commit 5f214be alexpete 2021-04-13 17:18:57 -07:00
  • e56f43b962 Merge branch 'LYN-2883' of https://github.com/aws-lumberyard-dev/o3de into LYN-2883 mcgarrah 2021-04-13 18:54:32 -05:00
  • 51928f779f Merge branch 'main' into LYN-2883 mcgarrah 2021-04-13 18:52:59 -05:00
  • cf70cc9a37 Merge branch 'main' into LYN-2883 lumberyard-employee-dm 2021-04-13 18:52:16 -05:00
  • 8c0bb18235 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport nvsickle 2021-04-13 16:45:03 -07:00
  • 2a9dfb7a1d Merge pull request #25 from aws-lumberyard-dev/build-strike/SPEC-6281 Shirang Jia 2021-04-13 16:05:55 -07:00
  • 3eee26f97e Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport nvsickle 2021-04-13 15:59:37 -07:00
  • cdaddc72e8 Merge branch 'main' into sceneapi_script_autotest jackalbe 2021-04-13 17:54:57 -05:00
  • 5050de2604 Adding "Open Material Editor" action to Material Component slot context menu mnaumov 2021-04-13 15:05:05 -07:00
  • 87b522e4ba Merge branch 'main' into build-strike/SPEC-6281 Shirang Jia 2021-04-13 14:54:23 -07:00
  • a532cc1217 Compile fix moudgils 2021-04-13 14:27:11 -07:00
  • e6c12499f7 Added raytracingscenesrg.srgi to the default project template and AutomatedTesting project. alexpete 2021-04-13 14:05:48 -07:00
  • 251872cba6 Merge branch 'mbalfour/spec-6178' of https://github.com/aws-lumberyard-dev/o3de into mbalfour/spec-6178 mbalfour 2021-04-13 15:39:08 -05:00
  • d7f10e9d60 [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 -05:00
  • a1c664e666 Merge pull request #26 from aws-lumberyard/main Brian Herrera 2021-04-13 13:29:15 -07:00
  • b5ef4207a2 Merge branch 'main' into mbalfour/spec-6178 mbalfour 2021-04-13 14:25:56 -05:00
  • 865dcf6e47 Merge branch 'main' of https://github.com/aws-lumberyard/o3de mbalfour 2021-04-13 14:25:42 -05:00
  • d399d0d8f1 Move jenkins_pipeline_metrics.py to ascripts/build/Jenkins/tools shiranj 2021-04-13 12:15:51 -07:00