Commit Graph

  • 799290aefc Created custom JSON serializer for editor material component The editor component contains an editor specific, dynamically generated version of the material slots to display all the possible options, organize properties for the user interface, and add custom actions. The critical data is already stored inside of the component controller configuration, which only stores a map of modified or overridden values. This change disables serialization of the redundant data for prefabs. Guthrie Adams 2021-10-30 17:36:07 -05:00
  • 8c0dbe4b33 missed escaping these variables and breaks runtime dependencines in the install layout (#5149) Esteban Papp 2021-10-30 12:39:40 -07:00
  • 1ec34f6123 Fix typo when calling upload_to_s3.py (#5139) Shirang Jia 2021-10-29 21:11:53 -07:00
  • 2d7c6af97c Merge branch 'development' into profiler_capture_api AMZN-ScottR 2021-10-29 17:21:29 -07:00
  • 4721f44b92 [profiler_capture_api] more changes based on PR feedback AMZN-ScottR 2021-10-29 17:19:38 -07:00
  • 6c130c7a86 Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux chcurran 2021-10-29 16:25:37 -07:00
  • ad6dc8a3bd initial compile of detailed path of change to regular sc files chcurran 2021-10-29 16:23:20 -07:00
  • ea4bc31b38 Merge pull request #4675 from aws-lumberyard-dev/editor_test_tools_cleanup Sean Sweeney 2021-10-29 15:47:26 -07:00
  • 22820b6a90 Update snapshots list to stablization/2110 Mike Chang 2021-10-29 15:13:20 -07:00
  • b2e6711196 [profiler_capture_api] fixed clang compile error AMZN-ScottR 2021-10-29 14:45:25 -07:00
  • e871dff70e Added two complex prefab tests (#5089) AMZN-AlexOteiza 2021-10-29 22:32:33 +01:00
  • de4658b16c Corrects mistake naming the override commands (#5140) Esteban Papp 2021-10-29 14:25:13 -07:00
  • 2f38873e03 Adding logs for successful steps occurring in the editor-server process. AutomatedTesting will expect these logs and can be helpful to narrow down any test fails Gene Walters 2021-10-29 13:55:32 -07:00
  • 0807cb7f3e Added "RemovePassTemplate" method. (#5039) galibzon 2021-10-29 15:41:17 -05:00
  • 858e287b1f Removed unused set filter function nggieber 2021-10-29 13:37:58 -07:00
  • 08255d2eda Clicking tag now select gem and scrolls to it, it also resets filters if gem is filtered out, also gem filter creation was refactored nggieber 2021-10-29 13:20:11 -07:00
  • 781eaabd94 Access gem repos from catalog non-destructively Alex Peterson 2021-10-29 12:05:42 -07:00
  • 07353ed4ad Merge pull request #5137 from aws-lumberyard-dev/Prism/integrate-crash-fix Alex Peterson 2021-10-29 12:03:34 -07:00
  • 971e24285f Fixes debug console's "quit" issues (#4975) ffarahmand-DPS 2021-10-29 11:28:42 -07:00
  • 4ccbb964f3 Add missing dependencies to pass builder (#4884) (#5099) Tommy Walton 2021-10-29 10:53:31 -07:00
  • 72d6f2972e Adding support for multi-config/multi-permutation installer Esteban Papp 2021-10-29 10:46:28 -07:00
  • 8aecd6668a Merge pull request #5113 from aws-lumberyard-dev/Prism/ReposExceptionFix AMZN-Phil 2021-10-29 10:40:46 -07:00
  • 65d23c7ed6 Merge pull request #5086 from aws-lumberyard-dev/Prism/RefreshRepoButtonDisablesRepo Alex Peterson 2021-10-29 10:38:11 -07:00
  • 7b5a5b8f74 Merge pull request #5106 from aws-lumberyard-dev/Atom/scottm/cleanup_import jromnoa 2021-10-29 10:35:40 -07:00
  • ca9093c202 Add engine name, folder and fix refresh crash (#5112) Alex Peterson 2021-10-29 09:20:52 -07:00
  • 5db6ffb6f3 Disable custom titlebar on Mac, Linux, fix resize (#4973) (#5114) Alex Peterson 2021-10-29 09:21:20 -07:00
  • b4dd4c8f02 Add engine name, folder and fix refresh crash (#5112) Alex Peterson 2021-10-29 09:20:52 -07:00
  • 5fe2207892 Merge pull request #5095 from aws-lumberyard-dev/Atom/barlev/Stabilization_MaterialMetalicBugFix Adi Bar-Lev 2021-10-29 11:12:14 -04:00
  • 66612cac28 Merge pull request #5116 from aws-lumberyard-dev/barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-29 10:00:14 -04:00
  • f40191dd8c bugfix: resolve broken focus for viewport (#5059) Michael Pollind 2021-10-29 02:15:22 -07:00
  • a322d9e2b8 Small Code/Editor cleanup pass (#4909) Artur K 2021-10-29 10:59:18 +02:00
  • 021917ad27 Fix bug 4198 (#5107) John Jones-Steele 2021-10-29 09:42:40 +01:00
  • 37381489ee EMotion FX: Actor component: Skeleton rendering is not working (#5084) Benjamin Jillich 2021-10-29 09:12:27 +02:00
  • 4e2de0170c reverting typehints evanchia 2021-10-28 19:33:59 -07:00
  • 475338cfad Merge branch 'development' into o3de_sdk/installer_configs Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Esteban Papp 2021-10-28 18:29:52 -07:00
  • 459f636fff Fixed the chicken mohawk material to address depth sorting issues. Before the material used a workaround to expose the otherwise hidden double-sided flag, made the object get rendered in the transparent pass. I updated the material to be opaque, not that the double-sided flag is available outside the opacity property group. santorac 2021-10-28 18:29:15 -07:00
  • 60e14d3a4c Fixes PR comments Esteban Papp 2021-10-28 18:17:26 -07:00
  • 4dcd60ba08 testing changes to fix Jenkins Esteban Papp 2021-10-28 17:49:31 -07:00
  • ecf70daca8 does this space affects? Esteban Papp 2021-10-28 17:44:16 -07:00
  • 2a32d67830 Merge commit '6cce184340dbce9796234a67a0452d1088474945' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 20:06:53 -04:00
  • 954ec82859 Merge commit '86270339d8967de8c983cd4ab96982f347652d0f' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 20:06:47 -04:00
  • 1488522236 Merge commit '00a49fa251121eeb13d28a5ff3cc466392ed3ad9' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 20:06:42 -04:00
  • f25b80e172 Merge commit 'f350ba3042b216369748935800628118b835ca81' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 20:06:36 -04:00
  • cd3891fe23 Merge commit '689f5b2a4ac376634439708637346e5a3157f085' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 20:06:31 -04:00
  • 8dca689444 Merge commit 'caf247fcab0fc65773c6a95f1bbcfe10b184c5e0' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 20:06:25 -04:00
  • d64b9d4945 Merge commit '8d7eb4767afff80992bebe4619afc10aef04a93b' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 19:52:42 -04:00
  • d355942e8b Fix an additional location AMZN-Phil 2021-10-28 16:36:54 -07:00
  • 8119fe4d86 Merge commit '8d7eb4767afff80992bebe4619afc10aef04a93b' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 19:17:33 -04:00
  • 5971f1176e Fix thrown exceptions if repos does not exist in the manifest AMZN-Phil 2021-10-28 16:17:28 -07:00
  • 0ee7ab9df5 Merge commit '837831a91990861220d982ca21a302197178092a' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 19:17:28 -04:00
  • 759b75a477 Merge commit 'caab78d9300762b283cf60856753fd090367e193' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 19:17:21 -04:00
  • c26ce47805 Merge commit '59c898fc4853f898fc01ff6145a71bebad3caac6' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 19:17:15 -04:00
  • ca9c7da168 Merge commit 'd23df465dd34d961bdbc5a73b7989abdb301ea47' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 19:17:10 -04:00
  • fcd5e1e5fa Merge commit '35467b63d9964f8c308c7a4c07b9373181c48b6c' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 19:17:04 -04:00
  • 8184c526f7 Merge commit '9e0756f3c11ae5218246fec732e1ceb4da14caeb' into barlev/gitflow_211028_O3DE Adi Bar-Lev 2021-10-28 19:16:57 -04:00
  • 9dac727092 Add component activation in LUT activation script. (#5101) hershey5045 2021-10-28 15:21:47 -07:00
  • b2a8e40569 Merge pull request #5100 from aws-lumberyard-dev/cgalvan/GemplateImprovements Chris Galvan 2021-10-28 17:20:07 -05:00
  • 899bda4631 Add additional logging for Fingerprint test. (#5104) amzn-mike 2021-10-28 17:17:18 -05:00
  • 7d1b20d480 Merge pull request #5057 from aws-lumberyard-dev/Atom/guthadam/material_instance_editor_indicator_changes Guthrie Adams 2021-10-28 17:06:13 -05:00
  • 9bc0422f0b [profiler_capture_api] added trailing newlines to a couple new files AMZN-ScottR 2021-10-28 14:39:17 -07:00
  • 29f5fb1271 {lyn7352} adding more logging around mock_asset_builder.py (#5103) Allen Jackson 2021-10-28 16:38:27 -05:00
  • 6cce184340 Enforce unique gem names in catalog (#5063) Alex Peterson 2021-10-28 14:33:24 -07:00
  • e67db19a63 [profiler_capture_api] add sample python script to test Profiler System interface bindings AMZN-ScottR 2021-10-28 14:26:22 -07:00
  • 90509c7fa2 [profiler_capture_api] removed now unnecessary ProfilerRequests EBus alias after AZ::Interface conversion AMZN-ScottR 2021-10-28 14:18:04 -07:00
  • 86270339d8 Added terrain surface data notifications (#5067) Mike Balfour 2021-10-28 16:17:38 -05:00
  • 6587e149b7 Added unit tests for spawnable entity aliases. AMZN-koppersr 2021-10-28 09:57:33 -07:00
  • 7536073df0 remove and unused import Scott Murray 2021-10-28 13:36:48 -07:00
  • b8ced0d461 Fix AP log path on S3 (#5068) Shirang Jia 2021-10-28 13:31:33 -07:00
  • 00a49fa251 Use source model data instead of filtered (#5071) Alex Peterson 2021-10-28 12:53:54 -07:00
  • f350ba3042 Modify the AssetBundler to correctly identify the Gems that are enabled in the current active project (#5072) Tommy Walton 2021-10-28 12:49:33 -07:00
  • 689f5b2a4a Merge pull request #5076 from aws-lumberyard-dev/Atom/guthadam/material_component_supports_scripting_enums Guthrie Adams 2021-10-28 14:41:56 -05:00
  • caf247fcab Merge pull request #5070 from aws-lumberyard-dev/Atom/guthadam/material_component_clear_default_material_fixes Guthrie Adams 2021-10-28 14:40:52 -05:00
  • b6d634c3ed Print all captured messages in Assert Absorber used by FingerprintTest to help debug crash (#5096) amzn-mike 2021-10-28 14:37:51 -05:00
  • e56396a817 Improvements to C++/Python tool gemplates Chris Galvan 2021-10-28 14:30:14 -05:00
  • eb713fb3a8 Merge branch 'development' into profiler_capture_api AMZN-ScottR 2021-10-28 12:19:50 -07:00
  • ecae08fa95 Made some improvements for debugging shader hot reload issues. Made ShaderReloadDebugTracker store its static data in Environment system variables, so they are shared across dlls. This fixes issues with inconsistent indenting when debug operations are performed in different libraries. New ShaderReloadDebugTracker operations in FullscreenTrianglePass. Added a ShaderReloadDebugTracker message to Shader::GetVariant that includes asset built timestamp infromation, which I think will be really helpful in sorting out reload issues. Renamed some functions and variables to remove a redundant "ShaderAsset" term. santorac 2021-10-28 12:05:56 -07:00
  • e5729fbefe Fix clearing material component default material not clearing materials or updating preview • Changed thumbnail property control to track asset key even if image is overridden so that it will be restored if the image is cleared. • Changed property asset control to disable the thumbnail image by default whenever the attribute is applied. It will only enable the thumbnail image if the pixmap is valid. • Changed the material component controller to always use an empty material assignment map on deactivation so that no persistent materials are reapplied. • Changed the material component controller to immediately send a notification that materials have updated if no materials were queued for load but the configuration contained pre created or persistent material instances. This mainly affects the material editor because it manages its own material instances. Guthrie Adams 2021-10-27 17:32:43 -05:00
  • fc94ede439 [profiler_capture_api] fixed runtime issues with BehaviorInterfaceProxy reflection AMZN-ScottR 2021-10-28 11:55:49 -07:00
  • 5de24437ab fixed comment Guthrie Adams 2021-10-28 13:51:48 -05:00
  • 1f4967b168 extending conversions from script to other numeric types Guthrie Adams 2021-10-28 11:30:58 -05:00
  • b71e307de5 Fix issue setting enum values on material component from script Replaced get and set functions with explicit types with templates Added special case handling for setting enum values as strings or numbers from script Guthrie Adams 2021-10-28 00:15:11 -05:00
  • b9147c60a0 Added the generated cmake_dependencies.*.setreg files to engine.pak (#5073) lumberyard-employee-dm 2021-10-28 13:45:19 -05:00
  • e288ae47b4 Fix for using too large values on Terrain World (#5091) John Jones-Steele 2021-10-28 19:36:39 +01:00
  • 1b9f6c385d Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux chcurran 2021-10-28 10:51:40 -07:00
  • bd6153f471 Material - enbale/disable metallic scale according to texture selection Adi Bar-Lev 2021-10-28 13:24:49 -04:00
  • 67f90a9b37 Add missing dependencies to pass builder (#4884) Tommy Walton 2021-10-28 10:22:20 -07:00
  • 66df146554 Fixed existing spawnable unit tests to work with entity alias changes. AMZN-koppersr 2021-10-26 13:33:02 -07:00
  • 15ea380d39 Post integration fixes and additional changes for entity aliases in spawnables. AMZN-koppersr 2021-10-26 10:43:27 -07:00
  • b3cd339904 Added support for setting up entity aliases during the prefab to spawnable conversion. AMZN-koppersr 2021-10-25 14:55:04 -07:00
  • a05d5f5d6d Extended the Spawnable Entities Interface to allow entity aliases to be updated. AMZN-koppersr 2021-10-25 14:35:49 -07:00
  • a0d7048fd4 Added support for entity aliases to Spawnable. AMZN-koppersr 2021-10-25 14:07:14 -07:00
  • 48f2487d3c Updates in preparation for adding entity aliases to spawnables. AMZN-koppersr 2021-10-25 13:43:00 -07:00
  • 6d673643be Re-merging latest dev after rebasing to fix DCO. Re-resolving conflicts Gene Walters 2021-10-28 09:56:01 -07:00
  • b324b3a1a9 Minor code comment grammar change Gene Walters 2021-10-27 16:28:51 -07:00
  • 013beafe7e Minor code warning grammar fix Gene Walters 2021-10-27 16:23:24 -07:00
  • 131c415404 small fix: adding newline back to end of a merged file Gene Walters 2021-10-27 16:07:53 -07:00
  • a803cdcbb3 Fix build error rhhong 2021-10-27 10:18:24 -07:00
  • bf958686c9 Calculate camera view projection each frame so we can have a fixed size viewport. rhhong 2021-10-26 14:58:34 -07:00
  • 3dea8fc03d Add Generic DOM visitor interface (#4852) Nicholas Van Sickle 2021-10-27 08:46:31 -07:00
  • e9cf7cb624 Detail material Id texture created from surface weights. (#4984) Ken Pruiksma 2021-10-27 10:12:13 -05:00