From 141236fcad5a7379dfbda651fc5de863539d5644 Mon Sep 17 00:00:00 2001 From: John3 Date: Sun, 18 Dec 2016 15:49:40 -0600 Subject: [PATCH 1/5] added LICENSE --- LICENSE.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000000..3a07359cf3 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 GarageGames, LLC + +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. From a1b96ac3730b95e337379305e72310ab9e5ffee8 Mon Sep 17 00:00:00 2001 From: John3 Date: Sun, 18 Dec 2016 16:21:07 -0600 Subject: [PATCH 2/5] Added badges badges =) --- README.md | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 88bd21f466..b57a05e0cb 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,12 @@ MIT Licensed Open Source version of [Torque 3D](http://torque3d.org) from [GarageGames](http://www.garagegames.com) +[![GitHub tag](https://img.shields.io/github/tag/GarageGames/Torque3D.svg)](https://github.com/GarageGames/Torque3D/tags) +[![GitHub release](https://img.shields.io/github/release/GarageGames/Torque3D.svg)](https://github.com/GarageGames/Torque3D/releases/latest) +[![Github All Releases](https://img.shields.io/github/downloads/GarageGames/Torque3D/total.svg)](https://github.com/GarageGames/Torque3D/releases/latest) + +[![IRC](https://img.shields.io/badge/irc-%23garagegames-green.svg)](https://kiwiirc.com/client/irc.maxgaming.net/?nick=wiki_user|?#garagegames) + ## More Information * [Homepage](http://torque3d.org) @@ -21,24 +27,6 @@ They are available from the [downloads](http://wiki.torque3d.org/main:downloads) * [Project Manager repository](https://github.com/GarageGames/Torque3D-ProjectManager) * [Offline documentation repository](https://github.com/GarageGames/Torque3D-Documentation) -# License - - Copyright (c) 2012 GarageGames, LLC - - 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 + +All assets and code are under the [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/GarageGames/Torque3D/blob/master/LICENSE.md) From 5c2d3ac186db3288c56559f47e3f7259d4d09f41 Mon Sep 17 00:00:00 2001 From: John3 Date: Sun, 18 Dec 2016 18:07:25 -0600 Subject: [PATCH 3/5] license badge typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b57a05e0cb..97c8d9377b 100644 --- a/README.md +++ b/README.md @@ -29,4 +29,4 @@ They are available from the [downloads](http://wiki.torque3d.org/main:downloads) # License -All assets and code are under the [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/GarageGames/Torque3D/blob/master/LICENSE.md) +All assets and code are under the [![license](https://img.shields.io/github/license/GarageGames/Torque3D.svg)](https://github.com/GarageGames/Torque3D/blob/master/LICENSE.md) From d7979d124c3f4b4d982191b923286e9e39bf066a Mon Sep 17 00:00:00 2001 From: John3 Date: Wed, 21 Dec 2016 08:28:01 -0600 Subject: [PATCH 4/5] Update LICENSE.md --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 3a07359cf3..7eaddb5df8 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2016 GarageGames, LLC +Copyright (c) 2012-2016 GarageGames, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From f080eda9f209c8b7f0ac6a6626bac4321685e556 Mon Sep 17 00:00:00 2001 From: John3 Date: Wed, 21 Dec 2016 08:29:01 -0600 Subject: [PATCH 5/5] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 97c8d9377b..db43f542f9 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ They are available from the [downloads](http://wiki.torque3d.org/main:downloads) ## Related repositories -* [Torque 3D main repository](https://github.com/GarageGames/Torque3D) (you are here!) * [Project Manager repository](https://github.com/GarageGames/Torque3D-ProjectManager) * [Offline documentation repository](https://github.com/GarageGames/Torque3D-Documentation)