diff options
| author | Stijn Buys <ingar@osirion.org> | 2008-11-11 15:12:08 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2008-11-11 15:12:08 +0000 |
| commit | 3082cb197fb6af7d069f9ad211ff6ea5657d924a (patch) | |
| tree | 144305cfc19c94a60b0d0bd92eaaa263e1f54cbc | |
| parent | 2b8b9b2883627ffd6a932e7be1b241509b49c606 (diff) | |
removed license.html, added guide.html
| -rw-r--r-- | doc/guide.html | 45 | ||||
| -rw-r--r-- | doc/index.html | 55 | ||||
| -rw-r--r-- | doc/license.html | 367 | ||||
| -rw-r--r-- | doc/manual.html | 4 |
4 files changed, 81 insertions, 390 deletions
diff --git a/doc/guide.html b/doc/guide.html new file mode 100644 index 0000000..b923c5e --- /dev/null +++ b/doc/guide.html @@ -0,0 +1,45 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html lang="en"> +<head> + <meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> + <link rel="stylesheet" type="text/css" href="style.css"> + <TITLE>The Osirion Project - Player guide</TITLE> +</head> + +<body> + +<h1> + The Osirion Project - Player guide +</h1> + +<h2> + User Interface +</h2> + +<h2> + HUD +</h2> + +<h2> + Fligh controls +</h2> + +<h2> + Keyboard +</h2> +<p> + This is the default keyboard configuration: +</p> + +<h2> + Joystick +</h2> +<p> + This is the default joystick configuration: +</p> +<h2 class="navigate"> + <a href="index.html">back</a> +</h2> + +</body> +</html>
\ No newline at end of file diff --git a/doc/index.html b/doc/index.html index 25edb27..87e4903 100644 --- a/doc/index.html +++ b/doc/index.html @@ -42,19 +42,16 @@ <h2> Content </h2> - +<p> <ul> <li><a href="installation.html">Installation</a> - <li>Player manual + <li><a href="guide.html">Player guide</a> <li><a href="manual.html">User manual</a> </ul> <ul> <li><a href="world.html">Editing the world</a> <li><a href="models.html">Creating models</a> </ul> - <ul> - <li>Developer section - </ul> </p> <h2> @@ -89,39 +86,29 @@ alpha testing </td></tr> </table> + <h2> Website </h2> <p> - The website for the osirion project can be found at:<br> + The website for the osirion project can be found at <a href="http://ingar.satgnu.net/osirion">http://ingar.satgnu.net/osirion</a> +</p> + <h2> IRC </h2> <p> The official Osirion IRC channel is #osirion on irc.soliter.org +</p> + <h2> - Acknowledgements -</h2> -<p> - This project could not have been possible without the work of others: - <ul> - <li>Id Software - <li>the GtkRadiant project contributers - <li>The Quake2World community - <li>The Satgnu crew - <li>maci, for the webspace on satgnu - <li>DVSoftware for bandwidth, diskpace and CPU power - <li>NASA for their collection of freely available images - <li>Thanks to bobke and blaze-x - <li>A special thanks to all =KCT= members - </ul> -<h2> - License + Copyright </h2> <p> The Osirion Project source code is distributed under the terms and conditions of the <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License</a>. +</p> <p> The Project::OSiRiON game data is distributed under the terms and conditions of the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Create Commons Attribution-Share Alike 3.0 License</a>.<br> @@ -134,15 +121,37 @@ <p> Contact me if you want to use (portions of) this project under a non-compatible, but otherwise free, licence. + +<h2> + Acknowledgements +</h2> +<p> + This project could not have been possible without the work of others: + <ul> + <li>Id Software + <li>the GtkRadiant project contributers + <li>The Quake2World community + <li>The Satgnu crew + <li>maci, for the webspace on satgnu + <li>DVSoftware for bandwidth, diskpace and CPU power + <li>NASA for their collection of freely available images + <li>Thanks to bobke and blaze-x + <li>A special thanks to all =KCT= members + </ul> +</p> + <h2> Trademarks </h2> <p> QUAKE and ID are registered trademarks of Id Software, Inc.<br> LEGO is a registered trademark of the LEGO Group. +</p> <p> The Osirion Project is an independent, not-for-profit project and is not affiliated with these companies. +</p> + </body> </html> diff --git a/doc/license.html b/doc/license.html deleted file mode 100644 index d0c3e55..0000000 --- a/doc/license.html +++ /dev/null @@ -1,367 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html lang="en"> -<head> - <meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> - <link rel="stylesheet" type="text/css" href="style.css"> - <TITLE>The Osirion Project - GNU General Public License, version 2</TITLE> -</head> -<body> - -<H1> - GNU General Public License -</H1> -<h2> - Version 2, June 1991 -</h2> -<p> - Copyright (C) 1989, 1991 Free Software Foundation, Inc.<br> - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -<p> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -<h2> - Preamble -</h2> -<p> - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. -<p> - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. -<p> - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. -<p> - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. -<p> - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. -<p> - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. -<p> - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. -<p> - The precise terms and conditions for copying, distribution and -modification follow. -<h2> - GNU GENERAL PUBLIC LICENSE<br> - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -</h2> -<p> - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". -<p> -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. -<p> - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. -<p> -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. -<p> - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: -<ul> - <li>a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - <li>b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - <li>c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) -</ul> -<p> -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. -<p> -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. -<p> -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. -<p> - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: -<ul> - <li>a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - <li>b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - <li>c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) -</ul> -<p> -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. -<p> -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. -<p> - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. -<p> - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. -<p> - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. -<p> - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. -<p> -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. -<p> -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. -<p> -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. -<p> - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. -<p> - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. -<p> -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. -<p> - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. -<h2> - NO WARRANTY -</h2> -<p> - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. -<p> - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. -<p> -<h2> - END OF TERMS AND CONDITIONS -</h2> -<h1> - How to Apply These Terms to Your New Programs -</h1> -<p> - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. -<p> - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. -<pre> - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -</pre> -<p> -Also add information on how to contact you by electronic and paper mail. -<p> -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: -<pre> - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. -</pre> -<p> -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. -<p> -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: -<pre> - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice -</pre> -<p> -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. -</body> -</html> diff --git a/doc/manual.html b/doc/manual.html index bb35f07..261b7e3 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -312,5 +312,9 @@ osiriond +set sv_name My Osirion Server On windows32, the game uses the <i>My Documents\My Games\Osirion</i> subdirectory as your personal directory. For example, the client.ini can be found as <i>My Documents\My Games\Osirion\base\client.ini</i>. +<h2 class="navigate"> + <a href="index.html">back</a> +</h2> + </body> </html> |