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

Commit Graph

  • bf38935e85 Updating conformity tests jonbeer 2021-05-06 14:49:44 -07:00
  • 3751493862 Fixing ATOM RPI issue with new serialization changes jonbeer 2021-05-06 14:44:19 -07:00
  • 854a1fa201 Merge pull request #604 from aws-lumberyard-dev/build-strike/SPEC-6668 Brian Herrera 2021-05-06 14:23:07 -07:00
  • 6d338137a9 Merge pull request #609 from aws-lumberyard-dev/cgalvan/FixLCPreferredComponents cgalvan 2021-05-06 16:22:31 -05:00
  • 1a90528e6c Marking AssetPicker test as xfail due to ATOM-15493 jckand-amzn 2021-05-06 16:18:22 -05:00
  • ad6479967f changing add NUS button from invisible to read only when NUS component already present greerdv 2021-05-06 22:15:00 +01:00
  • bddbe43240 adding all the config folder for ImageProcessingAtom pappeste 2021-05-06 13:55:34 -07:00
  • 778594a357 Merge branch 'main' into Atom/santorac/PomHeightOffset-ATOM-14495 Chris Santora 2021-05-06 13:53:58 -07:00
  • dfd0cbb0fd Material Editor camera controller zoom respects viewport boundary mnaumov 2021-05-06 13:10:55 -07:00
  • 1ea550690a Merge pull request #611 from aws-lumberyard-dev/mbalfour/missing-font-fix Mike Balfour 2021-05-06 15:07:09 -05:00
  • 1b89c7bb17 Merge branch 'main' into SPEC-6690 zsolleci 2021-05-06 14:36:18 -05:00
  • 076371b026 Removed references to JIRA/TestRail; fixed typos and formatting mistakes zsolleci 2021-05-06 14:20:07 -05:00
  • 066a1eddf5 Moved null check before setting the status to "initializing". Otherwise, if the first call to InitFont() is with a null render scene, the status will get stuck in initializing forever and fonts will never render. This does NOT fix the text being drawn in the wrong location, that's a separate bug. mbalfour 2021-05-06 13:42:52 -05:00
  • 6aaec0504b [LYN-3613] Fixed preferred category for Landscape Canvas when adding components since legacy components have been removed and now Mesh is in the Atom category. Chris Galvan 2021-05-06 13:35:00 -05:00
  • 261067cfdf Merge pull request #605 from aws-lumberyard-dev/Atom/guthadam/LYN-3612 Guthrie Adams 2021-05-06 13:20:43 -05:00
  • 828284d109 [LYN-3463] Improve error message based on resource mapping manager loading status (#551) Vincent Liu 2021-05-06 10:55:07 -07:00
  • 618a02ff13 Update step to also send email to build requestor on all branches Brian Herrera 2021-05-06 10:43:44 -07:00
  • ede1889507 [CherryPick][LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode (#585) chiyenteng 2021-05-06 10:39:43 -07:00
  • 743d4489d5 Merge pull request #593 from aws-lumberyard-dev/carlitosan-beta-fixes Luis Sempé 2021-05-06 10:31:30 -07:00
  • d551d01bed LYN-3612 Removing reference to redcoded decal component causing drag/drop crash guthadam 2021-05-06 12:02:17 -05:00
  • 13a40aba02 Merge pull request #602 from aws-lumberyard-dev/cgalvan/FixedEmptyFloatingWindow cgalvan 2021-05-06 11:46:51 -05:00
  • a07d69105b Merge pull request #416 from aws-lumberyard-dev/non-uniform-scale-decal greerdv 2021-05-06 17:39:11 +01:00
  • fc95af4d58 Merge branch 'main' into carlitosan-beta-fixes chcurran 2021-05-06 09:38:36 -07:00
  • bdfee639d9 Update formatting Brian Herrera 2021-05-06 09:38:31 -07:00
  • 032500ddb9 Fix email notifications and limit to watched branches Brian Herrera 2021-05-06 09:23:12 -07:00
  • 14e992c7e1 Merge branch 'main' into Atom/guthadam/ATOM-15486 guthadam 2021-05-06 11:17:34 -05:00
  • fee010f602 Fix test utils. jonawals 2021-05-06 17:04:22 +01:00
  • 32b1d52341 [LYN-2515] Added shared gem info class (#574) Benjamin Jillich 2021-05-06 18:01:13 +02:00
  • c2c6d79688 Merge pull request #592 from aws-lumberyard-dev/Atom/guthadam/ATOM-15473 Guthrie Adams 2021-05-06 10:53:55 -05:00
  • 31312606b1 Fix unused variable warning. jonawals 2021-05-06 16:50:52 +01:00
  • 7dec09d9ae [LYN-3439] Make sure the toolbar spacer is created with a parent to prevent an empty floating window. Chris Galvan 2021-05-06 10:40:24 -05:00
  • d7f33cb3e0 resolving merge conflicts zsolleci 2021-05-06 10:35:55 -05:00
  • 006a9ce85f Fix unused variable warning. jonawals 2021-05-06 16:33:40 +01:00
  • 8704383f0e fixed review comments anugshya 2021-05-06 21:00:57 +05:30
  • 5fbee9c35e upstream/main merge Aristo7 2021-05-06 10:28:14 -05:00
  • e1c98d1468 Merge branch 'Prefab/PhysX/ColliderFixes' of https://github.com/aws-lumberyard-dev/o3de into Prefab/PhysX/ColliderFixes jonbeer 2021-05-06 08:17:23 -07:00
  • 52d2998a06 Removing physics test and aztoolsframework dependency jonbeer 2021-05-06 08:14:41 -07:00
  • f47f712bd0 Fix missing pragma directive. jonawals 2021-05-06 15:53:54 +01:00
  • d880aa5d22 Fix anonymous namespaces for unity builds. jonawals 2021-05-06 15:33:02 +01:00
  • 578cd47a0a replacing virtual function with default parameter with overloaded function greerdv 2021-05-06 15:11:11 +01:00
  • 785e22541a Merge pull request #580 from aws-lumberyard-dev/PhysxTimeout hnusrath 2021-05-06 14:51:42 +01:00
  • 409500635f "Fixing review comments" darapan 2021-05-06 05:40:11 -07:00
  • 98927fb638 Merge branch 'main' into script_canvas darapan 2021-05-06 05:12:16 -07:00
  • 460863be0a "Resolving merge conflicts" darapan 2021-05-06 05:06:14 -07:00
  • f258802377 (cherry-pick from 1.0) Fix registry colliding by using a different extension for the files used to override registry Aaron Ruiz Mora 2021-05-06 11:39:19 +01:00
  • c9c2aa7367 Fixed expected lines anugshya 2021-05-06 15:51:58 +05:30
  • 3a3d897db7 test_ScriptEvents_ReturnSetTypeSuccessfully anugshya 2021-05-06 15:07:35 +05:30
  • 368bf69ae6 Merge branch 'main' into non-uniform-scale-decal greerdv 2021-05-06 09:01:17 +01:00
  • 499152d23c Merge pull request #542 from aws-lumberyard-dev/SC_migration_branch balibhan 2021-05-06 11:41:06 +05:30
  • 57ed4095c4 Merge pull request #597 from aws-lumberyard-dev/AddBuildersToMac moudgils 2021-05-05 23:09:29 -07:00
  • c8b0a7be8a Merge branch 'main' into Atom/guthadam/ATOM-15473 guthadam 2021-05-05 23:32:30 -05:00
  • e80de63d55 ATOM-15486 Saving material editor user settings guthadam 2021-05-05 23:31:17 -05:00
  • 751d13dd7b Merge remote-tracking branch 'origin' into MultiplayerComponents karlberg 2021-05-05 20:07:49 -07:00
  • a1fe8fe419 Ported the local prediction player controller component karlberg 2021-05-05 20:07:16 -07:00
  • 4661da23bb Cleaned up the flags in the BaseJsonSerializer.h AMZN-koppersr 2021-05-05 17:51:22 -07:00
  • ec52e51476 Additional unit tests for the Json Serialization to make sure custom json serializer work if they're the first used through the higher Load/Store calls. AMZN-koppersr 2021-05-05 17:22:57 -07:00
  • 46b4b76682 Add Vulkan and DX12 builders as Mac should be able to build assets from other platforms moudgils 2021-05-05 17:17:47 -07:00
  • 68f19644e7 typo pappeste 2021-05-05 16:42:50 -07:00
  • 6ad135f35c Fix for smart pointers being loaded through the main load point with a default JSON object. AMZN-koppersr 2021-05-05 16:41:54 -07:00
  • 9fe893830c sine fixes to AP model handling, still getting some sporadic asserts in debug pappeste 2021-05-05 16:22:13 -07:00
  • e63c360194 small unrelated fix pappeste 2021-05-05 16:21:41 -07:00
  • f6187f510a config file going to the wrong place pappeste 2021-05-05 16:21:25 -07:00
  • 724add6365 Fix Project Manager Qt Ui files not Being Autogenerated (#588) AMZN-nggieber 2021-05-05 15:45:39 -07:00
  • 2765c722ca Merge branch 'main' into carlitosan-beta-fixes chcurran 2021-05-05 15:05:15 -07:00
  • a30d8eb886 Expose Raw BC Properties to Node Palette. chcurran 2021-05-05 14:59:08 -07:00
  • 97fb763776 Merge pull request #587 from aws-lumberyard-dev/PhysXTestRailLinkRemoval hnusrath 2021-05-05 22:53:59 +01:00
  • 2bff2010bc Merge remote-tracking branch 'upstream/main' into Atom/olexl/ATOM-15376 Aristo7 2021-05-05 16:46:08 -05:00
  • eb847ce9fa ATOM-15473 added context menu to material inspector group header with expand and collapse actions guthadam 2021-05-05 16:35:32 -05:00
  • 790e41f675 Reverted previous fix. AMZN-koppersr 2021-05-05 14:21:53 -07:00
  • 1455fcbde6 Asset Bundler - Minor Feedback (#550) Zaladane 2021-05-05 13:59:37 -07:00
  • 6a3e892020 Fixed up pal file names Aristo7 2021-05-05 15:42:57 -05:00
  • fa0d1fe509 Merge remote-tracking branch 'origin/nggieber-ProjectManagerFixUngeneratedQtUi' into ly-as-sdk/LYN-2948 pappeste 2021-05-05 13:37:00 -07:00
  • 5b98227a77 Adding newline to the end of project_manager_files.cmake lumberyard-employee-dm 2021-05-05 14:58:31 -05:00
  • 6dcc75ed78 AtomBridge contains all runtime deps now Aristo7 2021-05-05 14:43:41 -05:00
  • 2044832bb1 Updated Source capitalization in cmake files list nggieber 2021-05-05 12:41:05 -07:00
  • 5783bf635b Fix for LoadLevel not being called. (#584) bosnichd 2021-05-05 13:35:50 -06:00
  • 988daaef0b Merge branch 'main' into ly-as-sdk/LYN-2948 pappeste 2021-05-05 12:33:47 -07:00
  • d27aa0f584 replaced ly_add_dependencies with ly_add_target_files so settingsregistry is happy pappeste 2021-05-05 12:31:34 -07:00
  • 625aa14aa8 Updated files after moving all Qt folder into Source nggieber 2021-05-05 12:31:17 -07:00
  • 76ffff8bb5 Moved Qt files into to renamed 'S'ource nggieber 2021-05-05 12:29:06 -07:00
  • 412bf67772 changing the default prefix (install path) to be <source_dir>/install to workaround the "build/*" filter in the AP This is also better since we support installing different configuraitons/platforms in the same prefix pappeste 2021-05-05 12:08:55 -07:00
  • 7c9837dfd4 installing the gems.json files pappeste 2021-05-05 12:07:45 -07:00
  • 84381e4c3a making the settings registry compute the path based on the gems.json file pappeste 2021-05-05 12:07:23 -07:00
  • fdb461b3ca SPEC-6677 Remove TestRail URLs from Physx Tests hnusrath 2021-05-05 20:06:39 +01:00
  • 7ba3a19b40 Remove unnecessary transformation of tangents and bitangents in cloth CPU skinning. Aaron Ruiz Mora 2021-05-05 19:48:56 +01:00
  • 26ab8c8a25 merging from main greerdv 2021-05-05 19:07:04 +01:00
  • be1e4e7b1a Merge pull request #581 from aws-lumberyard-dev/jckand/FoundationAuto jckand-amzn 2021-05-05 12:58:40 -05:00
  • 83e2ec6800 Project Manager - Barebones UI Made for All Screens with Basic Flow (#507) AMZN-nggieber 2021-05-05 10:46:34 -07:00
  • 2d043431bc Merge pull request #578 from aws-lumberyard-dev/hultonha_LYN-3496_whitebox_freezing Tom Hulton-Harrop 2021-05-05 18:32:55 +01:00
  • 2b511b68a2 "Adding AssetBundlerBatch test" darapan 2021-05-05 10:26:11 -07:00
  • dd90c590aa Merge pull request #564 from aws-lumberyard-dev/MultiplayerPipeline SergeyAMZN 2021-05-05 18:17:44 +01:00
  • a7224b6379 Integrating github/Helios_RemoveFbxSdk through commit 6dc2604 (#391) (#560) AMZN-stankowi 2021-05-05 09:29:12 -07:00
  • 01976a890c Removed wireframe from perspective menu and fixed crash on right click (#575) Terry Michaels 2021-05-05 11:10:19 -05:00
  • 8e100499ec Cherry picking 399e830f from 1.0 branch jckand-amzn 2021-05-04 12:01:36 -05:00
  • 20dd19c444 Cherry picking 13aa9113 from 1.0 branch jckand-amzn 2021-04-30 14:20:19 -05:00
  • 08f96b0f3e addressed review feedback zsolleci 2021-05-05 10:58:22 -05:00
  • 1d900947f5 defer rebuilding the white box mesh by a frame to prevent reentrancy causing issues hultonha 2021-05-05 16:55:48 +01:00
  • abb5d56572 SPEC-6547: Updating intermittently failing tests to utilize instance validation util jckand-amzn 2021-04-29 12:43:07 -05:00
  • 682bdf6847 "Changing testsuite" darapan 2021-05-05 08:50:34 -07:00
  • 7b95b5e329 Merge pull request #556 from aws-lumberyard-dev/MoveDebugDisplayGlobalID rgba16f 2021-05-05 10:34:17 -05:00