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

Commit Graph

  • ec9cafcef5 Improved the displacement property handling to be more cohesive and intuitive. Also fixed a bunch of edge cases. Chris Santora 2021-05-14 23:05:33 -07:00
  • dc8971e80d Merge pull request #756 from aws-lumberyard-dev/Atom/mriegger/15542 mrieggeramzn 2021-05-14 21:01:05 -07:00
  • 73f438e185 Changed the descriptor a shared_ptr. dmcdiar 2021-05-14 19:10:25 -07:00
  • 12760ef6a3 Remove unused container entity retrieval daimini 2021-05-14 16:37:47 -07:00
  • 0cfc7f10a9 Merge pull request #728 from aws-lumberyard-dev/Prefab/CyclicalDependencyCheck srikappa-amzn 2021-05-14 16:33:13 -07:00
  • 61c24ee265 Removing tab in cmake file karlberg 2021-05-14 15:22:57 -07:00
  • 46c0c35c26 Merge pull request #734 from aws-lumberyard-dev/nvsickle/DebugInfoDisplay Nicholas Van Sickle 2021-05-14 15:20:05 -07:00
  • bb3142278e Fixes an example comment error in multiplayer component jinjas karlberg 2021-05-14 15:03:11 -07:00
  • 70c968f829 Fixes issue with relative positioning of children on Prefab creation. Makes CreateLink more generic to facilitate reuse. daimini 2021-05-14 15:02:39 -07:00
  • 9b9ae22d23 Update Prism Python bindings interface Alex Peterson 2021-05-14 14:53:32 -07:00
  • 9ecbbe471b Remove lots of unused things from CrySystem (#765) bosnichd 2021-05-14 15:38:59 -06:00
  • 3a87229e88 Merging latest origin karlberg 2021-05-14 14:25:45 -07:00
  • 5acdc40595 Many fixes for external gem multiplayer components and component network inputs, fixes an uninitialized variable resulting in continual desyncs, restructures our public includes to match the directory structure of source, allows autogen artefacts to be included by external gems, allowing for external multiplayer components to interact with multiplayer gem components with no extra code karlberg 2021-05-14 14:24:33 -07:00
  • 2a6938bdf5 Remove hardcoded paths to Atom gems in registration.py and clean up gem.json files SJ 2021-05-14 13:54:17 -07:00
  • 1c575763c7 ATOM-4661 Improvement with pass templates registration from data (#735) Vicky 2021-05-14 13:45:26 -07:00
  • f3c1878a8b fix bug with not clearing shape collider config when shape component is removed greerdv 2021-05-14 21:07:22 +01:00
  • d878932966 merge from main greerdv 2021-05-14 21:04:06 +01:00
  • 1426052a5f Address a bit more review feedback nvsickle 2021-05-14 13:01:46 -07:00
  • a8b29bf603 Remove memory info from the overlay for now (depended on the now-dead CryMemoryManager) nvsickle 2021-05-14 12:38:46 -07:00
  • 810c63b80e Streamline AtomLyIntegration/AtomViewportDisplayInfo/gem.json nvsickle 2021-05-14 12:38:01 -07:00
  • f7a9b28000 Make AtomFont's API use copy semantics for string_view nvsickle 2021-05-14 12:37:35 -07:00
  • 58759bddf7 Tidy up Script/ScriptTimePoint nvsickle 2021-05-14 12:36:40 -07:00
  • 8690ce5736 Added a displacement blend factor for a smooth transition between depth-blended layers. Renamed StandardMultilayerPBR_Parallax.lua to StandardMultilayerPBR_Displacement.lua because it is used for more than just strictly parallax, it generally deals with displcament which can be used for blending even when parallax is disabled. Chris Santora 2021-05-14 12:17:15 -07:00
  • 9c071c46ac Merge branch 'main' into DxcExperiment moudgils 2021-05-14 12:13:53 -07:00
  • f6b1fac139 [cpack_installer] initial bootstrap installer generation, this bootstrapper is what downloads the artifacts scottr 2021-05-14 12:03:20 -07:00
  • 1a456cc9b9 Marked an our parameter correctly and changed a ref to const ref srikappa 2021-05-14 11:48:31 -07:00
  • f2d415ecb8 add functionality for central scale manipulator greerdv 2021-05-14 19:38:25 +01:00
  • f759f471bf Remove unused code amzn-sj 2021-05-14 11:15:52 -07:00
  • 883786796d [NvCloth] Replace legacy IsDedicated() call with new AZ_CVAR sv_isDedicated Aaron Ruiz Mora 2021-05-14 19:10:58 +01:00
  • 8b8a582f02 External Project Build Path Support using SDK Binaries (#690) lumberyard-employee-dm 2021-05-14 13:01:11 -05:00
  • 05fec17ebd Remove hardcoded paths to Atom gems in registration.py and clean up gem.json files amzn-sj 2021-05-14 10:35:50 -07:00
  • cc986f563a Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay nvsickle 2021-05-14 10:27:33 -07:00
  • 711db7e0f7 Merge pull request #754 from aws-lumberyard-dev/ap_race Sean Sweeney 2021-05-14 10:19:17 -07:00
  • f6767cec2f Merge pull request #751 from aws-lumberyard-dev/Prefab/DeletePrefab srikappa-amzn 2021-05-14 09:52:58 -07:00
  • 058688c182 Merge pull request #723 from aws-lumberyard-dev/Atom/moudgils/FixTextureArray moudgils 2021-05-14 09:23:10 -07:00
  • 77278a0329 First version of the slice-to-prefab converter Mike Balfour 2021-05-14 11:18:15 -05:00
  • 5cc0cc9ee7 Fixed the loading of uicanvas assets due to the NetBindable class being (#755) lumberyard-employee-dm 2021-05-14 11:03:31 -05:00
  • 6d7f7547ec [cpack_installer] fix incorrect caching type of installer download url and add configure of download info scottr 2021-05-14 08:20:59 -07:00
  • a9d986c10f Red code legacy MemoryManager, StreamEngine, ResourceManager, ImageHandler, AsyncPakManager, and more (#758) bosnichd 2021-05-14 08:53:56 -06:00
  • c8568a7cf2 add feedback from PR greerdv 2021-05-14 13:51:02 +01:00
  • 068deea918 remove unnecessary overrides greerdv 2021-05-14 13:31:25 +01:00
  • e9386bcb9b remove unecessary overrides greerdv 2021-05-14 13:29:54 +01:00
  • d5591e52ff Merge branch 'main' into LYN-1767-AB igarri 2021-05-14 13:12:29 +01:00
  • cff9fea535 Switching views with filters igarri 2021-05-14 13:09:14 +01:00
  • 737178b928 Merge branch 'main' into non-uniform-scale-manipulators greerdv 2021-05-14 12:08:10 +01:00
  • 5508bf7e1d remove unnecessary non-uniform scale manipulator bus greerdv 2021-05-14 12:06:44 +01:00
  • d365d00abd hook up non-uniform scale manipulator callbacks greerdv 2021-05-14 11:52:29 +01:00
  • 14b2b7dfdb "Fixing review comments" darapan 2021-05-14 03:36:21 -07:00
  • b56667bb64 Added new blend source options that allow a blend mask to be used together with depth based blending. Chris Santora 2021-05-14 00:02:15 -07:00
  • 46024f293d Merge branch 'main' into SPEC6476_ReflectNetworkProperties Gene Walters 2021-05-13 22:04:21 -07:00
  • 7cd4bbee15 Jinja fix white space a bit, still dont fully understand this, but it looks a little better Gene Walters 2021-05-13 21:52:37 -07:00
  • c07c7d822e Adding warning feedback from mnaumov mriegger 2021-05-13 21:16:32 -07:00
  • ecef0e88f3 Fixing clone function mriegger 2021-05-13 21:04:15 -07:00
  • 3371483315 Merge branch 'main' into Atom/dmcdiar/ATOM-13575 dmcdiar 2021-05-13 19:20:53 -07:00
  • 169d9e3d57 Added support for EAC_R11 and EACRG11 moudgils 2021-05-13 19:18:03 -07:00
  • c5982c0115 Changed the RayTracingShaderTable build to be queued with the RHISystem and processed during FrameScheduler::Compile, after the Srgs are compiled. Removed the RayTracingShaderTable scopes and moved the calls to Build to the ray tracing dispatch scopes. dmcdiar 2021-05-13 19:03:38 -07:00
  • b72836fa8f Fixed a typo srikappa 2021-05-13 18:03:49 -07:00
  • ba4439c397 Remove call to deleted init function amzn-mike 2021-05-13 19:52:00 -05:00
  • d8865a8f0d Remove links when deleting prefabs srikappa 2021-05-13 17:41:45 -07:00
  • d0daab4fe0 Merge pull request #710 from aws-lumberyard-dev/Atom/mnaumov/LYN-3529 AMZN-mnaumov 2021-05-13 17:15:03 -07:00
  • 99c2c3b07b Updates the settings registry visitor that walks through 'engines' from the manifest phistere 2021-05-13 19:04:20 -05:00
  • b7891f4fb6 Code cleanup amzn-mike 2021-05-13 18:43:51 -05:00
  • 7d91a4c08e {LYN-3787} Fix for infinite loop in the scene builder's import phase (#747) jackalbe 2021-05-13 17:50:02 -05:00
  • 74ea093f71 More comment cleanup puvvadar 2021-05-13 15:43:07 -07:00
  • 467caa6175 Some whitespace and comment cleanup puvvadar 2021-05-13 15:42:21 -07:00
  • a852da93a3 Merge branch 'main' into MultiplayerPipeline pereslav 2021-05-13 23:40:43 +01:00
  • 81067e38c9 Remove stp amzn-mike 2021-05-13 17:39:27 -05:00
  • c2dc3dad32 Merge pull request #629 from aws-lumberyard-dev/ATOM/tonypeng/ATOM-15266-2 AMZN-tpeng 2021-05-13 15:38:38 -07:00
  • 8a39f9f1b4 Streamline MP Ctrl+G logic via MultiplayerEditorConnection puvvadar 2021-05-13 15:31:37 -07:00
  • ab81bd0e7e Merge pull request #726 from aws-lumberyard-dev/Atom/guthadam/ATOM-15223 Guthrie Adams 2021-05-13 17:21:07 -05:00
  • 1684c338b2 More minor cleanup in MaterialFunctor.cpp Chris Santora 2021-05-13 15:16:37 -07:00
  • 9dafc54fc0 Got things working again after merging my depth-based-blend changes together with the new layering model. Chris Santora 2021-05-13 14:57:16 -07:00
  • 7d230dc80e adding a license.txt file for a modified asset with a CC license gallowj 2021-04-29 17:50:38 -05:00
  • 22f8817802 replacing 1.0 mat ed model changes, filename change gallowj 2021-05-13 16:52:59 -05:00
  • 16b2dabde2 Removed additional spacing srikappa 2021-05-13 14:51:27 -07:00
  • 9328c944b2 Remove an unnecessary check in the if statement srikappa 2021-05-13 14:49:06 -07:00
  • 6b8b953c63 Replaced Lucy with new geometry gallowj 2021-04-29 20:51:42 -05:00
  • 7d8180a3bb Fixed a typo srikappa 2021-05-13 14:46:30 -07:00
  • b92a68f5a4 Improved a comment srikappa 2021-05-13 14:45:06 -07:00
  • 9141221843 Reduce AP race conditions and fix minor bugs sweeneys 2021-05-13 14:43:30 -07:00
  • 183790bf79 materials need properties updated to match changes with standardpbr materialType gallowj 2021-05-13 16:41:32 -05:00
  • 49084d250f updating material files gallowj 2021-05-13 16:40:51 -05:00
  • cd4be3a708 Found a better way to find common owning instance srikappa 2021-05-13 14:37:22 -07:00
  • 42d47ca5fc New geometry and texture replacement for the Standford Lucy assets. gallowj 2021-04-30 14:07:48 -05:00
  • 76e8a0ef47 Fixed bug with delete prefab where the prefabs were not being deleted from the correct instances srikappa 2021-05-13 14:11:47 -07:00
  • 0ae123eae6 Fix AssetContainer behavior with immediate load errors Mike Balfour 2021-05-13 16:08:47 -05:00
  • 46bdb45d4a Merge branch 'Atom/moudgils/FixTextureArray' of https://github.com/aws-lumberyard-dev/o3de into Atom/moudgils/FixTextureArray moudgils 2021-05-13 14:05:23 -07:00
  • da8f5849aa Merge branch 'main' into Atom/moudgils/FixTextureArray moudgils 2021-05-13 14:03:54 -07:00
  • 3a5ca1503a Renamed some variables moudgils 2021-05-13 14:00:44 -07:00
  • 06682d66c1 update LFS rules with changes from 1.0 gallowj 2021-04-30 15:19:30 -05:00
  • 41ea7a1b81 add stubs for non-uniform scale component mode greerdv 2021-05-13 20:52:29 +01:00
  • 828ce72123 Merge branch 'Atom/santorac/MultilayerPbrImprovements' into Atom/santorac/DepthBasedLayerBlending Chris Santora 2021-05-13 12:12:51 -07:00
  • 7866178f3e Fix AssetContainer behavior with immediate load errors mbalfour 2021-05-13 14:10:45 -05:00
  • a34a240cf6 MultiplierTypes serialized so they are available in the ScriptCanvas variable window Gene Walters 2021-05-13 11:53:17 -07:00
  • 7ecd1b1761 Rearchitecture Project Manager Screens Workflow and Create Project Settings Ctrl AMZN-nggieber 2021-05-13 10:47:49 -07:00
  • 67a1e4dc4f Merge pull request #711 from aws-lumberyard-dev/michabr/lyshine_viewport_fixes michabr 2021-05-13 10:25:44 -07:00
  • 9cde3d60e9 Merge pull request #712 from aws-lumberyard-dev/michabr/lyshine_merge michabr 2021-05-13 10:21:01 -07:00
  • 3d84902b24 Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used). (#741) bosnichd 2021-05-13 11:10:44 -06:00
  • ef5f77771c Merge branch 'main' into cpack_installer scottr 2021-05-13 09:40:58 -07:00
  • 70c8ef99ef Updates in response to code review, from gadams3. Cleaned up code around MaterialFunctor's QueryMaterialPropertyMetadata and QueryMaterialPropertyGroupMetadata. Removed unnecessary "groupHeader->setObjectName(...)" Simplified code in MaterialInspector::OnDocumentPropertyGroupVisibilityChanged. Chris Santora 2021-05-13 09:39:01 -07:00