Merged conflicts from pulling down latest development

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2021-07-02 16:29:27 -05:00
119 changed files with 1006 additions and 1506 deletions
+10 -30
View File
@@ -1,32 +1,12 @@
{
"gem_name": "ScriptCanvasPhysics",
"GemFormatVersion": 4,
"Uuid": "1c27519a4dda4ffaaeebf91514e5b1e8",
"Name": "ScriptCanvasPhysics",
"DisplayName": "Script Canvas - Physics",
"Version": "0.1.0",
"Summary": "Exposes legacy physics features to scripting through the Behavior Context to Lua and Script Canvas.",
"Tags": ["Scripting", "Physics"],
"IconPath": "preview.png",
"Modules": [
{
"Type": "GameModule"
}
],
"Dependencies": [
{
"Uuid": "ff06785f7145416b9d46fde39098cb0c",
"VersionConstraints": [
">=0.1.0"
],
"_comment": "LmbrCentral"
},
{
"Uuid": "869a0d0ec11a45c299917d45c81555e6",
"VersionConstraints": [
">=0.1.0"
],
"_comment": "ScriptCanvas"
}
]
}
"display_name": "Script Canvas Physics",
"license": "Apache-2.0 Or MIT",
"origin": "Open 3D Engine - o3de.org",
"type": "Code",
"summary": "The Script Canvas Physics Gem provides Script Canvas nodes for physics scene queries such as raycasts.",
"canonical_tags": ["Gem"],
"user_tags": ["Scripting", "Physics", "Simulation"],
"icon_path": "preview.png",
"requirements": ""
}