From c68a2899dc63850d77f79eaa65125f6d503fc83a Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 17 Nov 2013 15:17:04 +0000
Subject: Added support for explosion sounds, updated list of attributions,
 updated starsystem roadmap.

---
 doc/attributions.html       | 39 +++++++++++++++++++++++++++++++++++----
 doc/starsystem_roadmap.html | 44 ++++++++++++++++++++++++++------------------
 2 files changed, 61 insertions(+), 22 deletions(-)

(limited to 'doc')

diff --git a/doc/attributions.html b/doc/attributions.html
index 3330b2c..fe90294 100644
--- a/doc/attributions.html
+++ b/doc/attributions.html
@@ -70,6 +70,7 @@
 
 	<tr>
 		<td colspan=3>
+			<hr>
 			<h3 class="content">Maps</h3>
 		</td>
 	</tr>
@@ -388,6 +389,7 @@
 
 	<tr>
 		<td colspan=3>
+			<hr>
 			<h3 class="content">Models</h3>
 		</td>
 	</tr>
@@ -421,9 +423,18 @@
 	
 	<tr>
 		<td colspan=3>
+			<hr>
 			<h3 class="content">Sounds</h3>
 		</td>
 	</tr>
+	<tr>
+		<td>sounds/game</td>
+		<td>mount.wav</a>
+		<td>
+			doorslam2a.wav by <a href="http://www.berklee.edu/">The Berklee College of Music</a>,
+			from the <a href="http://wiki.laptop.org/go/Free_sound_samples">OLPC Free Sound Samples</a>, edited by Ingar
+		</td>
+	</tr>
 	<tr>
 		<td>sounds/engines</td>
 		<td>loop00.wav</td>
@@ -450,7 +461,8 @@
 		<td>sounds/engines</td>
 		<td>jump_start00.wav</td>
 		<td>
-			<a href="http://www.freesound.org/samplesViewSingle.php?id=70044">juskiddink</a> <span class="superscript">Freesound</span>
+			Gliss FX 01.wav by <a href="http://www.greg-tripi.com/">Gregory Tripi</a>,
+			from the <a href="http://wiki.laptop.org/go/Free_sound_samples">OLPC Free Sound Samples</a>, edited by Ingar
 		</td>
 	</tr>
 
@@ -488,8 +500,8 @@
 		<td>sounds/projectiles</td>
 		<td>metrion.wav</td>
 		<td>
-			laser4.wav by Matt Lange, edited by Ingar
-			from the <a href="http://wiki.laptop.org/go/Free_sound_samples">OLPC Free Sound Samples</a>
+			laser4.wav by Matt Lange,
+			from the <a href="http://wiki.laptop.org/go/Free_sound_samples">OLPC Free Sound Samples</a>, edited by Ingar
 		</td>
 	</tr>
 	<tr>
@@ -505,6 +517,7 @@
 
 	<tr>
 		<td colspan=3>
+			<hr>
 			<h3 class="content">Textures</h3>
 		</td>
 	</tr>
@@ -578,6 +591,15 @@
 			<a href="http://freebitmaps.blogspot.com">Duael Designs LLC &amp; Robert Stein III</a>
 		</td>
 	</tr>
+	<tr>
+		<td>textures/planets</td>
+		<td>dagon.png</td>
+		<td>
+			Golivani from
+			<a href="http://www.celestiamotherlode.net/catalog/show_addon_details.php?addon_id=1613">Boliverius Alvera Sagittarii</a> by
+			<a href="http://www.celestiamotherlode.net/catalog/show_creator_details.php?creator_id=236">kristoffer</a>			
+		</td>
+	</tr>
 	<tr>
 		<td>textures/planets</td>
 		<td>finnmark.png</td>
@@ -621,7 +643,16 @@
 			Denirona from the Edin system by
 			<a href="http://www.celestiamotherlode.net/catalog/show_creator_details.php?creator_id=101">kikinho</a>
 		</td>
-	</tr>	
+	</tr>
+	<tr>
+		<td>textures/planets</td>
+		<td>rasheen.png</td>
+		<td>
+			Moon2 from
+			<a href="http://www.celestiamotherlode.net/catalog/show_addon_details.php?addon_id=1613">Boliverius Alvera Sagittarii</a> by
+			<a href="http://www.celestiamotherlode.net/catalog/show_creator_details.php?creator_id=236">kristoffer</a>			
+		</td>
+	</tr>
 	<tr>
 		<td>textures/planets</td>
 		<td>seymour.png</td>
diff --git a/doc/starsystem_roadmap.html b/doc/starsystem_roadmap.html
index 9a3efac..cbf5e9c 100644
--- a/doc/starsystem_roadmap.html
+++ b/doc/starsystem_roadmap.html
@@ -106,15 +106,22 @@
 <h4 class="content">Praetoria system</h4>
 <ul class="content">
 	<li class="content">planet Praetoria
-	<li class="content">Caesar, Praetorian moon
+	<li class="content">Caesar, lifeless planet
 </ul>
 <h4 class="content">Carthagio system</h4>
 <ul class="content">
+	<li class="content">Planet Carthagio, industrial planet
 	<li class="content">solar array
+	<li class="content">Medusa gas mining facility, phosphine production
 </ul>
 <h4 class="content">Hellas system</h4>
-
+<ul class="content">
+	<li class="content">Trireme station, PEX headquarters
+</ul>
 <h4 class="content">Phoenicia system</h4>
+<ul class="content">
+	<li class="content">Racetrack
+</ul>
 
 <!-- House Dagon =================================================== -->
 
@@ -156,7 +163,7 @@
 	Planet Brogha is the largest exporter of agricultural products in the Independent Colonies.
 </p>
 <ul class="content">
-	<li class="content">planet Brogha
+	<li class="content">planet Brogha, agricultural planet
 	<li class="content">Cantor observatory
 </ul>
 
@@ -165,15 +172,15 @@
 	Planet Antwerp is the headquarters of the Colonial Militia.
 </p>
 <ul class="content">
-	<li class="content">planet Antwerp
-	<li class="content">starbase Helianthos (guards the border)
-	<li class="content">Buccaneer's Den pirate base
+	<li class="content">planet Antwerpm nilitia headquarters
+	<li class="content">starbase Helianthos, guards the border
+	<li class="content">Hoboken, pirate base
 </ul>
 
 <h4 class="content">Kronenbaden system</h4>
 <ul class="content">
-	<li class="content">planet Baden
-	<li class="content">planet Krone
+	<li class="content">planet Baden, agricultural planet
+	<li class="content">planet Krone, industrial planet
 </ul>
 
 <h4 class="content">Khorsand system</h4>
@@ -275,11 +282,10 @@
 <p class="content">
 	Camorra is a system claimed by pirates
 </p>
-
 <ul class="content">
-	<li class="content">Port Royal, asteroid pirate base
+	<li class="content">planet Naples, pirate base
 </ul>
-	
+
 <!-- Southern Rim ================================================== -->
 
 <hr>
@@ -296,16 +302,16 @@
 <h4 class="content">Rinn system</h4>
 
 <h4 class="content">Amiras system</h4>
-
+	
 <!-- Tsu-Khan Empire =============================================== -->
 
 <hr>
 <h3 class="content">Tsu-Khan Empire</h3>
 
 <h4 class="content">Kiana system</h4>
-	<ul class="content">
-		<li class="content">Kiana Prime
-	</ul>
+<ul class="content">
+	<li class="content">Kiana Prime
+</ul>
 
 <h4 class="content">Alpha Kosiya</h4>
 
@@ -328,9 +334,12 @@
 <ul class="content">
 	<li class="content">Micron Corporation
 	<li class="content">AMTEL Tech Conglomerate
-	<li class="content">Joint Miners Association
+	<li class="content">Joint Miners Association (JMA)
 	<li class="content">Merchants Association
 	<li class="content">Mercenaries Guild
+	<li class="content">Praetorian Express (PEX)
+	<li class="content">Praetorian Guard
+	<li class="content">Universal Research
 </ul>
 
 </div> <!-- div content -->
@@ -347,7 +356,7 @@
 	</a>
 </div>
 <p>
-	Copyright &copy; 2007-2012 Project::OSiRiON
+	Copyright &copy; 2007-2013 Project::OSiRiON
 </p>
 </div>
 
@@ -356,4 +365,3 @@
 
 </html>
 
-
-- 
cgit v1.2.3