birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,644 Commits 3 Branches 3 Tags
4e54df49db80997e9bbfbde91114dd67071d528b
Commit Graph

1644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guthrie Adams 261067cfdf Merge pull request #605 from aws-lumberyard-dev/Atom/guthadam/LYN-3612 
LYN-3612 Removing reference to redcoded decal component causing drag/drop crash
 2021-05-06 13:20:43 -05:00
Vincent Liu 828284d109 [LYN-3463] Improve error message based on resource mapping manager loading status (#551) 2021-05-06 10:55:07 -07:00
Brian Herrera 618a02ff13 Update step to also send email to build requestor on all branches 2021-05-06 10:43:44 -07:00
chiyenteng ede1889507 [CherryPick][LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode (#585) 
* [LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode (#490)
 2021-05-06 10:39:43 -07:00
Luis Sempé 743d4489d5 Merge pull request #593 from aws-lumberyard-dev/carlitosan-beta-fixes 
Expose raw BC properties to the NodePalette
 2021-05-06 10:31:30 -07:00
guthadam d551d01bed LYN-3612 Removing reference to redcoded decal component causing drag/drop crash 
https://jira.agscollab.com/browse/LYN-3612
 2021-05-06 12:02:17 -05:00
cgalvan 13a40aba02 Merge pull request #602 from aws-lumberyard-dev/cgalvan/FixedEmptyFloatingWindow 
[LYN-3439] Make sure the toolbar spacer is created with a parent to prevent an empty floating window.
 2021-05-06 11:46:51 -05:00
greerdv a07d69105b Merge pull request #416 from aws-lumberyard-dev/non-uniform-scale-decal 
Non uniform scale decal
 2021-05-06 17:39:11 +01:00
chcurran fc95af4d58 Merge branch 'main' into carlitosan-beta-fixes 2021-05-06 09:38:36 -07:00
Brian Herrera bdfee639d9 Update formatting 2021-05-06 09:38:31 -07:00
Brian Herrera 032500ddb9 Fix email notifications and limit to watched branches 2021-05-06 09:23:12 -07:00
guthadam 14e992c7e1 Merge branch 'main' into Atom/guthadam/ATOM-15486 2021-05-06 11:17:34 -05:00
Benjamin Jillich 32b1d52341 [LYN-2515] Added shared gem info class (#574) 2021-05-06 18:01:13 +02:00
Guthrie Adams c2c6d79688 Merge pull request #592 from aws-lumberyard-dev/Atom/guthadam/ATOM-15473 
ATOM-15473 added context menu to material inspector group header with expand and collapse actions
 2021-05-06 10:53:55 -05:00
Chris Galvan 7dec09d9ae [LYN-3439] Make sure the toolbar spacer is created with a parent to prevent an empty floating window. 2021-05-06 10:40:24 -05:00
zsolleci d7f33cb3e0 resolving merge conflicts 2021-05-06 10:35:55 -05:00
anugshya 8704383f0e fixed review comments 2021-05-06 21:00:57 +05:30
jonbeer e1c98d1468 Merge branch 'Prefab/PhysX/ColliderFixes' of https://github.com/aws-lumberyard-dev/o3de into Prefab/PhysX/ColliderFixes 2021-05-06 08:17:23 -07:00
jonbeer 52d2998a06 Removing physics test and aztoolsframework dependency 2021-05-06 08:14:41 -07:00
greerdv 578cd47a0a replacing virtual function with default parameter with overloaded function 2021-05-06 15:11:11 +01:00
hnusrath 785e22541a Merge pull request #580 from aws-lumberyard-dev/PhysxTimeout 
LYN-3465 : The test timeout for AutomatedTesting::PhysicsTests_Sandbox
 2021-05-06 14:51:42 +01:00
darapan 409500635f "Fixing review comments" 2021-05-06 05:40:11 -07:00
darapan 98927fb638 Merge branch 'main' into script_canvas 2021-05-06 05:12:16 -07:00
darapan 460863be0a "Resolving merge conflicts" 2021-05-06 05:06:14 -07:00
Aaron Ruiz Mora f258802377 (cherry-pick from 1.0) Fix registry colliding by using a different extension for the files used to override registry 2021-05-06 11:39:19 +01:00
anugshya c9c2aa7367 Fixed expected lines 2021-05-06 15:51:58 +05:30
anugshya 3a3d897db7 test_ScriptEvents_ReturnSetTypeSuccessfully 2021-05-06 15:07:35 +05:30
greerdv 368bf69ae6 Merge branch 'main' into non-uniform-scale-decal 2021-05-06 09:01:17 +01:00
balibhan 499152d23c Merge pull request #542 from aws-lumberyard-dev/SC_migration_branch 
Script canvas automation scripts migration
 2021-05-06 11:41:06 +05:30
moudgils 57ed4095c4 Merge pull request #597 from aws-lumberyard-dev/AddBuildersToMac 
Add Vulkan and DX12 builders for Mac/Automatedtesting
 2021-05-05 23:09:29 -07:00
guthadam c8b0a7be8a Merge branch 'main' into Atom/guthadam/ATOM-15473 2021-05-05 23:32:30 -05:00
guthadam e80de63d55 ATOM-15486 Saving material editor user settings 
https://jira.agscollab.com/browse/ATOM-15486
 2021-05-05 23:31:17 -05:00
karlberg 751d13dd7b Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-05 20:07:49 -07:00
karlberg a1fe8fe419 Ported the local prediction player controller component 2021-05-05 20:07:16 -07:00
AMZN-koppersr 4661da23bb Cleaned up the flags in the BaseJsonSerializer.h 2021-05-05 17:51:22 -07:00
AMZN-koppersr ec52e51476 Additional unit tests for the Json Serialization to make sure custom json serializer work if they're the first used through the higher Load/Store calls. 2021-05-05 17:22:57 -07:00
moudgils 46b4b76682 Add Vulkan and DX12 builders as Mac should be able to build assets from other platforms 2021-05-05 17:17:47 -07:00
AMZN-koppersr 6ad135f35c Fix for smart pointers being loaded through the main load point with a default JSON object. 2021-05-05 16:41:54 -07:00
AMZN-nggieber 724add6365 Fix Project Manager Qt Ui files not Being Autogenerated (#588) 
* Moved Qt files into to renamed 'S'ource

* Updated files after moving all Qt folder into Source

* Updated Source capitalization in cmake files list

* Adding newline to the end of project_manager_files.cmake

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-05-05 15:45:39 -07:00
chcurran 2765c722ca Merge branch 'main' into carlitosan-beta-fixes 2021-05-05 15:05:15 -07:00
chcurran a30d8eb886 Expose Raw BC Properties to Node Palette. 2021-05-05 14:59:08 -07:00
hnusrath 97fb763776 Merge pull request #587 from aws-lumberyard-dev/PhysXTestRailLinkRemoval 
SPEC-6677 Remove TestRail URLs from Physx Tests
 2021-05-05 22:53:59 +01:00
guthadam eb847ce9fa ATOM-15473 added context menu to material inspector group header with expand and collapse actions 
https://jira.agscollab.com/browse/ATOM-15473
 2021-05-05 16:35:32 -05:00
AMZN-koppersr 790e41f675 Reverted previous fix. 2021-05-05 14:21:53 -07:00
Zaladane 1455fcbde6 Asset Bundler - Minor Feedback (#550) 
Asset Bundler - Minor Feedback

* updated the formatting so all lines are shorter than 140 characters

* fixed a few nitpicks that came up on a recent PR

* removed a function that wasn't being used anymore

* updated some error messages based on PR feedback
 2021-05-05 13:59:37 -07:00
bosnichd 5783bf635b Fix for LoadLevel not being called. (#584) 2021-05-05 13:35:50 -06:00
hnusrath fdb461b3ca SPEC-6677 Remove TestRail URLs from Physx Tests 2021-05-05 20:06:39 +01:00
Aaron Ruiz Mora 7ba3a19b40 Remove unnecessary transformation of tangents and bitangents in cloth CPU skinning. 2021-05-05 19:48:56 +01:00
greerdv 26ab8c8a25 merging from main 2021-05-05 19:07:04 +01:00
jckand-amzn be1e4e7b1a Merge pull request #581 from aws-lumberyard-dev/jckand/FoundationAuto 
Cherry picking Foundation automation fixes from 1.0 branch
 2021-05-05 12:58:40 -05:00