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

Commit Graph

  • bf95c706d8 Merge branch 'main' into LYN-1932 jjjoness 2021-04-28 11:34:43 +01:00
  • b7c2495911 Working base igarri 2021-04-28 09:38:43 +01:00
  • d36a9470a3 Merge branch 'main' into hultonha_PR-37_follow-up hultonha 2021-04-28 09:27:00 +01:00
  • 1fd6938519 Replaced missing & jjjoness 2021-04-28 08:56:02 +01:00
  • f235174c45 Merge branch 'MultiplayerPipeline' of https://github.com/aws-lumberyard-dev/o3de into MultiplayerPipeline pereslav 2021-04-28 07:49:47 +01:00
  • b82627a248 Renamed console_command_file to console-command-file pereslav 2021-04-28 07:44:11 +01:00
  • 5cac07b4c1 ATOM-14003 adding image thumbnails to material inspector properties guthadam 2021-04-28 00:17:58 -05:00
  • 81dbcdc8e4 Merge branch 'main' into DxcExperiment moudgils 2021-04-27 21:32:49 -07:00
  • ff3be54b68 This change got clobbered by the file move karlberg 2021-04-27 19:31:30 -07:00
  • 304696fa5c Shader compile fixes moudgils 2021-04-27 19:26:35 -07:00
  • 6bb51bd9e4 Merging latest origin karlberg 2021-04-27 19:14:11 -07:00
  • 409489e938 Merge pull request #365 from aws-lumberyard-dev/MultiplayerComponents kberg-amzn 2021-04-27 18:59:41 -07:00
  • cac318a30e Merge pull request #381 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6522-found-crash-now-reenable-tests jromnoa 2021-04-27 18:35:33 -07:00
  • 12a3fe8738 Removed gem entry from CMakeLists.txt luissemp 2021-04-27 17:48:31 -07:00
  • a4047baccb Merge pull request #265 from aws-lumberyard-dev/Atom/mnaumov/ATOM-13851 AMZN-mnaumov 2021-04-27 17:42:23 -07:00
  • 17d5febda5 Merge pull request #337 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15355 dmcdiarmid-ly 2021-04-27 17:39:51 -07:00
  • b758a1553f GetTemplateIdFromFilePath now asserts if it's passed an absolute path. This is helpful for debugging, since the function would silently fail even if the file was actually loaded. daimini 2021-04-27 17:21:33 -07:00
  • c07a7c3766 Detect and block instantiations that would generate circular dependencies in the instance hierarchy. daimini 2021-04-27 17:20:22 -07:00
  • 793d60f150 Merge main mnaumov 2021-04-27 17:07:42 -07:00
  • e1b55d8f0a change property call to the new Atom properties for Decal (Atom) jromnoa 2021-04-27 16:59:53 -07:00
  • a73d25dfe6 One more broken component causing atom tests to crash + some extra PR feedback karlberg 2021-04-27 16:54:01 -07:00
  • ac900a7b57 ATOM-14947 Take out redundant else case for setting depthclip flag. Peng 2021-04-27 16:51:17 -07:00
  • 1d093f9c29 Merge branch 'main' into Atom/guthadam/ATOM-15370 guthadam 2021-04-27 18:46:26 -05:00
  • bd742519fb Merge branch 'main' into Atom/guthadam/ATOM-15372 guthadam 2021-04-27 18:45:44 -05:00
  • 678a831e51 fix expected lines check for Decal (Atom) to go with the update after finding crash bug jromnoa 2021-04-27 16:40:53 -07:00
  • 019eacc073 fix Decal component name due to crash in SPEC-6561 jromnoa 2021-04-27 16:38:26 -07:00
  • 7aeb9614de Remove remaining libav references Alex Peterson 2021-04-27 16:27:10 -07:00
  • 618d80e738 Deleting touchpoints with the legacy cry renderer in an attempt to fix a failing test karlberg 2021-04-27 16:26:26 -07:00
  • 2fc710d73b Addressing PR feedback karlberg 2021-04-27 16:03:39 -07:00
  • ff438688dc Merge branch 'main' into Atom/dmcdiar/ATOM-15355 dmcdiar 2021-04-27 16:02:49 -07:00
  • 7e8b1e8c80 Fix linux build guthadam 2021-04-27 17:57:09 -05:00
  • 78508ec211 Merge pull request #362 from aws-lumberyard-dev/carlitosan-parser-fixes carlitosan 2021-04-27 15:52:44 -07:00
  • 26604fd66c Merge branch 'main' into Prefab/CreatePrefab srikappa 2021-04-27 15:41:04 -07:00
  • 963e851119 Merge pull request #372 from aws-lumberyard-dev/LYN-3060-cherry Danilo Aimini 2021-04-27 15:37:48 -07:00
  • 06803040ac Fixed an assert during loading a level with prefabs srikappa 2021-04-27 15:36:44 -07:00
  • 9e5daef51d merge from main luissemp 2021-04-27 15:30:42 -07:00
  • e255c49999 Removed the ScriptCanvasDiagnosticLibrary gem, it's not Atom compatible luissemp 2021-04-27 15:28:12 -07:00
  • 805eb1ba34 Adding editor point light support Michael Riegger 2021-04-27 15:14:59 -07:00
  • 5593350f84 ATOM-15372 Restoring material browser filter logic guthadam 2021-04-27 17:12:42 -05:00
  • 7027bcf7ba Merge pull request #367 from aws-lumberyard-dev/cgalvan/RemoveLegacyPhysicsManager cgalvan 2021-04-27 17:03:56 -05:00
  • 8e88d746a3 [LYN-3356] Replaced GetSelectedEntities + size() with new API. Chris Galvan 2021-04-27 16:56:20 -05:00
  • eeafb5eaa3 ATOM-15370 Fix thumbnail scaling and sizing issues guthadam 2021-04-27 16:43:06 -05:00
  • daea5e93b2 Adding groupname to material instance mnaumov 2021-04-27 14:35:03 -07:00
  • e4509dbe68 Merge pull request #322 from aws-lumberyard-dev/Atom/qingtao/ATOM-6088 Vicky 2021-04-27 14:34:27 -07:00
  • 3ad9435eb9 Merge branch 'main' into cgalvan/RemoveLegacyPhysicsManager Chris Galvan 2021-04-27 16:27:22 -05:00
  • b1fac0a89e Merge branch 'main' into carlitosan-parser-fixes chcurran 2021-04-27 14:25:08 -07:00
  • 812f624020 add missing numeric caster for platform safe Lua integer use chcurran 2021-04-27 14:22:29 -07:00
  • 138b10c902 Unity build fixes karlberg 2021-04-27 14:19:41 -07:00
  • caa982372f Remove include for removed interface in EditorPrefabComponent.cpp daimini 2021-04-26 14:56:04 -07:00
  • 797ee26f87 Remove EntityOutlinerWidgetInterface, and replace it with PrefabPublicNotificationBus. Introduce events to notify handlers of when instance propagation begins and ends so that widgets can refresh correctly. daimini 2021-04-26 14:20:06 -07:00
  • 2eed8684b5 Adding full shadowmap support Michael Riegger 2021-04-27 14:08:54 -07:00
  • 51e8b21a0e Clang compile fix karlberg 2021-04-27 14:04:36 -07:00
  • 8a65c6b343 Fix build and runtime issues on iOS SJ 2021-04-27 13:57:49 -07:00
  • 84e0f6f58d [LYN-3122] Moved invariant logic outside of for loop and removed TODO comment. Chris Galvan 2021-04-27 13:32:30 -05:00
  • f269d92f90 [LYN-3122] Fixed the viewport Entity hit test logic. This allows the BuildDragDropContext to detect hit position correctly so that assets dragged into the viewport are placed in the correct position. Chris Galvan 2021-04-27 11:17:24 -05:00
  • 16c31cde3e Fix issue found in PR karlberg 2021-04-27 13:53:18 -07:00
  • 0c90990462 Merge branch 'main' into LYN-3280 amzn-sj 2021-04-27 13:29:04 -07:00
  • 59a2550595 Merge pull request #360 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6522-move-test-to-sandbox jromnoa 2021-04-27 13:27:40 -07:00
  • 60db6b55d0 Address feedback of PR for ATOM-6088. * Rename DrawItemKeyPair to DrawItemProperties. * Switch back to use Ptr<DrawListTagRegistry> instead of DrawListTagRegistry * Updated some comment. qingtao 2021-04-27 13:26:43 -07:00
  • be4a4b44f3 Missed one more merge issue karlberg 2021-04-27 13:24:15 -07:00
  • f1ae3f52b0 Merge branch 'main' into MultiplayerPipeline pereslav 2021-04-27 21:23:22 +01:00
  • b6a710a7fa Fixing more merge issues karlberg 2021-04-27 13:21:59 -07:00
  • 21d99ea07d [LYN-3348] Removed legacy CObjectPhysicsManager. Chris Galvan 2021-04-27 15:16:20 -05:00
  • ff635064bd Forgot to stage this fix to a bad merge karlberg 2021-04-27 13:06:11 -07:00
  • 901428668c Merging latest origin karlberg 2021-04-27 13:03:31 -07:00
  • f2ce91fb44 AtomDebugDisplayViewportInterface - Fix Crash if FontQueryInterface in null rgba16f 2021-04-27 14:57:51 -05:00
  • 83f3cbd4a1 Merge pull request #151 from aws-lumberyard-dev/SPEC-6072 Junbo Liang 2021-04-27 12:13:21 -07:00
  • 5544621bcc Merge branch 'main' into carlitosan-parser-fixes chcurran 2021-04-27 12:10:53 -07:00
  • 66dd89aacd Fixes for branching runtime, nested user branch parse-error, unit tests for both. LYN-3338 chcurran 2021-04-27 12:08:49 -07:00
  • 1a66d8db31 Using official ImGui fix for unused variable warning karlberg 2021-04-27 11:42:05 -07:00
  • 64e06c3010 more updates to camera code hultonha 2021-04-27 19:40:45 +01:00
  • 71c315b2b7 SPEC-6510 Illegal instruction in asset_mac.sh on clean asset builds (#349) Esteban Papp 2021-04-27 11:38:10 -07:00
  • 8cb1edb7d7 Updates ImGui to release version 1.82, builds out some better initial multiplayer metrics karlberg 2021-04-27 11:37:56 -07:00
  • dfb33e5d4f move failing test to sandbox suite while investigation is underway jromnoa 2021-04-27 11:31:43 -07:00
  • 03e681ca5f Merge from main mnaumov 2021-04-27 11:26:02 -07:00
  • d753215d4b Reversing the fix to RayTracing, this isn't desired because it masks other problems. mbalfour 2021-04-27 13:12:56 -05:00
  • 8cc813986c Merge branch 'main' into ATOM/tonypeng/ATOM-14947 Peng 2021-04-27 11:10:17 -07:00
  • 5c75415714 Merge branch 'main' into LYN-3280 amzn-sj 2021-04-27 11:07:51 -07:00
  • 5f33337fec Merge main mnaumov 2021-04-27 11:05:22 -07:00
  • 251929d071 Two misc bugfixes: 1) RayTracing will sometimes crash by dereferencing a null ptr. This guards against it. 2) ViewportContext was missing some BusConnect / BusDisconnect calls. mbalfour 2021-04-27 12:54:20 -05:00
  • a00d47365e Merge pull request #295 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14585 AMZN-mnaumov 2021-04-27 10:53:18 -07:00
  • 0607f6efa6 Changed Play Console from comments in PR. jjjoness 2021-04-27 18:37:14 +01:00
  • 0f8e6cbda1 Fixed a Linux build error. AMZN-koppersr 2021-04-27 10:36:43 -07:00
  • 6aa5b5698f Removed Cry FogVolume component (#346) Terry Michaels 2021-04-27 12:17:50 -05:00
  • b113f09a71 first pass of changing transform to use float for scale internally rather than Vector3 greerdv 2021-04-27 18:12:46 +01:00
  • 28d7b1f76b Merge pull request #330 from aws-lumberyard-dev/LYN2903_ScriptCanvasDeleteComponentVariableCrash Gene Walters 2021-04-27 10:12:10 -07:00
  • c86314123e Merge pull request #350 from aws-lumberyard-dev/SPEC-6538-main Steve Pham 2021-04-27 10:00:46 -07:00
  • 0042848b8a Merge pull request #326 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6522-test-fix jromnoa 2021-04-27 09:57:45 -07:00
  • 001675aea4 Merge pull request #333 from aws-lumberyard-dev/fix-ctest-entrypoint-cmd-dev-dir-variable jromnoa 2021-04-27 09:56:39 -07:00
  • 66bdf4e26d Fix and re-enabled blast tests and moved them to main AMZN-AlexOteiza 2021-04-27 17:53:03 +01:00
  • 0b8299ba0b Remove the existing crashpad package and update the package hash junbo 2021-04-21 17:00:30 -07:00
  • eb0758f63a [SPEC-6071][Crashpad] Make Crashpad available through 3rdParty system for Windows junbo 2021-04-19 22:38:33 -07:00
  • 17997b3df8 [LYN-3135] Animation Editor: Some of the default animation assets are broken (#348) Benjamin Jillich 2021-04-27 18:40:04 +02:00
  • 924fee57a5 Merge branch 'main' into modify_test_timeout sweeneys 2021-04-27 09:32:13 -07:00
  • 76423a1cc8 Merge branch 'main' into ATOM/tonypeng/ATOM-14947 Peng 2021-04-27 09:15:33 -07:00
  • fc3a48bb26 EMFX: Fix a crash when deleting blend tree node (#331) rhongAMZ 2021-04-27 09:07:34 -07:00
  • 5452b5d876 - Update Lua for mac to rev6 (Fix missing debug libs) spham 2021-04-26 15:55:04 -07:00
  • 6987dac6f3 Merge pull request #242 from aws-lumberyard-dev/physx_ragdoll_create amzn-sean 2021-04-27 15:53:23 +01:00
  • e3b016deba PR feedback addressing pereslav 2021-04-27 14:57:36 +01:00
  • d20fb50c9d Cloth CPU Skinning using MCore DualQuaternions instead of Cry DualQuat Aaron Ruiz Mora 2021-04-27 14:52:33 +01:00