From 1ff2b36e224129671329adc625e548b2e5a1f67d Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 13 Dec 2016 07:26:43 +0100 Subject: [PATCH] Empire: Specify licensing in documentation Also use permalink from the Wayback Machine for the Temple license statement. Also update release notes accordingly. --- CONTENT-LICENSE.txt | 13 ++++++++++++- README.md | 6 +++--- RELEASE-NOTES.md | 6 ++++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/CONTENT-LICENSE.txt b/CONTENT-LICENSE.txt index dc184de..6ad0164 100644 --- a/CONTENT-LICENSE.txt +++ b/CONTENT-LICENSE.txt @@ -20,7 +20,7 @@ Data/Textures/FurBW.jpg ## Slib assets (CC-BY-SA 3.0 Unported) -http://forums.wolfire.com/viewtopic.php?f=7&t=1066&start=270#p109473 +https://web.archive.org/web/20161213062413/http://forums.wolfire.com/viewtopic.php?f=7&t=1066 These assets are from the Temple campaign by Slib under CC-BY-SA 3.0 Unported: @@ -34,3 +34,14 @@ Data/Textures/GiTeared.png Data/Textures/GiBottom.png Data/Textures/Mask.png Data/Textures/temple/World.png + +## Jendraz assets (CC-BY-SA 4.0 International) + +https://web.archive.org/web/20161213062036/http://forums.wolfire.com/viewtopic.php?f=7&t=3797 + +These assets are from the Empire campaign by Jendraz, licensed under CC-BY-SA +4.0 International: + +Data/Campaigns/empire.txt + +Data/Maps/jendraz* diff --git a/README.md b/README.md index eafc046..e910a94 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,6 @@ The source code is distributed under the GNU General Public License version 2 or (at your option) any later version (GPLv2+). The assets (campaigns, graphical and audio assets, etc.) in the `Data` folder -are distributed under the Creative Commons Attribution - Share Alike license -version 3.0 Unported (CC-BY-SA 3.0) as described in the `CONTENT-LICENSE.txt` -file. +are distributed under the Creative Commons Attribution - Share Alike license, +some in version 3.0 Unported (CC-BY-SA 3.0) and others in version 4.0 +International (CC-BY-SA 4.0) as described in the `CONTENT-LICENSE.txt` file. diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 709bdd7..5e24345 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -15,8 +15,10 @@ therefore more advanced than the preceding Lugaru HD release by Wolfire. ### Highlights - Multiple campaigns support, making it easier to install and play mods! -- The Temple campaign by Silb is included by default as alternative to the - Turner official campaign. +- Those Lugaru mods are included by default as alternative to the Turner + official campaign: + * Temple, by Silb + * Empire, by Jendraz - All assets (animations, textures, models, maps, sounds, etc.) of Lugaru HD by Wolfire are under a free and open source license (CC-BY-SA 3.0)! - Window and input management ported from SDL 1.2 to SDL 2.0, improving the -- 2.39.5