Pārlūkot izejas kodu

Merge pull request #610 from aaronfranke/3.1-readme-license-3.2

[3.1] Update README for the new 3.2 branch
Aaron Franke 4 gadi atpakaļ
vecāks
revīzija
e59d96ef7a
7 mainītis faili ar 139 papildinājumiem un 107 dzēšanām
  1. 6 0
      .editorconfig
  2. 2 0
      .gitattributes
  3. 9 0
      .gitignore
  4. 94 94
      2d/dodge_the_creeps/fonts/LICENSE.txt
  5. 2 2
      LICENSE.md
  6. 24 11
      README.md
  7. 2 0
      networking/webrtc_signaling/README.md

+ 6 - 0
.editorconfig

@@ -0,0 +1,6 @@
+# Top-most EditorConfig file.
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf

+ 2 - 0
.gitattributes

@@ -0,0 +1,2 @@
+# Normalize EOL for all files that Git considers text files.
+* text=auto eol=lf

+ 9 - 0
.gitignore

@@ -1,10 +1,19 @@
+# Godot 4+ specific ignores
+.godot/
+
 # Godot-specific ignores
 .import/
 export.cfg
 export_presets.cfg
+# Dummy HTML5 export presets file for continuous integration
+!.github/dist/export_presets.cfg
+
+# Imported translations (automatically generated from CSV files)
+*.translation
 
 # Mono-specific ignores
 .mono/
+data_*/
 mono_crash.*.json
 
 # System/tool-specific ignores

+ 94 - 94
2d/dodge_the_creeps/fonts/LICENSE.txt

@@ -1,94 +1,94 @@
-Copyright 2011-2016 Severin Meyer <[email protected]>,
-with Reserved Font Name Xolonium.
-
-This Font Software is licensed under the SIL Open Font License,
-Version 1.1. This license is copied below, and is also available
-with a FAQ at <http://scripts.sil.org/OFL>
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright 2011-2016 Severin Meyer <[email protected]>,
+with Reserved Font Name Xolonium.
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1. This license is copied below, and is also available
+with a FAQ at <http://scripts.sil.org/OFL>
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

+ 2 - 2
LICENSE.md

@@ -1,5 +1,5 @@
-Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.  
-Copyright (c) 2014-2020 Godot Engine contributors.
+Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. \
+Copyright (c) 2014-2021 Godot Engine contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

+ 24 - 11
README.md

@@ -6,22 +6,35 @@ be used with [Godot Engine](https://godotengine.org), the open source
 
 ## Godot versions
 
-- The [`master`](https://github.com/godotengine/godot-demo-projects) branch is compatible with the latest stable Godot version (currently 3.2).
+- The [`master`](https://github.com/godotengine/godot-demo-projects) branch is compatible with the latest stable Godot version (currently 3.3.x).
 - If you are using an older version of Godot, use the appropriate branch for your Godot version:
 
-  - [`3.1`](https://github.com/godotengine/godot-demo-projects/tree/3.1) branch
-  for Godot 3.1.x.
-  - [`3.0`](https://github.com/godotengine/godot-demo-projects/tree/3.0) branch
-  for Godot 3.0.x.
-  - [`2.1`](https://github.com/godotengine/godot-demo-projects/tree/2.1) branch
-  for Godot 2.1.x.
+  - [`3.2`](https://github.com/godotengine/godot-demo-projects/tree/3.2)
+    branch for Godot 3.2.x.
+  - [***`3.1`***](https://github.com/godotengine/godot-demo-projects/tree/3.1)
+    branch for Godot 3.1.x.
+  - [`3.0`](https://github.com/godotengine/godot-demo-projects/tree/3.0)
+    branch for Godot 3.0.x.
+  - [`2.1`](https://github.com/godotengine/godot-demo-projects/tree/2.1)
+    branch for Godot 2.1.x.
+
+## Importing all demos
+
+To import all demos at once in the project manager:
+
+- Clone this repository or [download a ZIP archive](https://github.com/godotengine/godot-demo-projects/archive/3.1.zip).
+  - If you've downloaded a ZIP archive, extract it somewhere.
+- Open the Godot project manager and click the **Scan** button on the right.
+- Choose the path to the folder containing all demos.
+- All demos should now appear in the project manager.
 
 ## Useful links
 
- - [Main website](https://godotengine.org)
- - [Source code](https://github.com/godotengine/godot)
- - [Documentation](http://docs.godotengine.org)
- - [Community hub](https://godotengine.org/community)
+- [Main website](https://godotengine.org)
+- [Source code](https://github.com/godotengine/godot)
+- [Documentation](http://docs.godotengine.org)
+- [Community hub](https://godotengine.org/community)
+- [TPS demo](https://github.com/godotengine/tps-demo)
 
 ## License
 

+ 2 - 0
networking/webrtc_signaling/README.md

@@ -15,6 +15,7 @@ This demo is devided in 4 parts:
 The protocol is text based, and composed by a command and possibly multiple payload arguments, each separated by a new line.
 
 Messages without payload must still end with a newline and are the following:
+
 - `J: ` (or `J: <ROOM>`), must be sent by client immediately after connection to get a lobby assigned or join a known one.
   This messages is also sent by server back to the client to notify assigned lobby, or simply a successful join.
 - `I: <ID>`, sent by server to identify the client when it joins a room.
@@ -25,6 +26,7 @@ Messages without payload must still end with a newline and are the following:
 When a lobby is sealed, no new client will be able to join, and the lobby will be destroyed (and clients disconnected) after 10 seconds.
 
 Messages with payload (used to transfer WebRTC parameters) are:
+
 - `O: <ID>`, used to send an offer.
 - `A: <ID>`, used to send an answer.
 - `C: <ID>`, used to send a candidate.