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

Commit Graph

  • 2b538c9921 Switch to using settings registry amzn-mike 2021-05-13 09:47:21 -05:00
  • 55ec82be8f Merge pull request #613 from aws-lumberyard-dev/SPEC-6690 zsolleci 2021-05-13 11:37:25 -05:00
  • 5940f2ebbe Merge pull request #739 from aws-lumberyard-dev/LYN-1099 jjjoness 2021-05-13 17:35:17 +01:00
  • f478340376 Data driven asset importer. Need to fix reflection amzn-mike 2021-05-12 16:04:25 -05:00
  • fdc890b0fc Added comments to the test pereslav 2021-05-13 17:27:23 +01:00
  • debbfc38d8 Merge branch 'main' into ly-as-sdk/LYN-2948 phistere 2021-05-13 11:25:03 -05:00
  • 68711fce75 Added network prefab processor test pereslav 2021-05-13 17:23:37 +01:00
  • 49d2d92c2d Merge branch 'main' of https://github.com/aws-lumberyard-dev/o3de into ATOM/tonypeng/ATOM-15266-2 Peng 2021-05-13 08:39:43 -07:00
  • 795aa114e6 Improve selection in the viewport (#720) Tom Hulton-Harrop 2021-05-13 16:19:53 +01:00
  • 33240c9f90 Selecting assets from tableview igarri 2021-05-13 16:08:14 +01:00
  • 4aff32e719 More red code (#732) bosnichd 2021-05-13 08:55:36 -06:00
  • 5225fd2c9f Merge pull request #727 from aws-lumberyard-dev/MultiplayerComponents kberg-amzn 2021-05-13 07:46:21 -07:00
  • 7f79cc8796 RemoveSimulatedBody automatically updates the requested handle to be invalid once removed. (#740) amzn-sean 2021-05-13 15:04:00 +01:00
  • a13c9e8d53 Hasareej lyn 2301 cluster space (#717) Hasareej 2021-05-13 14:23:31 +01:00
  • 2ef0e70fff Merge pull request #730 from aws-lumberyard-dev/non-uniform-scale-compatibility greerdv 2021-05-13 13:42:01 +01:00
  • d7ca3f273b croll to top on view when the filter updates igarri 2021-05-13 13:25:03 +01:00
  • d6868df735 Expanding TableView Columns igarri 2021-05-13 12:29:16 +01:00
  • d690c3fee4 static rigid body and rigid body component use Handles instead of pointers (#662) amzn-sean 2021-05-13 11:59:22 +01:00
  • 36a79aca8a Remove redundant function. sphrose 2021-05-13 10:56:39 +01:00
  • 26b8181cc1 Merge branch 'main' into LYN-1099 jjjoness 2021-05-13 09:18:13 +01:00
  • e429c8e06a Fixed issues after merging latest main, as well as some edge cases I didn't notice before. Chris Santora 2021-05-12 23:28:05 -07:00
  • d85e0500d5 PR feedback guthadam 2021-05-13 00:55:29 -05:00
  • 488e3b5da5 Merge branch 'main' into Atom/guthadam/ATOM-15223 guthadam 2021-05-13 00:33:28 -05:00
  • bcea9f29a8 Improved variable name mriegger 2021-05-12 22:11:49 -07:00
  • c0d9a3c423 Fix for clang not being lazy about template expansion karlberg 2021-05-12 20:55:03 -07:00
  • cb8016bde5 Fix for validator failing on empty files karlberg 2021-05-12 20:52:02 -07:00
  • 124ca1618a Making shadow res of 1024 and bicubic pcf the default mriegger 2021-05-12 20:51:56 -07:00
  • 77899c5d96 Updated network property behavior context category so they are grouped nicer in the Script Canvas palette Gene Walters 2021-05-12 20:45:58 -07:00
  • 601dd30452 Various build and test fixes karlberg 2021-05-12 20:41:53 -07:00
  • eea0660d21 A couple more fixes karlberg 2021-05-12 20:26:08 -07:00
  • e772265871 Build fixes for gem reorganization karlberg 2021-05-12 20:09:27 -07:00
  • b225dcfa79 Update cmake to use the new Dxc binaries for windows moudgils 2021-05-12 19:37:44 -07:00
  • 30637274e1 Merge branch 'main' into DxcExperiment moudgils 2021-05-12 19:35:26 -07:00
  • 5df2601428 Merge branch 'main' of https://github.com/aws-lumberyard-dev/o3de into ATOM/tonypeng/ATOM-15266-2 Peng 2021-05-12 19:14:09 -07:00
  • 112f0d3448 Merge pull request #731 from aws-lumberyard-dev/Atom/mriegger/ATOM-14271 mrieggeramzn 2021-05-12 18:04:06 -07:00
  • 408ad06fd2 Merge branch 'main' of https://github.com/aws-lumberyard-dev/o3de into ATOM/tonypeng/ATOM-15266-2 Peng 2021-05-12 17:52:06 -07:00
  • 1fe81c1533 ATOM-15266 added location in the assert message where the descriptor set will be re-created Peng 2021-05-12 17:51:30 -07:00
  • 8fd5c30e13 Address some build/review feedback nvsickle 2021-05-12 17:47:10 -07:00
  • 37a1b77d50 Merge branch 'main' into Atom/santorac/NewLayeringWorkflow Chris Santora 2021-05-12 17:45:28 -07:00
  • 53188a12da Made StandardMultilayerPBR hide a layer's property groups when that layer is disabled. Chris Santora 2021-05-12 17:06:57 -07:00
  • 8101b60f5d Merge pull request #689 from aws-lumberyard-dev/Prefab/Automation/Tests Amzn-Catdo 2021-05-12 17:05:10 -07:00
  • ef8f9c82a0 Merge from main mnaumov 2021-05-12 16:37:32 -07:00
  • 7633ec9a83 removed spacings in CMakeList and removed the tags.txt file in the prefab level catdo 2021-05-12 16:27:51 -07:00
  • 67c3801d73 Log monitor encoding fix (#729) SSpalding 2021-05-12 16:15:18 -07:00
  • 8bb425709b unit test fix karlberg 2021-05-12 16:04:44 -07:00
  • 254ad165c1 A bunch of work to get external multiplayer components to actually work karlberg 2021-05-12 16:01:59 -07:00
  • cb09d542d1 Use the new Atom API instead of the removed r_displayInfo for ViewportTitleDlg nvsickle 2021-05-12 15:59:21 -07:00
  • 84216f0479 Add API for ViewportInfoDisplayState, add some minor RHI integration nvsickle 2021-05-12 15:58:28 -07:00
  • 9b1f4c04e6 Removing the old hack code mriegger 2021-05-12 14:54:33 -07:00
  • ef775da89c merging latest pull zsolleci 2021-05-12 16:40:52 -05:00
  • a19599d96b Merge branch 'main' into Prefab/Automation/Tests catdo 2021-05-12 14:39:03 -07:00
  • 50abafbab1 Add orchestrating script to install ubuntu packages for O3DE on Linux (#721) Steve Pham 2021-05-12 14:31:39 -07:00
  • 3a63941d56 Fix Jenkins failure during engine registration for iOS SJ 2021-05-12 14:24:40 -07:00
  • 50ba6bba56 Merge pull request #702 from aws-lumberyard-dev/LY-123750 zsolleci 2021-05-12 16:24:33 -05:00
  • 2bc080b8ad Merge branch 'main' into SPEC6476_ReflectNetworkProperties Gene Walters 2021-05-12 14:21:17 -07:00
  • ce3842ac84 Merge branch 'main' into non-uniform-scale-compatibility greerdv 2021-05-12 22:19:33 +01:00
  • 9a4884ff0b Exposing Multiplayer integral types (just wrapped ints) to bevahior context so that Network Properties using these type can be Get/Set from Script Canvas Gene Walters 2021-05-12 14:19:18 -07:00
  • 655d71e0dd update compatibility of atom components with NonUniformScaleService greerdv 2021-05-12 22:16:14 +01:00
  • 2679826421 Change SerializeContextTools into a ToolsApplication so that it can correctly read in slice data Mike Balfour 2021-05-12 16:03:52 -05:00
  • 293e0057f4 Actually invoke the override OnConnect handler karlberg 2021-05-12 13:58:53 -07:00
  • 1895c2d18d Merge pull request #675 from aws-lumberyard-dev/Prefab/CreatePrefab srikappa-amzn 2021-05-12 13:54:26 -07:00
  • d0b006c209 Some cleanup to better support backward reconciliation as well as dynamic player spawning on connect karlberg 2021-05-12 13:41:18 -07:00
  • 7bdf44a099 Detect cyclical dependencies in the nested prefabs of the prefab being instantiated srikappa 2021-05-12 13:38:44 -07:00
  • 059f69e5e6 tidy up NonUniformScaleService compatibility greerdv 2021-05-12 21:20:23 +01:00
  • 2787e5053d addressed some nits and added comments catdo 2021-05-12 13:18:32 -07:00
  • 5f3a6c0934 Merge pull request #724 from aws-lumberyard-dev/Atom/olexl/LYN-3734_atom_ap_issue Olex Lozitskiy 2021-05-12 16:01:38 -04:00
  • 79674a093f Merge branch 'main' of https://github.com/aws-lumberyard-dev/o3de into SPEC-6690 zsolleci 2021-05-12 14:54:04 -05:00
  • 98a579abef Added a comment srikappa 2021-05-12 12:17:36 -07:00
  • b5d7ae829a addressed internal review feedback zsolleci 2021-05-12 14:10:54 -05:00
  • 559798251d Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay nvsickle 2021-05-12 11:55:51 -07:00
  • 931a127b7b ATOM-15223 updating material assignment ID to be portable to other models guthadam 2021-05-12 13:47:47 -05:00
  • 3569ac9b87 Bringing back RHI modules to tools deps Aristo7 2021-05-12 13:13:28 -05:00
  • b52388f5eb Remove unused file antonmic 2021-05-12 11:11:45 -07:00
  • 92b7099d78 Some clean up antonmic 2021-05-12 11:10:13 -07:00
  • f5e91c6e42 Added low end shaders in StandardPBR_ShaderEnable.lua antonmic 2021-05-12 10:39:18 -07:00
  • 39b4846ba8 Merge branch 'SPEC-6690' of https://github.com/aws-lumberyard-dev/o3de into SPEC-6690 zsolleci 2021-05-12 12:27:38 -05:00
  • 13864c5a6b resolving merge conflicts zsolleci 2021-05-12 12:26:02 -05:00
  • 3383cfc95a Fix Jenkins failure during engine registration for iOS amzn-sj 2021-05-12 10:20:03 -07:00
  • 33f7da764e Remove unneeded scripts that have internal service references (#683) Shirang Jia 2021-05-12 10:05:42 -07:00
  • 749df7d977 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 phistere 2021-05-12 11:16:44 -05:00
  • 7cec2d8b07 Remove more unused things from CryCommon and CrySystem. (#709) bosnichd 2021-05-12 08:30:15 -06:00
  • ae9b36c135 PR feedback - now allows for multiple specializations on the command-line, and changed the switch name to "specializations" to reflect that. mbalfour 2021-05-12 08:56:49 -05:00
  • c1e21185b4 Selecting correct indexes from Asset Browser Model igarri 2021-05-12 12:20:23 +01:00
  • 80684b383b Code cleanup igarri 2021-05-12 11:42:39 +01:00
  • 552ebea135 Added Simulate button jjjoness 2021-05-12 11:40:36 +01:00
  • 1c990b2ef6 Filter Sorting Working igarri 2021-05-12 11:03:02 +01:00
  • f9fb61cc5d Fix issue with viewport interaction ordering and viewport matrix changed handler (#695) Tom Hulton-Harrop 2021-05-12 09:40:37 +01:00
  • 0cad668f31 Merge branch 'main' into LYN-1099 jjjoness 2021-05-12 08:58:43 +01:00
  • 2558801a24 Commit before merging main jjjoness 2021-05-12 08:58:16 +01:00
  • d9cb61575e Fix up particle emitter to work with Atom (#626) michabr 2021-05-07 11:25:57 -07:00
  • 3219c787ac UI cursor Atom conversion (#607) michabr 2021-05-06 13:27:46 -07:00
  • 905bdf9627 Fix sprite asset selection in property editor (#384) michabr 2021-05-03 16:32:18 -07:00
  • 0867764e5b Updating Autocomponent behavior context property methods to give warnings if a Get/Set fails and how users might go about fixing the issue Gene Walters 2021-05-11 22:46:21 -07:00
  • 0cc8b38be4 Merge branch 'main' into Atom/moudgils/FixTextureArray moudgils 2021-05-11 22:21:49 -07:00
  • d98a691994 UI Editor Viewport fixes abrmich 2021-05-11 10:19:30 -07:00
  • 7342e62680 Hiding "Open Material" when material asset is assigned mnaumov 2021-05-11 19:33:46 -07:00
  • 671f26bed4 fixing debug configuration and how we declare IMPORTED targets (instead of UNKNOW we use the actual type) pappeste 2021-05-11 19:06:07 -07:00
  • bf62687b37 Update android installation script to install gradle 7.0 Steve Pham 2021-05-11 18:58:26 -07:00
  • 6fcd5c7817 Restore Viewport debug text nvsickle 2021-05-11 18:27:47 -07:00
  • cdca18ca25 Use a smart viewport context pointer in AtomFont to avoid a crash nvsickle 2021-05-11 18:26:05 -07:00