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

Commit Graph

  • 1a15007dcb Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities Chris Galvan 2021-05-20 14:44:36 -05:00
  • eb3f623bf5 Merge pull request #845 from aws-lumberyard-dev/MultiplayerPipeline SergeyAMZN 2021-05-20 20:29:42 +01:00
  • c105894aa5 [LYN-2255] Made PrefabTestFixture have the prefab system enabled so that the duplicate tests pass on Jenkins (they rely on the PrefabEditorEntityOwnershipInterface being registered). Chris Galvan 2021-05-20 14:28:04 -05:00
  • ccfb8a7516 Merge branch 'main' into Atom/santorac/DepthBasedLayerBlending Chris Santora 2021-05-20 12:16:06 -07:00
  • 4086edc3f7 Moved the debug view mode setting to the "blend" group because the only modes we have right now are related to layer blending. Chris Santora 2021-05-20 12:14:33 -07:00
  • 599877a7e1 Updated atom_feature_common_asset_files.cmake to reflect recent lua functor file changes. Chris Santora 2021-05-20 12:13:52 -07:00
  • c1819b6486 Merge pull request #839 from aws-lumberyard-dev/nvsickle/BootstrapFixes Nicholas Van Sickle 2021-05-20 12:10:22 -07:00
  • 6deae83906 Merge pull request #736 from aws-lumberyard-dev/Atom/santorac/NewLayeringWorkflow Chris Santora 2021-05-20 12:06:11 -07:00
  • 5a149a4594 Merge branch 'main' into DxcExperiment moudgils 2021-05-20 11:56:35 -07:00
  • cb87b7cd1f Moved early return case in prefab processing pereslav 2021-05-20 19:43:33 +01:00
  • 80e12a2df3 Fix whitespace delta puvvadar 2021-05-20 11:39:25 -07:00
  • d26d24d9bd Remove test RTTIs puvvadar 2021-05-20 11:38:06 -07:00
  • c47c45724a LYN-3772 : For non-PBR materials, apply the diffuse color to the base color field on the Atom material, so a color value set in the DCC tool still comes through. (#733) AMZN-stankowi 2021-05-20 11:28:34 -07:00
  • ff35804ce3 Change prefab assert to warning amzn-sj 2021-05-20 11:19:27 -07:00
  • 2d550cc994 Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes nvsickle 2021-05-20 11:07:45 -07:00
  • 7d48a7f784 Merge pull request #841 from aws-lumberyard-dev/michabr/lyshine_text michabr 2021-05-20 11:02:04 -07:00
  • 1a1874b3bc Remove duplicate calls to some functions amzn-sj 2021-05-20 10:56:54 -07:00
  • 4ef357e57e Updates the templates to use the new system lawsonamzn 2021-05-13 15:04:40 -07:00
  • 6a7a86062e Updates AutomatedTesting project and adds atom support lawsonamzn 2021-05-13 14:00:05 -07:00
  • c9d5d7fb77 The new gem registration and usage system Merge from mainline (Rebase) Nicholas Lawson 2021-04-27 17:09:57 -07:00
  • 7ecb00cca1 Cleanup jinja formatting and fix log spam puvvadar 2021-05-20 10:46:48 -07:00
  • c93c457356 Merge pull request #772 from aws-lumberyard-dev/Prefab/Create/PositionFix Danilo Aimini 2021-05-20 10:32:42 -07:00
  • a14b035627 Merge branch 'Atom/santorac/NewLayeringWorkflow' into Atom/santorac/DepthBasedLayerBlending Chris Santora 2021-05-20 10:28:33 -07:00
  • e975a622b0 Move TextureAtlas builder files to the gem abrmich 2021-05-12 21:55:19 -07:00
  • 451b850f27 Bring back AtlasBuilder files that were removed with the ImageProcessing gem abrmich 2021-05-12 21:17:32 -07:00
  • 69fed39982 Merge pull request #766 from aws-lumberyard-dev/michabr/lyshine_atom michabr 2021-05-20 10:02:44 -07:00
  • d2cdabbac4 Merge branch 'main' into michabr/lyshine_text abrmich 2021-05-20 09:59:22 -07:00
  • 3788aa4eec LYN-2139 UX: Goto Position modal is unnecessarily massive sphrose 2021-05-20 17:48:18 +01:00
  • 03b41b620d [LYN-2522] Preparation work for the filter pane (#799) Benjamin Jillich 2021-05-20 18:42:37 +02:00
  • 471d9afe82 Minor edits to python script amzn-sj 2021-05-20 09:31:55 -07:00
  • 525840fb2a Adding password 1 factor sign in (#830) amzn-hdoke 2021-05-20 09:29:44 -07:00
  • d33fa7dccc Fix for tests that are failing due to project_path not being set amzn-sj 2021-05-20 09:27:47 -07:00
  • 8799d1ab54 Merge branch 'main' into Atom/santorac/NewLayeringWorkflow Chris Santora 2021-05-20 09:07:08 -07:00
  • 43d98ac989 Fixed comment pereslav 2021-05-20 16:56:54 +01:00
  • a4243f4be3 Temporarily fixes an issue with some Gems where asset paths aren't properly generated for asset processor phistere 2021-05-20 10:42:06 -05:00
  • 226ccce52d Merge branch 'TIF/Jenkins' of https://github.com/aws-lumberyard-dev/o3de into TIF/Jenkins jonawals 2021-05-20 16:41:09 +01:00
  • 8d8504aec3 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities Chris Galvan 2021-05-20 10:40:50 -05:00
  • 66f823617b Merge pull request #27 from aws-lumberyard-dev/TIF/Jenkins_Runtime_API jonawals 2021-05-20 16:40:07 +01:00
  • 2d89c60175 [LYN-2255] Updated Prefab Duplicate to select the newly duplicated entities. Also addressed some other PR feedback. Chris Galvan 2021-05-20 10:39:57 -05:00
  • feb2909508 Address PR comments jonawals 2021-05-20 16:38:56 +01:00
  • 0f4e00e48f Updating the Gems selctions for the DefaultProject template phistere 2021-05-20 10:38:44 -05:00
  • 798d96f1a2 Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter amzn-mike 2021-05-20 10:36:29 -05:00
  • 22e893ccbe Added support for nested prefabs in multiplayer pipeline pereslav 2021-05-20 16:32:41 +01:00
  • eb31d90ad9 Updates to fix BoxSelect when using Orbit with the new Camera (#825) Tom Hulton-Harrop 2021-05-20 15:54:36 +01:00
  • 0b4b0698c7 disable physics tick time warning in debug builds and make it less spammy (#827) amzn-sean 2021-05-20 15:39:39 +01:00
  • 7a25a17fae Fixes a few issues when using an engine name different from the default phistere 2021-05-20 09:13:01 -05:00
  • 134c8f10c6 Merge branch 'main' into cpack_installer scottr 2021-05-20 07:09:43 -07:00
  • 8c35347cfb Fixed build timeout failures. Added xfail and made pytest timeout to be smaller so CMake doesnt make it to timeout and python does it instead AMZN-AlexOteiza 2021-05-20 14:31:55 +01:00
  • e9d3c0f080 fix after merge greerdv 2021-05-20 13:30:32 +01:00
  • 256df54575 [ATOM-15276] Shader Build Pipeline: Add Shader Supervariant System (#749) galibzon 2021-05-20 04:53:16 -05:00
  • b33569638e Address PR comments jonawals 2021-05-20 10:06:14 +01:00
  • f7cac706f7 Merge pull request #26 from aws-lumberyard-dev/TIF/Jenkins jonawals 2021-05-20 09:15:10 +01:00
  • 1f45e03a0c Added Gem::AtomFont to tool and runtime dependencies abrmich 2021-05-19 22:25:07 -07:00
  • ca94c59e28 Switch FbxImportRequestHandler to inherit from AZ::Component instead of BehaviorComponent amzn-mike 2021-05-19 23:22:44 -05:00
  • 8d349c3383 Merge branch 'main' into SPEC6477_NetworkContextScriptCanvas Gene Walters 2021-05-19 21:09:43 -07:00
  • 19aa0bdd75 Merge branch 'main' into michabr/lyshine_atom abrmich 2021-05-19 20:49:32 -07:00
  • 5945e27f21 Merge branch 'main' into cpack_installer scottr 2021-05-19 20:26:37 -07:00
  • d83d9c9bff [cpack_installer] fixed issue with applying default installer GUIDs when seed property changes scottr 2021-05-19 20:26:27 -07:00
  • e0cb0fec9b [cpack_installer] add desktop and start menu shortcuts scottr 2021-05-19 19:39:52 -07:00
  • 2452149e7d Add RPC Events plus reflection plus fix Ctrl+G retry puvvadar 2021-05-19 19:34:48 -07:00
  • a55edbe910 Merge branch 'ly-as-sdk/LYN-2948-phistere' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948-phistere lumberyard-employee-dm 2021-05-19 21:26:29 -05:00
  • 94a8c8258b Bumped shader builders moudgils 2021-05-19 19:22:35 -07:00
  • 1654553e9c Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes nvsickle 2021-05-19 19:12:07 -07:00
  • 8d4fb4d67d Fix dummy rendering pipeline being created for the Editor nvsickle 2021-05-19 19:11:23 -07:00
  • af22a0f44e Merge pull request #820 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15528 AMZN-mnaumov 2021-05-19 18:34:22 -07:00
  • 666abd4515 Remove Assets/Engine/Shaders and the root Tests folder (#831) bosnichd 2021-05-19 19:20:59 -06:00
  • bcf21e0930 Removed unused InitializeZero function from StandardSurface Chris Santora 2021-05-19 17:43:24 -07:00
  • f3099aa7d5 Merge remote-tracking branch 'origin/main' into Atom/santorac/NewLayeringWorkflow Chris Santora 2021-05-19 16:57:49 -07:00
  • 980c01efbf Remove call to set default param amzn-sj 2021-05-19 16:48:50 -07:00
  • b63f2449c9 Remove reference to deleted function amzn-sj 2021-05-19 16:47:40 -07:00
  • 69df673511 Fix lua reflection error on AutomatedTesting project. (#835) hershey5045 2021-05-19 16:35:37 -07:00
  • e265990a0c Set DisableOptimizations to false. moudgils 2021-05-19 16:18:11 -07:00
  • e510446185 PR feedback mnaumov 2021-05-19 16:18:02 -07:00
  • 2112d67b6b Rename variable to make it clearer it's a map daimini 2021-05-19 16:15:18 -07:00
  • 19664dccd2 Merge main mnaumov 2021-05-19 16:10:44 -07:00
  • 73335c7160 Fixed AZ::Utils::GetHomeDirectory function for non-Windows platforms (#821) lumberyard-employee-dm 2021-05-19 18:05:29 -05:00
  • f61b9c4081 Removing spaces in behavior context method names. While whitespace works in Lua and ScriptCanvas, the Scripting team wants to keep the script API and code API consistent (ie: no spaces) Gene Walters 2021-05-19 16:03:13 -07:00
  • e638c6b0d5 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix daimini 2021-05-19 15:30:48 -07:00
  • 1a0bf32f42 Merge pull request #829 from aws-lumberyard-dev/jckand/FoundationAuto jckand-amzn 2021-05-19 17:09:49 -05:00
  • 7bdebfe17f [ATOM-15561] Adding AZ_Error for unhandled pass binding failure case. Ken Pruiksma 2021-05-19 16:24:09 -05:00
  • 3d4d63ab1d [cpack_installer] installer product icons scottr 2021-05-19 14:08:38 -07:00
  • 6cdb746859 Merge pull request #818 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6849-intermittent-test-failure-fix jromnoa 2021-05-19 14:08:18 -07:00
  • 268fd8b714 Remove bootstrap.cfg and references to it. amzn-sj 2021-05-19 13:57:35 -07:00
  • 9788caa6cb [cpack_installer] move non-cmake packaging resources into their own folder scottr 2021-05-19 13:48:02 -07:00
  • 6a643392f0 Merging latest main karlberg 2021-05-19 13:37:45 -07:00
  • 487e989e68 Several updates to complete rewind support and remove unneeded functionality karlberg 2021-05-19 13:27:24 -07:00
  • 58eea979cf AR build fix mnaumov 2021-05-19 13:24:04 -07:00
  • f779821ac0 Helios - LYN-3250 - Fixed morph targets for meshes that had multiple … (#696) AMZN-stankowi 2021-05-19 13:02:31 -07:00
  • 25e811ff6c Completed FirstTimeUseScreen with Final UX Look (#812) AMZN-nggieber 2021-05-19 12:48:55 -07:00
  • e70d86501c Add runtime api headers jonawals 2021-05-19 20:35:13 +01:00
  • 5802c4e1dc Merge branch 'main' into pruiksma/ATOM-15561 pruiksma 2021-05-19 14:26:30 -05:00
  • 4ca30afa9e Updates pip install flags for consistency and installs the o3de module phistere 2021-05-19 14:24:31 -05:00
  • 6be126ec36 SPEC-6949: Updating menu actions for failing Menu tests jckand-amzn 2021-05-19 14:24:29 -05:00
  • 9fc01ea24d AR fixes mnaumov 2021-05-19 11:51:42 -07:00
  • bd74835f30 Remove leftover code that's no longer needed abrmich 2021-05-19 11:46:02 -07:00
  • 1127235715 Remove unnecessary heap allocation abrmich 2021-05-19 11:36:44 -07:00
  • 6a108c0515 Merge pull request #806 from aws-lumberyard-dev/Spawnable/Instantiation/EntityIdReferenceFix sconel 2021-05-19 11:26:10 -07:00
  • cef7eacd24 Fixes install of scripts to include o3de folder phistere 2021-05-19 13:25:51 -05:00
  • ded39be57e Merging WrinkleMask support from 1.0 to main (#680) Tommy Walton 2021-05-19 11:21:44 -07:00
  • d5122b2829 Add image builder processing bus abrmich 2021-05-14 12:53:03 -07:00