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

Commit Graph

  • b522d15bb7 Merge commit '7da0913900b6c93a0dfaa77f6880316ac70e7852' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:55:10 -08:00
  • c4810c0ee0 Merge commit 'a5adf33427e3b2163c2f21c75148598b3364d8d4' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:55:06 -08:00
  • 7875600fb0 Merge commit '7031147e324602fb20fcfe2070a942bf9eb4594a' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:55:02 -08:00
  • 2f30c50dc0 Merge commit 'e1fb2ad368ca933fe6e299df5aeeb328e301c8be' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:54:58 -08:00
  • e9c450228c Merge commit '8b7e538dd32f1eb3a96bedd225dfd6fc861f1ed3' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:54:54 -08:00
  • 8fe4e7f08f Merge commit '82c83b2c5a47514956576cd336888f4354ace6a6' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:54:50 -08:00
  • 564bf0c819 Merge commit 'fc547d902c2e110b671a095b9731aff18154e68d' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:54:46 -08:00
  • c82f8e43f4 Merge commit 'bc82afa87ac5da739d2b7938242cbdbe4b55dd31' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:54:42 -08:00
  • d614ff17d6 Merge commit '3d84876e87a3c28a420d74c19606d1fbe5c703d3' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:54:38 -08:00
  • fa7d7e2ec3 Merge commit 'b3e2c3f075db1f28277c0a35987318449b4eeeb9' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:54:34 -08:00
  • 320ef4cd05 Merge commit '5c0fe6a54f14d1770334679e0457702a37a946c2' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:54:30 -08:00
  • dc1aa6ee39 Merge commit '533b80095b48857e02f4bfeba5a0ecfd1ad85b16' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:54:25 -08:00
  • 8887b55fc8 Merge commit 'c44d03a40df0899851c6cbd929a673fac48ce82b' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 12:53:42 -08:00
  • 1aae84537d Makes project settings screen scrollable nggieber 2021-11-16 12:37:20 -08:00
  • 5cf65012b1 Updated RPI.Edit's AssetUtils to use the same TraceLevel enum as RPI.Reflect's AssetUtils. This is now used in GetImageAssetReference to remove a redundant error message since the error is also reported in MaterialSourceData and MaterialTypeSourceData. santorac 2021-11-16 12:31:33 -08:00
  • 4854023eb1 Merge pull request #5592 from aws-lumberyard-dev/Prism/ShowProjectBuildReq AMZN-Phil 2021-11-16 12:22:20 -08:00
  • 59b12a6ec7 Add cvar for aws log level (#5507) Vincent Liu 2021-11-16 12:14:05 -08:00
  • 5ed6d2f2f5 Updated more math related names lsemp3d 2021-11-16 12:00:46 -08:00
  • fc2b5192b8 Merge commit 'f2068397fa4542bd034e9d34002cca4b976c31b1' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:49:30 -08:00
  • ade8183473 Merge commit '76b7e73f6f1b34a2499e3d192a7683dc91ce70e2' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:49:26 -08:00
  • 14e4fd40d4 Merge commit '5ec582484978e61429ccd7a962405c3e9f1ba819' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:49:22 -08:00
  • 2d34700dc2 Merge commit '4d3c977d5832d9d1d04ea419d3e54314f4412b2e' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:49:18 -08:00
  • 284a44d74c Updated AssetUtils::ResolvePathReference to avoid "The second join parameter is an absolute path" warnings from StringFunc::Path::Join. santorac 2021-11-16 11:45:26 -08:00
  • 0dcf49affc Merge commit 'b0dfe26232b318e520887af65cd579ec87016636' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:45:09 -08:00
  • e44fa2a52a Merge commit '520c2b52d48f5e1c95e4a0ea2ec864088c70d0b9' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:42:19 -08:00
  • 21d5e62f85 Merge commit 'cb1a45f9ec01ebaede35da2924bde66f31c31ea2' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:42:15 -08:00
  • d9eb4fa688 Merge commit 'c0df1846f4f34e7a8adb5191fbda213ff68a5a24' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:42:11 -08:00
  • 4e8f18aad4 Merge commit 'b44ce82435b7f737bca73bcf25e553d6c7b23f27' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:42:07 -08:00
  • 1f64ff039b Merge commit 'bceadf7597a4af57d37a18c4cb2f81b5e840dbb6' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:42:03 -08:00
  • fc61bce3af Merge commit 'a544800536a5bebda96812951befa4d43b0474d3' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:41:59 -08:00
  • 81a2f565c9 Merge commit '2fa3c134e04c89b61b1e47bf0b44bdc74b840866' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:41:55 -08:00
  • 841c55c831 Merge commit 'b8f7767cd6ca0201cd5ae0a44c37b75d42f22299' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:41:51 -08:00
  • 5232fe9166 Merge commit 'e4ca568433e3de3bc002176ab2fd6bf380a03c18' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:41:47 -08:00
  • 72f2d2701f Merge commit '6ffee4b0a8292b5ad6bb9a35b49655c62b2b5b3b' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:41:43 -08:00
  • 4ab3bd487f Merge commit 'e0d736dd844a82b0c232739540a168078e63e276' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:41:39 -08:00
  • 6080801c55 Merge commit '0b211d3743f612177cf529de9dbd30e5ae5216b2' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:41:35 -08:00
  • 30325a34fe Merge commit 'e3c3db4ba61b230a69b670e02873c0f4b7766504' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:41:31 -08:00
  • 783bb72944 Merge commit 'f1d9e7ae28bf0667487c939aa32b1ef833da80f4' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:41:26 -08:00
  • 65c3ad6545 Merge commit 'cbe2948ba87397fca12af8061fa90f74206ee426' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:41:22 -08:00
  • 830c10b8b0 Merge commit '08848ac7817a704135014f222f156003c4a16832' into amzn-tommy/gitflow_211116_o3de2 Tommy Walton 2021-11-16 11:41:18 -08:00
  • 265f624612 Detects runtime dependency cycles (#5634) Esteban Papp 2021-11-16 11:31:41 -08:00
  • 31025f2232 Merge branch 'development' of https://github.com/aws-lumberyard/o3de into Neil_o3de_automation_HDRi_Skybox nwidmaie 2021-11-16 11:12:17 -08:00
  • dd1d515e37 Atom/mriegger/normaloffsetbiasarealight (#4917) mrieggeramzn 2021-11-16 11:08:25 -08:00
  • 7a279019b7 Improved generation for node generics, updated text for many math nodes lsemp3d 2021-11-16 11:07:36 -08:00
  • ebc92c5b08 Restored a bit of error checking that appears to have been removed by mistake, in MaterialPropertyUtil ConvertToExportFormat(). This is important for the missing texture use cases, because this error checking is what will prevent the Material Editor from silently replacing a broken texture reference with no texture reference. santorac 2021-11-16 10:52:03 -08:00
  • 655f082908 Merge pull request #5653 from aws-lumberyard-dev/cgalvan/UpdateDevSplashScreenName Chris Galvan 2021-11-16 12:49:06 -06:00
  • 9f7815fa04 Fixed up a couple incorrectly or incompletely resolved merge conflicts. santorac 2021-11-16 10:35:49 -08:00
  • d468cbad85 AWS Core CDK: Add option to cleanup resources that are retained by default (#5470) (#5618) Junbo Liang 2021-11-16 10:33:57 -08:00
  • c73417a9c1 {lyn7352} adding more logging to mock asset builder test (#5591) Allen Jackson 2021-11-16 12:21:33 -06:00
  • cb5c4256c7 Fix license text eliding nggieber 2021-11-16 10:18:37 -08:00
  • db3d41ad9d Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures santorac 2021-11-16 10:06:28 -08:00
  • 34921d680a Merge pull request #5656 from aws-lumberyard-dev/stab/Atom-16694 antonmic 2021-11-16 10:03:27 -08:00
  • 4d6e7f7ef9 Address PR comments. John 2021-11-16 17:59:18 +00:00
  • a1c67a5203 Fix prefab enabled automated tests (#5626) chiyenteng 2021-11-16 09:56:24 -08:00
  • 921612594a Add placeholder icon for back button. John 2021-11-16 17:54:19 +00:00
  • 6067575624 Merge pull request #5603 from aws-lumberyard-dev/jckand/SliceDeprecationAutomationUtils Nicholas Van Sickle 2021-11-16 09:45:02 -08:00
  • 9cf49845a4 Merge pull request #5621 from aws-lumberyard-dev/scripting/expand_context_menu Luis Sempé 2021-11-16 09:19:41 -08:00
  • 63f98e7dd9 isolate the loading problem during version explorer chcurran 2021-11-16 09:12:36 -08:00
  • 3428bcb5da Updated splash screen and about dialog with development name Chris Galvan 2021-11-16 10:07:45 -06:00
  • c3dacb1e52 Unlocked a mutex after modifying the associated variable (#5625) AMZN-stankowi 2021-11-16 08:07:20 -08:00
  • 83df483813 Updated splash screen and about dialog with Stable 21.11 name Chris Galvan 2021-11-16 08:08:53 -06:00
  • 6cc98f1802 upgraded capture_displaymapper util and some cleanup Jonny Gallowy 2021-11-16 10:04:03 -06:00
  • 1546247922 Trivial refactor of comments. John 2021-11-16 16:02:22 +00:00
  • 5594a61ece apply feedback from PR greerdv 2021-11-16 15:56:56 +00:00
  • f369fcb3d1 Merge remote-tracking branch 'origin/stabilization/2110' into viewport/EditorModeUIBackButton John 2021-11-16 15:56:53 +00:00
  • 6b201bf97c Add back button to editor mode UI. John 2021-11-16 15:55:22 +00:00
  • 5e04ddcc02 Merge pull request #5647 from aws-lumberyard-dev/cgalvan/UpdateSplashScreenName Chris Galvan 2021-11-16 09:34:22 -06:00
  • b20a9b5f39 Some modifications required for restricted platforms: (#5624) bosnichd 2021-11-16 08:27:32 -07:00
  • ce10906671 Updated splash screen and about dialog with Stable 21.11 name Chris Galvan 2021-11-16 08:08:53 -06:00
  • ced217a96b merge from stabilization/2110 greerdv 2021-11-16 12:51:29 +00:00
  • 23d752e07d add option to clamp ragdoll joint masses to avoid bad mass ratios greerdv 2021-11-16 12:50:11 +00:00
  • 84ba4afc54 EMotion FX: Deleting a corresponding anim graph when a Reference node is open crashes the Editor (#5612) Benjamin Jillich 2021-11-16 12:45:02 +01:00
  • 7da0913900 Fixed empty cluster UI appearing in joints component mode. (#5547) amzn-sean 2021-11-16 10:57:32 +00:00
  • a5adf33427 Deactivate new Asset Picker View by default in the Editor (#5614) AMZN-Igarri 2021-11-16 11:47:02 +01:00
  • 9a72dd7446 Bugfix - Render normal is incomplete when multiple mesh present. (#5605) Roman 2021-11-16 00:17:40 -08:00
  • 224e0bd20f Removed the 'data-warnings' concept for checking before saving a material document. It's no longer necessary since we no longer replace the original data with placeholders. santorac 2021-11-16 00:02:20 -08:00
  • a789d7b762 Minor code cleanup. santorac 2021-11-16 00:00:10 -08:00
  • 2657620846 Minor code cleanup. santorac 2021-11-15 23:56:10 -08:00
  • 1b9526a1e2 Merge pull request #280 from aws-lumberyard-dev/Atom/santorac/MaterialEditorHandlesMissingTextures2 santorac 2021-11-15 23:23:02 -08:00
  • aa85963a2b Fixed MaterialPropertyValue::FromAny to preserve the Hint string when converting Asset objects. This fixed an issue where the hint didn't show up in the Material Component's instance inspector. santorac 2021-11-15 23:21:21 -08:00
  • 7f57548023 Adds triangle under cart button when cart is shown nggieber 2021-11-15 20:00:20 -08:00
  • 0e7d732c61 fix upgrade scanner chcurran 2021-11-15 17:15:05 -08:00
  • 7d849cc0d2 Changed the overall strategy for how to handle missing image references. Instead of replacing it with one of the placeholder assets, we replace it with an random UUID which will be interpreted as a missing asset (unless some discovers discovers a UUID collision). This eventually gets replaced by one of the placeholder textures at runtime. This approach gives more consistent results in how missing texture are handled between Material Editor and Material Component. santorac 2021-11-15 16:51:22 -08:00
  • d2d83079eb Cleaning up test docstring jckand-amzn 2021-11-15 18:30:06 -06:00
  • e5ebdaebcf Removing unused helper for now and utilizing helper function for opening base level jckand-amzn 2021-11-15 18:27:52 -06:00
  • 5fb45f4496 Updated more names lsemp3d 2021-11-15 15:56:37 -08:00
  • 3791149c6b Merge pull request #5531 from aws-lumberyard-dev/linux_ar Sean Sweeney 2021-11-15 15:50:58 -08:00
  • 05caf1b29d Removed redundant append to components list from add_component() jckand-amzn 2021-11-15 17:50:42 -06:00
  • 60f7ea54aa Reverting unintentional change to create_vegetation_area() helper jckand-amzn 2021-11-15 17:45:52 -06:00
  • 34adac8dd9 Crash guards lsemp3d 2021-11-15 15:21:18 -08:00
  • 7031147e32 Added event to signal when the Editor is fully initialized so test scripts can listen for that instead of needed arbitrary wait commands. (#5623) Chris Galvan 2021-11-15 17:01:47 -06:00
  • d19ff1e779 Merge pull request #5596 from aws-lumberyard-dev/scripting/text_updates Luis Sempé 2021-11-15 14:56:41 -08:00
  • e1fb2ad368 Update resource mapping schema to make default account ID optional (#5475) allisaurus 2021-11-15 14:48:32 -08:00
  • 35b4f6a538 Replaced float with AZ::u32 lsemp3d 2021-11-15 14:46:38 -08:00
  • 8b7e538dd3 Cherry Pick: [LYN-7463] Fix insert streaming request failure (#5604) (#5622) amzn-mike 2021-11-15 16:14:43 -06:00
  • 327d4192f8 Enabling new optimized periodic test runner for DynamicVegetation tests jckand-amzn 2021-11-15 15:48:44 -06:00
  • 4e1045c005 Merge branch 'development' into linux_ar sweeneys 2021-11-15 13:40:42 -08:00
  • 0a801ffd78 Finalizing temporary prefab helpers and test jckand-amzn 2021-11-15 15:33:46 -06:00
  • e1ace4a8f6 WiP. fwrites are being stopped by AZCoreLogSink; need a long term solution to work around this... Gene Walters 2021-11-15 12:37:52 -08:00
  • 4d161f42df WiP. fwrites are being stopped by AZCoreLogSink; need a long term solution to work around this... Gene Walters 2021-11-15 12:37:21 -08:00