Updated documentation, match documentation style with website stylesheet.

2 files changed, 22 insertions, 14 deletions

diff --git a/developer/STORYLINE b/developer/STORYLINE
index bdd73a9..7aff528 100644
--- a/developer/STORYLINE
+++ b/developer/STORYLINE
@@ -144,9 +144,10 @@
   ------------------------------------------------------------------
 	TIMELINE
 
-	Exodus			-5000 years
-	The Year of War		 -300 years
-	The Karelian Incident	  -50 years
+	Exodus			   0 AE (After Exodus)
+	The Year of War		 480 AE
+	The Karelian Incident	 510 AE
+	Today			 545 AE
 
 
   ------------------------------------------------------------------
@@ -160,11 +161,11 @@ Reaching for the Stars
 	there are few written accounts of the events before the Exodus, it wouldn't
 	be hard to imagine why the Homeworld would have been abandoned in the first 
 	place: wars for power, territory and resources would be commonplace 
-	for almost five millenia to come.
+	for almost five centuries to come.
 
 The Year of War
 	
-	For the Tsu-Khan, this war was no different. Around 300 years ago, 
+	For the Tsu-Khan, this war was no different. About a century ago, 
 	The Empire had depleted most of its natural resources and had launched 
 	an ambitious project to find a suitable new homeworld.
 	
@@ -214,7 +215,7 @@ The Alliance
 	tradition, where the Lords of the Major Houses used to work out their differences
 	with dialog, or discuss current events. In the years before the Great War, this
 	tradition had been neglected and oposing views were usually solved with a friendly
-	border skirmish followed by royal monetary compensation.
+	border skirmish followed by a royal monetary compensation.
 
 	These times were over. This war wasn't about money, power or territory.
 	It was about survival and it was clear by now that none of the Major Houses possessed
@@ -291,7 +292,7 @@ Project Osirion
 
 	The ship's first test flight was a major event. Most secret projects did not
 	generate a lot of attentention, but this flight was a higly anticipated by
-	the top brass from all parties involved, military, political and corporate alike.
+	the top brass from all parties involved: military, political and corporate alike.
 
 	The ship had left the construction yard as planned and had almost arrived at
 	departure point on the edge of the star system when suddenly all communication
@@ -299,9 +300,9 @@ Project Osirion
 	source of the malfunction, and everything that happened after this point is the
 	result of long-range sensor telemetry.
 
-	The ship arrived at the departure point and the flight continued as planned.
+	Sensors hat detected the ship arriving at the departure point and the flight continued as planned.
 	A few moments later a massive energy discharge was registered, indicating
-	that the experimental jump drive was activated. Unfortunatly, the order
+	the experimental jump drive was activated. Unfortunatly, the order
 	to return to the point of departure after the initial jump, seems to be a part of
 	the plan that never got executed. The ship had literally vanished into thin air.
 
@@ -494,6 +495,12 @@ II. Surprises
 	"1"... "0" ..."-1, Docking Bay". The low, humming noise of the elevator ended abruptly and the doors
 	opened again.
 	
+III. The Docking Bay
+
+	The warm arid air of the docking bay filled the elevator. Contemporary generator technology
+	tends to ionize the atmosphere and the distinct smell of a recently landed ship was 
+	noticably present //..more//.
+	
 Temporary notes:
 
 	III about getting stunned in the cargo bay 
diff --git a/developer/TODO b/developer/TODO
index 171b135..1703171 100644
--- a/developer/TODO
+++ b/developer/TODO
@@ -25,7 +25,7 @@ filesystem:
 	fs_base, fs_mod, fs_game, to be used by modules
 	
 model:
-	.obj support
+	(ok) .obj support
 	.md3 support
 
 	(ok) .ase submaterials (ok)
@@ -94,11 +94,11 @@ render:
 
 ui:
 	unify event handlers, expand Event class and make derived event classes	
-	listview scrolling
+	(ok) listview scrolling
 	
-	make modelview and slider dragging work when the mouse leaves the widget
-	if the mouse button is pressed, mouse focus should stick to the last clicked widget
-	until the button is released
+	(ok) make modelview and slider dragging work when the mouse leaves the widget:
+		if the mouse button is pressed, mouse focus should stick to the last clicked widget
+		until the button is released
 
 	(ok) slider mouse dragging
 	(ok) correct modelview lighting
@@ -113,6 +113,7 @@ sound:
 game:
 	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
+	move Ship::dock() functionality into core::EntityControlable
 
 	ship health/shield/armor
 	add fleet support