diff --git a/Documents/Images/SS3DBanner1.png b/Documents/Images/SS3DBanner1.png deleted file mode 100644 index 166fcb20bb..0000000000 Binary files a/Documents/Images/SS3DBanner1.png and /dev/null differ diff --git a/Documents/LICENSE-ASSETS.md b/Documents/LICENSE-ASSETS.md index 78ab83c6c5..a26adaa113 100644 --- a/Documents/LICENSE-ASSETS.md +++ b/Documents/LICENSE-ASSETS.md @@ -3,16 +3,16 @@ By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. ### Table of Contents -- [Section 1 - Definitions](##Section-1-–-Definitions) -- [Section 2 – Scope](##Section-2-–-Scope) -- [Section 3 – License Conditions](##Section-3-–-License-Conditions) -- [Section 4 – Sui Generis Database Rights](##Section-4-–-Sui-Generis-Database-Rights) -- [Section 5 – Disclaimer of Warranties and Limitation of Liability](##Section-5-–-Disclaimer-of-Warranties-and-Limitation-of-Liability) -- [Section 6 – Term and Termination](##Section-6-–-Term-and-Termination) -- [Section 7 – Other Terms and Conditions](##Section-7-–-Other-Terms-and-Conditions) -- [Section 8 – Interpretation](##Section-8-–-Interpretation) +- [Section 1 - Definitions](#Section-1---Definitions) +- [Section 2 - Scope](#Section-2---Scope) +- [Section 3 - License Conditions](#Section-3---License-Conditions) +- [Section 4 - Sui Generis Database Rights](#Section-4---Sui-Generis-Database-Rights) +- [Section 5 - Disclaimer of Warranties and Limitation of Liability](#Section-5---Disclaimer-of-Warranties-and-Limitation-of-Liability) +- [Section 6 - Term and Termination](#Section-6---Term-and-Termination) +- [Section 7 - Other Terms and Conditions](#Section-7---Other-Terms-and-Conditions) +- [Section 8 - Interpretation](#Section-8---Interpretation) -## Section 1 – Definitions +## Section 1 - Definitions - **Adapted Material** means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. @@ -41,7 +41,7 @@ BY-NC-SA Compatible License means a license listed at creativecommons.org/compat - **You** means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. -## Section 2 – Scope +## Section 2 - Scope ### License grant @@ -56,8 +56,8 @@ BY-NC-SA Compatible License means a license listed at creativecommons.org/compat - Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. - Downstream recipients: - - Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. - - Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply. + - Offer from the Licensor - Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. + - Additional offer from the Licensor - Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply. - No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. - No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). @@ -70,7 +70,7 @@ BY-NC-SA Compatible License means a license listed at creativecommons.org/compat - To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes. -## Section 3 – License Conditions +## Section 3 - License Conditions Your exercise of the Licensed Rights is expressly made subject to the following conditions. @@ -93,11 +93,11 @@ Your exercise of the Licensed Rights is expressly made subject to the following ### ShareAlike - In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply. - - The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License. + - The Adapter's License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License. - You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material. - You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply. -## Section 4 – Sui Generis Database Rights +## Section 4 - Sui Generis Database Rights Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: @@ -107,7 +107,7 @@ Where the Licensed Rights include Sui Generis Database Rights that apply to Your For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. -## Section 5 – Disclaimer of Warranties and Limitation of Liability +## Section 5 - Disclaimer of Warranties and Limitation of Liability Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. @@ -115,7 +115,7 @@ To the extent possible, in no event will the Licensor be liable to You on any le The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. -## Section 6 – Term and Termination +## Section 6 - Term and Termination This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. @@ -129,13 +129,13 @@ For the avoidance of doubt, the Licensor may also offer the Licensed Material un Sections 1, 5, 6, 7, and 8 survive termination of this Public License. -## Section 7 – Other Terms and Conditions +## Section 7 - Other Terms and Conditions The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. -## Section 8 – Interpretation +## Section 8 - Interpretation For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 17fbcdedc7..e0119d252c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -136,7 +136,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.0.6.1 + bundleVersion: 0.0.6.2 preloadedAssets: - {fileID: 11400000, guid: 2b55e2e913cc78044a828c6fb589fb9e, type: 2} - {fileID: 11400000, guid: 443046479504c5640b8f5902a102c09f, type: 2} diff --git a/README.md b/README.md index 431b7b082f..3a8f2de930 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ -

SS3DSpace Station 3D is an open-source resurrection of *beep's original SS3D, which was an impressive demo attempting to give the infamous ss13 an extra dimension.

+

SS3DSpace Station 3D is an open-source resurrection of *beep's original SS3D, which was an impressive demo attempting to give the infamous ss13 an extra dimension.


INFO

-[GitHub Discussions](https://github.com/RE-SS3D/SS3D/discussions)**[About](https://ss3d.space/about/) - [FAQ](https://ss3d.space/faq/) - [Devblogs](https://ss3d.space/devblog/)** +**[About](https://ss3d.space/about/) - [FAQ](https://ss3d.space/faq/) - [Devblogs](https://ss3d.space/devblog/)** +[GitHub Discussions](https://github.com/RE-SS3D/SS3D/discussions) +[GitHub Milestones](https://github.com/RE-SS3D/SS3D/milestones)
@@ -12,13 +14,13 @@ [Latest Release](https://ss3d.space/download/) -[Latest Release](https://github.com/RE-SS3D/SS3D/releases/latest)The latest official build of SS3D. Working on Windows, needs testing on other OSs.[Latest Release Downloads](https://github.com/RE-SS3D/SS3D/releases/latest) +[Latest Release](https://github.com/RE-SS3D/SS3D/releases/latest)The latest official build of SS3D (tested on Windows but not other OSs).[Latest Release Downloads](https://github.com/RE-SS3D/SS3D/releases/latest) [Current Project](https://github.com/RE-SS3D/SS3D/archive/master.zip) -[Total Downloads](https://github.com/RE-SS3D/SS3D/releases)The current state of SS3D (every commit) in a .zip. You'll need to build the game in Unity.[Repo Size](https://github.com/RE-SS3D/SS3D) +[Total Downloads](https://github.com/RE-SS3D/SS3D/releases)The entire SS3D project in a .zip folder (must be built in Unity yourself).[Repo Size](https://github.com/RE-SS3D/SS3D) -***Note:*** *SS3D is currently still in a 'pre-alpha' phase as we do some redesigning, documenting, and core work. As such, there are not many systems, content, or even interactions at the moment. What you see currently is just the beginning to something much, much greater.* +***Note:*** *SS3D is still in a 'pre-alpha' phase while we concentrate on core mechanics. So, there isn't much content, systems, or even interactions currently. What you see now is just the beginning to something much, much greater.*
@@ -26,11 +28,11 @@ [PayPal](https://www.paypal.me/SpaceStation3D) -PayPal is where all our donations go before distribution to development costs. Use the link or send to our email (ress3d.project@gmail.com). +PayPal is where our donations go before distribution to development costs. Use link or send to our [email](mailto:ress3d.project@gmail.com). [Patreon](https://www.patreon.com/ss3d) -Patreon is our primary subscription-based donation platform with tiers (currently no extra benefit for different tiers). +Patreon is our subscription-based donation platform (currently no unique benefits for different tiers).
@@ -38,35 +40,35 @@ Patreon is our primary subscription-based donation platform with tiers (currentl [Discord](https://discord.gg/Z3sPhyS) -[Discord Members](https://discord.gg/Z3sPhyS)Discord is the primary communication for our devs and community. There you'll find helpful people, WIP content, & community polls. +[Discord Members](https://discord.gg/Z3sPhyS)Primary communication (devs & community). Includes helpful people, polls, & more. -[YouTube](https://www.youtube.com/@spacestation3d) +[Reddit](https://www.reddit.com/r/RESS3D/) -[YouTube Subscribers](https://www.youtube.com/@spacestation3d)Our YouTube is where we upload many of our important videos including 3D animations, trailers, and gameplay clips of teasers/tests. +[Reddit Followers](https://www.reddit.com/r/RESS3D/)Secondary community, with smililar content to our Discord but not nearly as active. -[Reddit](https://www.reddit.com/r/RESS3D/) +[YouTube](https://www.youtube.com/@spacestation3d) -[Reddit Followers](https://www.reddit.com/r/RESS3D/)We also have a subreddit, where you will find similar discussions and content posts, although it is not as active as our Discord server. +[YouTube Subscribers](https://www.youtube.com/@spacestation3d)Where we upload many videos including animations, trailers, and gameplay tests. [Twitter](https://twitter.com/SpaceStation3D) -[Twitter Followers](https://twitter.com/SpaceStation3D)Currently our twitter is mostly used for announcements & memes but we will start using it more for other posts eventually. +[Twitter Followers](https://twitter.com/SpaceStation3D)Used for announcements & memes but we will start using it more for other posts eventually.

CONTRIBUTING

-[Open Issues](https://github.com/RE-SS3D/SS3D/issues)[CONTRIBUTING.md](Documents/CONTRIBUTING.md) outlines some basics for contributing, but our [Dev Guide](https://ss3d.gitbook.io/dev-guide/) on GitBook goes into more detail with various guides & documents.[Closed Issues](https://github.com/RE-SS3D/SS3D/issues?q=is%3Aissue+is%3Aclosed) +[Open Issues](https://github.com/RE-SS3D/SS3D/issues)Our [Dev Guide](https://ss3d.gitbook.io/dev-guide/) outlines setting up the project and contributing to it with various tips and guidelines.[Closed Issues](https://github.com/RE-SS3D/SS3D/issues?q=is%3Aissue+is%3Aclosed) -[Open Pull Requests](https://github.com/RE-SS3D/SS3D/pulls)We also have an [Art Guide](https://ss3d.gitbook.io/art-guide/) on GitBook which outlines asset contributions with links and helpful guides.[Closed Pull Requests](https://github.com/RE-SS3D/SS3D/pulls?q=is%3Apr+is%3Aclosed) +[Open Pull Requests](https://github.com/RE-SS3D/SS3D/pulls)Our [Art Guide](https://ss3d.gitbook.io/art-guide/) outlines asset contributions like models, textures, animations, audio, etc.[Closed Pull Requests](https://github.com/RE-SS3D/SS3D/pulls?q=is%3Apr+is%3Aclosed) [github](https://github.com/RE-SS3D/SS3D/issues) -This GitHub repository hosts our [issues board](https://github.com/RE-SS3D/SS3D/issues) and [milestones board](https://github.com/RE-SS3D/SS3D/milestones), both of which help manage our technical tasks. +GitHub hosts our [issues board](https://github.com/RE-SS3D/SS3D/issues) and [milestones board](https://github.com/RE-SS3D/SS3D/milestones), both of which help manage technical tasks. [Trello](https://trello.com/ress3d) -Trello hosts all our other boards, including the task boards for our various asset types (3D, 2D, audio, etc.) and our management board. +Trello hosts our task boards for asset types (3D, 2D, audio, etc.) and our management board.
@@ -74,4 +76,4 @@ Trello hosts all our other boards, including the task boards for our various ass All **CODE** falls under the **[MIT](Documents/LICENSE-CODE.md)** license. -All **ART ASSETS** (3d assets, 2d assets, & sounds) fall under the **[CC BY-NC-SA 4.0](Documents/LICENSE-ASSETS.md)** license. +All **ASSETS** fall under the **[CC BY-NC-SA 4.0](Documents/LICENSE-ASSETS.md)** license.