Updated documentation with new site URL's.

4 files changed, 41 insertions, 33 deletions

diff --git a/developer/TODO b/developer/TODO
index 97ef271..0e36ee0 100644
--- a/developer/TODO
+++ b/developer/TODO
@@ -41,6 +41,7 @@ core:
 	fix game.ini load/save sequence
 	fx events: jump events, tracktor beams, weapons fire
 	pause game loop when there are no players
+	support for entities like nebulas and asteroid fields
 
 	(ok) optimize KeepAlive sweep performance
 	(ok) remove EntityControlable::movement(), render dust based on control->speed()
@@ -79,13 +80,14 @@ client:
 	(ok) testmodel functionality	
 
 render:
-	correct Camera::axis when using ModelView (-> flare axis in testmodel)
 	fix skybox envmapping -> cube map
 	star light strenght
 	general globe texture stretching, coordinates seem to be off
+	multitexture materials
 
 	(ok) have r_loadmodels load particle scripts and flare textures
 	(ok) disable texturing and lighting while drawing normals
+	(ok) correct Camera::axis when using ModelView (-> flare axis in testmodel)
 
 	(unfixable) globe texture distortion at the poles
 
@@ -108,7 +110,7 @@ sound:
 	(ok) suppress error message spam if the sound subsystem failed to initialize
 
 game:
-	add Ship::ship_dock, making docking independent of player->view()
+	add Ship::ship_dock, making docking independent of player->view() -> relates to player-to-player trading
 	have the goto command check the target's Docked state -> ties into ship dock awereness
 
 	ship health/shield/armor
diff --git a/doc/index.html b/doc/index.html
index 528a1d3..4a55052 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -71,7 +71,7 @@
 <div class="text">
 <p>
 	The website for Project::OSiRiON can be found at
-	<a href="http://ingar.satgnu.net/osirion">http://ingar.satgnu.net/osirion</a>
+	<a href="http://osirion.org">http://osirion.org</a>
 </p>
 <p>
 	The official IRC channel is  <a href="irc://chat.freenode.net/%23osirion">#osirion</a> on the 
@@ -96,7 +96,7 @@
 </p>
 <p>
 	The 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>
+	<a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 License</a>.<br>
 </p>
 <p>
 	A few files are distributed under the terms of a different license.
@@ -104,52 +104,47 @@
 	of authors and copyright.
 </p>
 <p>
-	Copyright &copy; 2007-2010, Stijn 'Ingar' Buys &lt;ingar@telenet.be&gt;
+	Copyright &copy; 2007-2011, Stijn 'Ingar' Buys &lt;ingar@telenet.be&gt;
 </p>
 </div>
 
 
-<div id="contributors" class="title">
-	Project Contributors
+<div id="team" class="title">
+	Team
 </div>
 
 <div class="text">
 	<table>
 		<tr>
 		<td>Stijn 'Ingar' Buys</td>
-		<td>Design, programming, modeling, graphics, sounds, world</td>
+		<td>Programming, modeling, graphics, sounds</td>
 		</tr>
 
 		<tr>
-		<td>Evan 'Odin' Goers</td>
-		<td>Design, modeling, graphics, world</td>
+		<td>Michael 'Thorn' Rodenhurst</td>
+		<td>Modeling, graphics, web server</td>
 		</tr>
 
 		<tr>
-		<td>Michael 'Thorn' Rodenhurst</td>
-		<td>Design, modeling, graphics, world</td>
+		<td>Evan 'Odin' Goers</td>
+		<td>Modeling, graphics</td>
 		</tr>
 
 		<tr>
 		<td>Cody 'Supertanker' Jackson</td>
 		<td>Modeling</td>
 		</tr>
+	</table>
+</div>
+
+<div id="contributors" class="title">
+	Contributors
+</div>
 
 		<tr>
 		<td>Antti 'Karvajalka' Lahti</td>
 		<td>Modeling, graphics</td>
 		</tr>
-
-		<tr>
-		<td>
-		Josky=KCT=<br>
-		[mDc]Minisori<br>
-		Gareth<br>
-		StalKermit<br>
-		DVSoftware
-		</td>
-		<td>Alpha testing</td>
-		</tr>
 	</table>
 </div>
 
@@ -176,6 +171,16 @@
 	</ul>
 </p>
 <p>
+	Thanks to:
+	<ul>
+		<li>Josky=KCT=
+		<li>[mDc]Minisori
+		<li>Gareth
+		<li>StalKermit
+		<li>DVSoftware
+	</ul>
+</p>
+<p>
 	QUAKE and ID are registered trademarks of Id Software, Inc.<br>
 	LEGO is a registered trademark of the LEGO Group.
 </p>
diff --git a/doc/installation.html b/doc/installation.html
index 4f4ef79..7537b30 100644
--- a/doc/installation.html
+++ b/doc/installation.html
@@ -45,7 +45,7 @@
 <div class="text">
 <p>
 	You can find the latest version in the downloads section of the website:<br>
-	<a href="http://ingar.satgnu.net/osirion/index.html#downloads">http://ingar.satgnu.net/osirion</a>
+	<a href="http://osirion.org/index.php?page=downloads">http://osirion.org</a>
 </p>
 </div>
 
@@ -56,16 +56,16 @@
 <div class="text">
 <p>
 	Download for 32-bit windows<br>
-	<a href="http://ingar.satgnu.net/osirion/files/osirion-win32-latest.zip">osirion-win32-latest.zip</a> (32-bit)<br>
+	<a href="http://osirion.org/files/osirion-win32-latest.zip">osirion-win32-latest.zip</a> (32-bit)<br>
 	This package should work on most windows systems.
 </p>
 <!--<p>	
 	Download for 64-bit windows<br>
-	<a href="http://ingar.satgnu.net/osirion/files/osirion-win64-latest.zip">osirion-win64-latest.zip</a> (64-bit)<br>
+	<a href="http://osirion.org/files/osirion-win64-latest.zip">osirion-win64-latest.zip</a> (64-bit)<br>
 </p>-->
 <p>
 	Dowload the game data package:<br>
-	<a href="http://ingar.satgnu.net/osirion/files/osirion-data-latest.zip">osirion-data-latest.zip</a><br>
+	<a href="http://osirion.org/files/osirion-data-latest.zip">osirion-data-latest.zip</a><br>
 </p>
 <p>
 	Unzip the executables package to an approriate directory. Unzip the game data package
@@ -90,7 +90,7 @@
 </p>
 <p>
 	Linux download:<br>
-	<a href="http://ingar.satgnu.net/osirion/files/osirion-linux-latest.tar.bz2">osirion-linux-latest.tar.bz2</a> (32- and 64-bit)<br>
+	<a href="http://osirion.org/files/osirion-linux-latest.tar.bz2">osirion-linux-latest.tar.bz2</a> (32- and 64-bit)<br>
 	This package contains the linux version of the client and the server.
 </p>
 <p>
@@ -103,7 +103,7 @@ cd osirion-linux-875
 </div>
 <p>
 	Dowload the game data package:<br>
-	<a href="http://ingar.satgnu.net/osirion/files/osirion-data-latest.zip">osirion-data-latest.zip</a><br>
+	<a href="http://osirion.org/files/osirion-data-latest.zip">osirion-data-latest.zip</a><br>
 </p>
 <p>
 	Unzip it:
@@ -233,7 +233,7 @@ svn co svn://intranifty.no-ip.org/osirion osirion
 <p>
 	You can also download the source package from the website:<br>
 	<ul>
-	<li><a href="http://ingar.satgnu.net/osirion/files/osirion-src-latest.tar.bz2">osirion-src-latest.tar.bz2</a>
+	<li><a href="http://osirion.org/files/osirion-src-latest.tar.bz2">osirion-src-latest.tar.bz2</a>
 	<ul>
 </p>
 </div>
diff --git a/doc/models.html b/doc/models.html
index e0667ba..2725bff 100644
--- a/doc/models.html
+++ b/doc/models.html
@@ -43,8 +43,9 @@
 <p>
 <ul>
 	<li><a href="#materials">Textures and Materials</a>
-	<li><a href="#shaders_files">Shader files</a>
-
+	<ul>
+		<li><a href="#shaders_files">Shader files</a>
+	</ul>
 	<li><a href="#gtkradiant">Creating models with Radiant</a>
 	<ul>
 		<li><a href="#brushes_and_sizes">Brushes and sizes</a>
@@ -127,7 +128,7 @@ kuroto
 </div>
 
 <!-- =============================================================== -->
-<div class="title" id="shader_files">
+<div class="subtitle" id="shader_files">
 	Shader files
 </div>
 <div class="text">