Merge pull request #47 from aaronfranke/readme-license

Update README and LICENSE for Godot 3.2

LICENSE.md

@@ -0,0 +1,39 @@
+All assets Copyright (c) 2018 Juan Linietsky, Fernando Miguel Calabró  
+Distributed under the terms of the Creative Commons Attribution License
+version 3.0 (CC-BY 3.0) <https://creativecommons.org/licenses/by/3.0/legalcode>.
+
+************************************************************************
+
+Music Copyright (c) 2018 Christian Fernando Perucchi  
+Distributed under the terms of the Creative Commons Attribution License
+version 3.0 (CC-BY 3.0) <https://creativecommons.org/licenses/by/3.0/legalcode>.
+
+************************************************************************
+
+Existing as derivatived work, many original Substance Painter materials
+used to create this scene were kindly provided by GameTextures.com
+
+************************************************************************
+
+All code Copyright (c) 2018-2020 Juan Linietsky, Godot Engine contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+************************************************************************

LICENSE.txt

@@ -1,23 +0,0 @@
-All assets (C) 2018 Juan Linietsky, Fernando Miguel Calabró
-Distributed under the terms of the Creative Commons Attribution License
-version 3.0 (CC-BY 3.0) <https://creativecommons.org/licenses/by/3.0/legalcode>.
-
---
-
-Music (C) 2018 Christian Fernando Perucchi
-Distributed under the terms of the Creative Commons Attribution License
-version 3.0 (CC-BY 3.0) <https://creativecommons.org/licenses/by/3.0/legalcode>.
-
---
-
-Existing as derivatived work, many original Substance Painter materials used to create this scene were kindly provided by GameTextures.com
-
---
-
-Code under MIT License, Copyright 2018 Juan Linietsky and Godot Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,14 +1,18 @@
 # Third Person Shooter Demo
 
+Third person shooter demo made using [Godot Engine](https://godotengine.org).
+
 ![Screenshot of TPS demo](screenshot.png)
 
-Third person shooter demo made using [Godot Engine](https://godotengine.org) 3.1.
+## Godot versions
+
+- The [`master`](https://github.com/godotengine/tps-demo) branch is compatible with the latest stable Godot version (currently 3.2).
+- If you are using an older version of Godot, use the appropriate branch for your Godot version:
 
-**Note:** Until Godot 3.1-stable is released, you need a recent build from Godot's
-*master* branch to run this demo. You can build the engine from source, or use one
-of @Calinou's [nightly builds](https://hugo.pro/projects/godot-builds).
+  - [`3.1`](https://github.com/godotengine/tps-demo/tree/3.1) branch
+  for Godot 3.1.x.
 
-**Note 2:** The repository is big and asset importing not well optimized yet, so expect
+**Note:** The repository is big and asset importing not well optimized yet, so expect
 a high CPU and RAM load when opening the project for the first time.
 
 ## Git LFS
@@ -36,8 +40,8 @@ your ``level/geometry/demolevel.dae`` file is over 300 MBs.
 
 ## Running
 
-You need [Godot Engine](https://godotengine.org) in version 3.1 or later to run
-this demo project. Download the latest stable version [from the website](https://godotengine.org/download/)
+You need [Godot Engine](https://godotengine.org) to run this demo project.
+Download the latest stable version [from the website](https://godotengine.org/download/),
 or [build it from source](https://github.com/godotengine/godot).
 
 Once you have cloned this repository and made sure that all LFS assets were
@@ -46,4 +50,4 @@ import of all assets.
 
 ## License
 
-See [LICENSE.txt](/LICENSE.txt) for details.
+See [LICENSE.md](LICENSE.md) for details.