Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to licensing #27

Open
wants to merge 4 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions CONTRIBUTORS-GUIDE.md
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 4 additions & 0 deletions LICENSE-CC-BY-NC-4.0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Copyright 2022 Amazon.com, Inc. or its affiliates, all rights reserved.
HogJonny-AMZN marked this conversation as resolved.
Show resolved Hide resolved

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/.

55 changes: 41 additions & 14 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -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 Gem or subfolder.

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
Expand All @@ -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
2 changes: 2 additions & 0 deletions Project/Gem/enabled_gems.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@ set(ENABLED_GEMS
level_art_mps
pbr_material_pack_mps
particlefx_mps
DccScriptingInterface
QtForPython
)
7 changes: 4 additions & 3 deletions Project/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"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"
],
"user_tags": [
"MPS-Asset-Test"
],
"icon_path": "preview.png",
"engine": "o3de-sdk",
"engine": "o3de",
"external_subdirectories": [
"../Gems/character_mps",
"../Gems/kb3d_mps",
Expand All @@ -32,6 +32,7 @@
"landscape_mps",
"level_art_mps",
"pbr_material_pack_mps",
"particlefx_mps"
"particlefx_mps",
"DccScriptingInterface"
]
}