updated documentation: game data is now cc-by-sa-3.0

author: Stijn Buys <ingar@osirion.org> 2008-10-25 10:19:07 +0000
committer: Stijn Buys <ingar@osirion.org> 2008-10-25 10:19:07 +0000
commit: 02d49765b4bdb7c30b1cb56f3fe4f2cc814ff9e4 (patch)
tree: 2d3b8fe695b0aaed3c8061db5420269002d9fd1e /doc
parent: c1e61193411dc9bd22b19cde03680e04f55ba963 (diff)
6 files changed, 85 insertions, 45 deletions
diff --git a/doc/GAMEPLAY b/doc/GAMEPLAY
index 2f2160b..5577254 100644
--- a/doc/GAMEPLAY
+++ b/doc/GAMEPLAY
@@ -5,13 +5,19 @@ The Osirion Project - GAMEPLAY
 	eventually become. This document is a work in progress and is subject
 	to change. 
 
-General guidelines
+Overview
 
 	Project::OSiRiON is a multiplayer space game with persistent player
 	statistics. A single player mode with a compelling story is a 
 	secondary objective but the storyline serves as background for
 	the multiplayer universe.
 
+	The main goal of the game is to provide a universe for the players
+	to explore. Exploration is encouraged by the need for faster ships,
+	bigger guns and better trade deals.
+
+Guidelines
+
 	Project::OSiRiON is a 'serious' game. Names of objects, people and
 	places should be considered generic for the universe and should not
 	be rightout silly or offensive. Names should feel 'natural' in their
@@ -60,6 +66,12 @@ The Player
 	The goal is to become filthy rich and show it. Besides, with a particle
 	cannon and a target lock, nobody cares where your money comes from.
 
+	True roleplaying is outside the scope of the game itself. The universe 
+	(might/will) provide factions, friendly and hostile NPCS an strategic area's
+	but the game engine itself will not force true roleplaying. For example,
+	players will not be limited to certain ships and weapons depending on
+	their allegiances.
+	
 	Players can be hostile or friendly to each other.
 
 	Flying missions, mercenary, military or mercantile in nature.
@@ -182,3 +194,5 @@ Cargo
 Missions
 
 	I'd do anything for money, except working.
+
+
diff --git a/doc/STORYLINE b/doc/STORYLINE
index 9117c2d..632745a 100644
--- a/doc/STORYLINE
+++ b/doc/STORYLINE
@@ -344,7 +344,9 @@ II. Surprises
 
 III. The suit
 
-	The design of the ship was unfamiliar. It looked like a patrol craft, armed to the teeth
+	The design of the ship was unfamiliar. It reminded me of a patrol craft, armed to the teeth
 	and ready to defend itself if it were necessary. Fortunatly it looked like the pilot
 	had a more quiet evening in mind. It made a gracious arc around the Custodian before
-	heading straight to the docking clamps.
+	gliding into the docking clamps.
+
+
diff --git a/doc/assets.html b/doc/attributions.html
index 0f9cff8..1aa6c8d 100644
--- a/doc/assets.html
+++ b/doc/attributions.html
@@ -3,23 +3,24 @@
 <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 - Assets</TITLE>
+	<TITLE>The Osirion Project - Attributions</TITLE>
 </head>
 
 <body>
 <H1>
-	The Osirion Project - Assets
+	The Osirion Project - Attributions
 </H1>
+<h2>
+	Contributions
+</h2>
+<p>
+	These files were contributed to the project:
 <p>
-	Most of the game data was created by me, Ingar.
-	However, some files ware contributed by other people or were based on the work of others.
-
-
 <table>
 	<tr>
 		<TD><i>directory</i></td>
 		<td><i>file</i></t>
-		<td><i>author and/or source</i></td>
+		<td><i>contributor</i></td>
 	</tr>
 	<tr>
 		<td>/base/maps/ships</td>
@@ -144,60 +145,81 @@
 	</tr>
 
 	<tr>
-		<td>/base/sounds/engines</td>
-		<td>loop00.wav</td>
+		<td>/base/textures/env</td>
+		<td>sky12.tga</td>
 		<td>
-			<a href="http://freesound.iua.upf.edu/samplesViewSingle.php?id=22454">nathanshadow</a>
+			Thorn
 		</td>
 	</tr>
 	<tr>
-		<td>/base/sounds/engines</td>
-		<td>loop01.wav</td>
+		<td>/base/textures/env</td>
+		<td>sky17.tga</td>
 		<td>
-			<a href="http://freesound.iua.upf.edu/samplesViewSingle.php?id=22455">nathanshadow</a>
+			Thorn
 		</td>
 	</tr>
 	<tr>
-		<td>/base/sounds/engines</td>
-		<td>loop02.wav</td>
+		<td>/base/textures/env</td>
+		<td>sky20.tga</td>
 		<td>
-			<a href="http://freesound.iua.upf.edu/samplesViewSingle.php?id=22456">nathanshadow</a>
+			Thorn
 		</td>
 	</tr>
 	<tr>
 		<td>/base/textures/env</td>
-		<td>sky.tga</td>
+		<td>sky21.tga</td>
 		<td>
-			<a href="http://svs.gsfc.nasa.gov/vis/a000000/a003400/a003442/index.html">The Tycho Catalog Skymap</a><br>
-			NASA/Goddard Space Flight Center Scientific Visualization Studio
+			Thorn
 		</td>
 	</tr>
 	<tr>
 		<td>/base/textures/env</td>
-		<td>sky12.tga</td>
+		<td>sky31.tga</td>
 		<td>
 			Thorn
 		</td>
 	</tr>
+</table>
+
+<h2>
+	Derived works
+</h2>
+<p>
+	These files are available on the internet or are based on freely available works:
+<p>
+<table>
+	<tr>
+		<TD><i>directory</i></td>
+		<td><i>file</i></t>
+		<td><i>source</i></td>
+	</tr>
+	<tr>
+		<td>/base/sounds/engines</td>
+		<td>loop00.wav</td>
+		<td>
+			<a href="http://freesound.iua.upf.edu/samplesViewSingle.php?id=22454">nathanshadow</a>
+		</td>
+	</tr>
 	<tr>
-		<td>/base/textures/env</td>
-		<td>sky17.tga</td>
+		<td>/base/sounds/engines</td>
+		<td>loop01.wav</td>
 		<td>
-			Thorn
+			<a href="http://freesound.iua.upf.edu/samplesViewSingle.php?id=22455">nathanshadow</a>
 		</td>
 	</tr>
 	<tr>
-		<td>/base/textures/env</td>
-		<td>sky20.tga</td>
+		<td>/base/sounds/engines</td>
+		<td>loop02.wav</td>
 		<td>
-			Thorn
+			<a href="http://freesound.iua.upf.edu/samplesViewSingle.php?id=22456">nathanshadow</a>
 		</td>
 	</tr>
 	<tr>
 		<td>/base/textures/env</td>
-		<td>sky21.tga</td>
+		<td>sky.tga</td>
 		<td>
-			Thorn
+			<a href="http://svs.gsfc.nasa.gov/vis/a000000/a003400/a003442/index.html">The Tycho Catalog Skymap</a><br>
+			NASA/Goddard Space Flight Center Scientific Visualization Studio
 		</td>
 	</tr>
 	<tr>
@@ -225,12 +247,14 @@
 		</td>
 	</tr>
 </table>
-<p>
 	
 <p>
-	Files by <a href="http://freesound.iua.upf.edu/usersViewSingle.php?id=731"><strong>nathanshadow</strong></a>
+	Files by <a href="http://freesound.iua.upf.edu/usersViewSingle.php?id=731">nathanshadow</a>
 	are distributed under the terms of the 
 	<a href="http://creativecommons.org/licenses/sampling+/1.0/">Creative Commons Sampling Plus 1.0</a> license.
+<p>
+	Files by <a href="http://www.nasa.gov">NASA</a> are in the
+	<a href="http://www.nasa.gov/audience/formedia/features/MP_Photo_Guidelines.html">public domain</a>.
 </body>
 <html>
 
diff --git a/doc/index.html b/doc/index.html
index fd3006d..1d6abc1 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -48,6 +48,7 @@
 
 	<ul>
 		<li><a href="installation.html">Installation</a>
+		<li>Player manual
 		<li><a href="manual.html">User manual</a>
 	</ul>
 	<ul>
@@ -91,8 +92,6 @@
 		alpha testing
 		</td></tr>
 	</table>
-<p>
-	Refer to the <A href="assets.html">list of assets</a> for a complete overview.
 <h2>
 	Website
 </h2>
@@ -124,13 +123,14 @@
 	License
 </h2>
 <p>
-	The Osirion Project source code, the Project::OSiRiON game data 
-	and related files are distributed under the terms and conditions of the 
-	<a href="license.html">GNU General Public License version 2</a>.
+	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>
-	This includes the source code, project documentation and game data. 
-	Some of the game data is copyrighted by different authors. Refer to
-	the <A href="assets.html">list of assets</a> for a complete overview.
+	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>
+	However, a few files are distributed under the terms of a different license.
+	Please read the <A href="attributions.html">list of attributions</a> for a complete overview
+	of authors and copyright.
 <p>
 	Copyright &copy; 2007-2008<br> 
 	Stijn "Ingar" Buys &lt;ingar@telenet.be&gt;
@@ -144,8 +144,8 @@
 	QUAKE and ID are registered trademarks of Id Software, Inc.<br>
 	LEGO is a registered trademark of the LEGO Group.
 <p>
-	The Osirion Project is an independent not-for-profit project 
+	The Osirion Project is an independent, not-for-profit project 
 	and is not affiliated with these companies.
-
 </body>
 </html>
+
diff --git a/doc/installation.html b/doc/installation.html
index c6c972c..b74f3ed 100644
--- a/doc/installation.html
+++ b/doc/installation.html
@@ -117,7 +117,7 @@ unzip ../osirion-data-latest.zip
 	Obtaining the source code
 </h3>
 <p>
-	You can download the osirion source code from the osirion subversion repository:<br>
+	You can get the osirion project source code from the subversion repository:<br>
 	<a href="svn://intranifty.no-ip.org/osirion">svn://intranifty.no-ip.org/osirion</a>
 <p>
 	On linux, you can use the Subversion command line client tool. The following 
diff --git a/doc/style.css b/doc/style.css
index 68a8e19..e545e11 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -68,7 +68,7 @@ pre {
  margin-left: 64px;
  margin-right: 64px;
  width: auto;
- background-color: e5e5e5;
+ background-color: #e5e5e5;
  padding: 8px;
  padding-left: 16px;
 }
author	Stijn Buys <ingar@osirion.org>	2008-10-25 10:19:07 +0000
committer	Stijn Buys <ingar@osirion.org>	2008-10-25 10:19:07 +0000
commit	02d49765b4bdb7c30b1cb56f3fe4f2cc814ff9e4 (patch)
tree	2d3b8fe695b0aaed3c8061db5420269002d9fd1e /doc
parent	c1e61193411dc9bd22b19cde03680e04f55ba963 (diff)