Răsfoiți Sursa

update to licensing

Signed-off-by: Jonny Galloway <[email protected]>
Jonny Galloway 2 ani în urmă
părinte
comite
946520517c
5 a modificat fișierele cu 49 adăugiri și 15 ștergeri
  1. 0 0
      CONTRIBUTORS-GUIDE.md
  2. 5 0
      LICENSE-CC-BY-NC-4.0.txt
  3. 41 14
      LICENSE.txt
  4. 1 0
      Project/Gem/enabled_gems.cmake
  5. 2 1
      Project/project.json

+ 0 - 0
CONTRIBUTORS-GUIDE.md


+ 5 - 0
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/.
+

+ 41 - 14
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.
- 
+
+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

+ 1 - 0
Project/Gem/enabled_gems.cmake

@@ -30,4 +30,5 @@ set(ENABLED_GEMS
     particlefx_mps
     Terrain
     DccScriptingInterface
+    QtForPython
 )

+ 2 - 1
Project/project.json

@@ -32,6 +32,7 @@
         "landscape_mps",
         "level_art_mps",
         "pbr_material_pack_mps",
-        "particlefx_mps"
+        "particlefx_mps",
+        "DccScriptingInterface"
     ]
 }