From 744cb2ef9f349e45375bbc8df44e68824541bd7c Mon Sep 17 00:00:00 2001
From: Valdo Romao <v.romao@thecodingmachine.com>
Date: Thu, 22 Jul 2021 16:25:34 +0200
Subject: [PATCH] Update third party notice and fix licence typo
---
LICENCE.assets => LICENSE.assets | 20 ++++++++------------
LICENCE.code => LICENSE.code | 2 +-
LICENCE.map => LICENSE.map | 2 +-
README.md | 16 +++++++++++-----
map.json | 2 +-
5 files changed, 22 insertions(+), 20 deletions(-)
rename LICENCE.assets => LICENSE.assets (67%)
rename LICENCE.code => LICENSE.code (98%)
rename LICENCE.map => LICENSE.map (99%)
diff --git a/LICENCE.assets b/LICENSE.assets
similarity index 67%
rename from LICENCE.assets
rename to LICENSE.assets
index e8177c5..228f997 100644
--- a/LICENCE.assets
+++ b/LICENSE.assets
@@ -1,21 +1,17 @@
-ASSETS LICENCE
+ASSETS LICENSE
+(Notice)
+Assets distributed with a map are subject to different licenses.
+The license attributed to each tileset can be found or have to be added in the "tilesetCopyright" property of each tileset in the map.
+In addition, you have to add a section below with the specific license of the asset you want to use.
-WORKADVENTURE SPECIFIC RESOURCES LICENCE
-The User shall handle assets with the WorkAdventure specific resources licence as follows:
+WORKADVENTURE SPECIFIC RESOURCES LICENSE
+
+The User shall handle assets with the WorkAdventure specific resources license as follows:
1. These Assets may be used only in maps produced for WorkAdventure (SAAS or self-hosted version).
2. These Assets may be modified (colors or size changed, inverted, trimmed, etc.) only for purposes of use in maps produced for WorkAdventure (SAAS or self-hosted version).
3. These Assets or those modified pursuant to the previous item may undergo Distribution, etc. with maps produced for WorkAdventure. Furthermore, the User may not perform Distribution, etc. of individual Assets or those modified, or Distribution, etc. in combination with programs, etc. other than the map. However, the User may duplicate, transfer, publicly transmit, or enable transmission of personally-modified Assets to other Authorized Users free of charge.
-
-
-THIRD PARTIES ASSETS
-
-The User shall handle assets with third parties resources licence as follows:
-
-1. Follow the specific licence of each third party asset
-
-2. Credit the author with the "tilesetCopyright" property present in the properties of each tilesets in the map.json file
\ No newline at end of file
diff --git a/LICENCE.code b/LICENSE.code
similarity index 98%
rename from LICENCE.code
rename to LICENSE.code
index f96f5da..8d9a45c 100644
--- a/LICENCE.code
+++ b/LICENSE.code
@@ -1,4 +1,4 @@
-CODE LICENCE
+CODE LICENSE
MIT License
diff --git a/LICENCE.map b/LICENSE.map
similarity index 99%
rename from LICENCE.map
rename to LICENSE.map
index 00c3660..3895d72 100644
--- a/LICENCE.map
+++ b/LICENSE.map
@@ -1,4 +1,4 @@
-MAP LICENCE
+MAP LICENSE
https://creativecommons.org/licenses/by-sa/3.0/
diff --git a/README.md b/README.md
index c696b61..378cc05 100644
--- a/README.md
+++ b/README.md
@@ -15,10 +15,16 @@ npm run start
The project will run at http://localhost:8080/
-## Licences
+## Licenses
-This project contains multiple licences:
+This project contains multiple licenses:
-* [Code licence](./LICENCE.code) *(all files except those for other licenses)*
-* [Map licence](./LICENCE.map) *(`map.json` and the map visual as well)*
-* [Assets licence](./LICENCE.assets) *(the files inside the `src/assets/` folder)*
\ No newline at end of file
+* [Code license](./LICENSE.code) *(all files except those for other licenses)*
+* [Map license](./LICENSE.map) *(`map.json` and the map visual as well)*
+* [Assets license](./LICENSE.assets) *(the files inside the `src/assets/` folder)*
+
+### About third party assets
+
+If you add third party assets in your map, do not forget to:
+1. Credit the author and license with the "tilesetCopyright" property present in the properties of each tilesets in the `map.json` file
+2. Add the license text in LICENSE.assets
\ No newline at end of file
diff --git a/map.json b/map.json
index 05eb709..7357b17 100644
--- a/map.json
+++ b/map.json
@@ -198,7 +198,7 @@
{
"name":"mapCopyright",
"type":"string",
- "value":"Credits: Valdo Romao https:\/\/www.linkedin.com\/in\/valdo-romao\/ \nLicence: CC-BY-SA 3.0 (http:\/\/creativecommons.org\/licenses\/by-sa\/3.0\/)"
+ "value":"Credits: Valdo Romao https:\/\/www.linkedin.com\/in\/valdo-romao\/ \nLicense: CC-BY-SA 3.0 (http:\/\/creativecommons.org\/licenses\/by-sa\/3.0\/)"
},
{
"name":"script",
--
GitLab