From b4e0986acb1d21dd064d68a002d83e89a9fc744c Mon Sep 17 00:00:00 2001 From: Jonny Galloway Date: Thu, 1 Sep 2022 15:39:42 -0500 Subject: [PATCH 1/2] update to licensing Signed-off-by: Jonny Galloway --- CONTRIBUTORS-GUIDE.md | 0 LICENSE-CC-BY-NC-4.0.txt | 5 ++++ LICENSE.txt | 55 +++++++++++++++++++++++++--------- Project/Gem/enabled_gems.cmake | 2 ++ Project/project.json | 7 +++-- 5 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 CONTRIBUTORS-GUIDE.md create mode 100644 LICENSE-CC-BY-NC-4.0.txt diff --git a/CONTRIBUTORS-GUIDE.md b/CONTRIBUTORS-GUIDE.md new file mode 100644 index 00000000..e69de29b diff --git a/LICENSE-CC-BY-NC-4.0.txt b/LICENSE-CC-BY-NC-4.0.txt new file mode 100644 index 00000000..5d734f01 --- /dev/null +++ b/LICENSE-CC-BY-NC-4.0.txt @@ -0,0 +1,5 @@ +Loft Arch Vis Sample Assets +Copyright 2022 Amazon.com, Inc. or its affiliates, all rights reserved. + +3D models, image textures, and other asset files are licensed under a Creative Commons Attribution-NonCommercial 4.0 International License, available at http://creativecommons.org/licenses/by-nc/4.0/. + diff --git a/LICENSE.txt b/LICENSE.txt index c4315a87..f7b4b47d 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,9 +1,46 @@ +## LICENSE + +This Open 3D Engine "o3de-multiplayersample-assets" is licensed under the following conditions: + +PROJECT DATA: "o3de-multiplayersample-assets\Project" +URL: https://github.com/o3de/o3de-multiplayersample-assets/tree/main/Project +The project data and code samples, including inline code, and related data +are dual-licensed under Apache 2.0 and the MIT licenses. +(see LICENSE-APACHE2.txt and LICENSE_MIT.TXT) + +ASSET DATA: "o3de-multiplayersample-assets\Gems" +URL: https://github.com/o3de/o3de-multiplayersample-assets/tree/main/Gems +This repository contains a collection of 'O3DE Asset Gems' for use in game +projects. These Gem folders contents include 3D models, image textures, +and other game asset files. + +Assets that have been developed by third parties and are subject +to separate license terms (such as the Kitbash3D assets or Mixamo files). +It is your responsibility to comply with the applicable licenses. +Information on third party materials, and the applicable license terms, are +referenced in or included with the materials, such as in separate LICENSE*.txt +files accompanying the materials in each folder. + +Assets where special licensing terms are not otherwise stated are licensed +under the Creative Commons license Attribution 4.0 International +(See LICENSE-CC-BY-4.0.txt) + +Additional information for asset constributions (and their licensing) can be +found in the CONTRIBUTORS-GUIDE.md at the root of the repository; generally +all new asset contributions must be made under a permissible Creative-Commons +license (such as LICENSE-CC0.txt or LICENSE-CC-BY-4.0.txt) + +DOCUMENTATION +Any additional documentation content excluding code, and including images, +is licensed under the Creative Commons license Attribution 4.0 International +(See LICENSE-CC-BY-4.0.txt) + OPEN 3D ENGINE LICENSING The default license for Open 3D Engine is the Apache License, Version 2.0 (see LICENSE_APACHE2.TXT); you may elect at your option to use the Open 3D Engine under the MIT License (see LICENSE_MIT.TXT). Contributions must be made under both licenses. - + THIRD PARTY COMPONENTS Open 3D Engine requires the use of (and in some cases makes available to you) software and assets that have been developed by third parties and are subject @@ -12,16 +49,6 @@ licenses). It is your responsibility to comply with the applicable licenses. Information on third party materials, and the applicable license terms, are referenced in or included with the materials, such as in separate LICENSE.txt files accompanying the materials. - -Please note that certain materials are subject to "copyleft" licenses, which -require distribution of source code, including: - -- Qt Toolkit https://github.com/qtproject/, which is subject to the GNU -Lesser General Public License version 3 (with certain exceptions). A copy of -the source code for Qt Toolkit may be found at -https://s3-us-west-2.amazonaws.com/ly-legal/LicenseConformance/Qt/Src.zip - -- The AWS Python SDK uses Chardet https://chardet.github.io/, which is -subject to the GNU Lesser General Public License version 2.1. A copy of the -source code may be found at https://github.com/chardet/chardet. - \ No newline at end of file + +For more information on the licensing terms of Open 3D Engine source code, +read the O3DE License: https://github.com/o3de/o3de/blob/development/LICENSE.txt \ No newline at end of file diff --git a/Project/Gem/enabled_gems.cmake b/Project/Gem/enabled_gems.cmake index abe4537e..ca14de08 100644 --- a/Project/Gem/enabled_gems.cmake +++ b/Project/Gem/enabled_gems.cmake @@ -28,4 +28,6 @@ set(ENABLED_GEMS level_art_mps pbr_material_pack_mps particlefx_mps + DccScriptingInterface + QtForPython ) diff --git a/Project/project.json b/Project/project.json index 5b7dbebb..792920fc 100644 --- a/Project/project.json +++ b/Project/project.json @@ -5,7 +5,7 @@ "origin_url": "https://github.com/o3de/o3de-multiplayersample-assets/", "display_name": "MPS: Asset Test Project", "summary": "This project is set up for contributors to test assets created in this repos asset gems.", - "documentation_url": "https://github.com/o3de/o3de-multiplayersample-assets/Project/readme.md", + "documentation_url": "https://github.com/o3de/o3de-multiplayersample-assets/Project/readme.md", "canonical_tags": [ "Project" ], @@ -13,7 +13,7 @@ "MPS-Asset-Test" ], "icon_path": "preview.png", - "engine": "o3de-sdk", + "engine": "o3de", "external_subdirectories": [ "../Gems/character_mps", "../Gems/kb3d_mps", @@ -32,6 +32,7 @@ "landscape_mps", "level_art_mps", "pbr_material_pack_mps", - "particlefx_mps" + "particlefx_mps", + "DccScriptingInterface" ] } From f7414c776c15f85618b79231ccaa53933cc2d53f Mon Sep 17 00:00:00 2001 From: Jonny Galloway Date: Sun, 25 Sep 2022 12:33:11 -0500 Subject: [PATCH 2/2] tweaks and stub contributors guide Signed-off-by: Jonny Galloway --- CONTRIBUTORS-GUIDE.md | 17 +++++++++++++++++ LICENSE-CC-BY-NC-4.0.txt | 1 - LICENSE.txt | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS-GUIDE.md b/CONTRIBUTORS-GUIDE.md index e69de29b..39167d4d 100644 --- a/CONTRIBUTORS-GUIDE.md +++ b/CONTRIBUTORS-GUIDE.md @@ -0,0 +1,17 @@ +# MPS Assets Contributors Guide + +This guide provides instructions for those authoring and submitting content to this o3de-multiplayer-assets repository. + +To Do: write this guide ... + +## Content Authoring Guidelines + +foo + +## Licensing and Legal Guidance + +bar + +## License + +For terms please see the LICENSE*.TXT files at the root of this distribution. diff --git a/LICENSE-CC-BY-NC-4.0.txt b/LICENSE-CC-BY-NC-4.0.txt index 5d734f01..60f9b9ec 100644 --- a/LICENSE-CC-BY-NC-4.0.txt +++ b/LICENSE-CC-BY-NC-4.0.txt @@ -1,4 +1,3 @@ -Loft Arch Vis Sample Assets Copyright 2022 Amazon.com, Inc. or its affiliates, all rights reserved. 3D models, image textures, and other asset files are licensed under a Creative Commons Attribution-NonCommercial 4.0 International License, available at http://creativecommons.org/licenses/by-nc/4.0/. diff --git a/LICENSE.txt b/LICENSE.txt index f7b4b47d..0b14a56e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -19,7 +19,7 @@ to separate license terms (such as the Kitbash3D assets or Mixamo files). It is your responsibility to comply with the applicable licenses. Information on third party materials, and the applicable license terms, are referenced in or included with the materials, such as in separate LICENSE*.txt -files accompanying the materials in each folder. +files accompanying the materials in each Gem or subfolder. Assets where special licensing terms are not otherwise stated are licensed under the Creative Commons license Attribution 4.0 International