zone support

2 files changed, 25 insertions, 31 deletions

diff --git a/doc/STORYLINE b/doc/STORYLINE
index 966feb6..33f532b 100644
--- a/doc/STORYLINE
+++ b/doc/STORYLINE
@@ -9,16 +9,15 @@ PLACES
 
 Borderworlds:
 
-System?
-	Planet Seymour
-	Regula mining operation
-
-	asteroid field
-
+Ghant System
 	Planet Ghant
 	Alexandria outpost
 	Battleship custodian
 
+	Planet Seymour
+	Regula mining operation
+
+	asteroid field
 
 Central worlds:
 
@@ -34,8 +33,8 @@ laughed it the mere idea, but in these outskirts of the galaxy
 chocolate was a hard to find commodity. And fresh milk? You'd have to
 have almost criminal connections to find it. fortunatly I had, and I did.
 These were times for celebration. I had spend the loan I managed to get 
-from the local planetairy bank on a small transort ship and just finished
-my first cargo shipment of <insert silly ore here> from the Regula mining
+from the local planetairy bank on a small transort ship and I had just 
+finished my first day of <insert silly ore here> transport from the Regula mining
 operation to Alexandria outpost. Not the glorious life I had gotten used
 to on the central planets, but at least a decent one with its small pleasures
 once in a while, like the cup of chocolate milk. The hundred credits I payed
@@ -56,7 +55,7 @@ We shared a few memories of distant times but it didn't take hime very long to c
 to the point.
 
 Brent was the business type. "The rising star of the Regula mining operations,
-overseeing all shipments og <fancy ore> in the Orion sector", to quote his words.
+overseeing all shipments of <fancy ore> in the Ghant system", to quote his words.
 His phrases like "A smart man could make a fortune" sounded rather hollow to me,
 but he did have a point. 500 runs to Regula to pay the loan for the ship.
 Another 1500 more to get myself a ship big enough to hold a small cabin with all the
@@ -73,7 +72,9 @@ All it misses is a pair of blasters to shoot the mosquitos from the windshield.
 
 That would have added another 50 runs to the price.
 
-
+The first two runs went smooth. Nothing unexpected. Pick up supplies at Alexandria,
+fly all the way to the Regula mining operation station, exchange the supplies
+for a shipment of <insert silly ore name here> and head back.
 
 
 Cali Prime 
diff --git a/doc/TODO b/doc/TODO
index f8d81c9..d80556f 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,16 +2,15 @@ TODO
 
 milestone 1:
 	fix turning (needs more testing)
-	fix camera frustum clip
 	fix cl_prediction
 
 milestone 2:
+	zones
 	targetting system
 	server-client event system, hit-once lightweight entities
 	explosion events
 	weapon fire events
-	zones
-
+	
 milestone 3:
 	gui
 
@@ -25,18 +24,9 @@ filesystem:
 model:
 	engine flare key (ok)
 	split map loader from model (ok)
+	model fragments (ok)
 
-	load vertices into VertexData
-	support map classes (e.g. func_rotate), requires class VertexData
-
-	rework textures/shaders
-		on .map load, convert 'common/entity' to a flag
-		rename 'entity' to 'primairy'
-		add 'common/primairy_dark', ''common/secondairy', 'common/secondairy_dark' and convert to flags
-		sort triangles by flags
-		render by flag
-		use quads array and quad flag?
-	
+	support model parts (e.g. func rotate)
 core:
 	connection to remote game (ok)
 	read/write configuration file (ok)
@@ -46,11 +36,11 @@ core:
 	globe entity (ok)
 	refactor 'say', it should not be a game function (ok)
 	execute config files (ok)
+	support entity secondairy color (ok)
 
 	zones (breaks network proto)
 	game module loading/unloading (breaks network proto, server must send module type)
-	support entity secondairy color (breaks network proto)
-
+	
 	toggle func to toggle a bool cvar
 
 network:
@@ -67,7 +57,8 @@ network:
 	group/clan chat (requires groups)
 	rcon authentication, rcon command, servers must be able to disable rcon
 
-	fix lag/client prediction
+	fix lag/client interpolation
+	rename cl_prediction to cl_interpolation
 	detect and disconnect clients behaving badly
 
 client:
@@ -78,7 +69,9 @@ client:
 	better crosshair bitmaps (ok)
 	keyboard repeat (ok)
 	fix tracking camera (ok)
-	
+
+	fix camera frustum clip (size issue, postponed)
+
 	shift/ctrl/alt modifier key binds	
 
 render:
@@ -88,8 +81,6 @@ render:
 	texture registry (ok)
 	add small camera light (ok)
 
-	text quads render pipe? (see model quads) 
-		- text can't be a in quadpipe -> gui layers
 	test/fix? lighting without sun in world.ini
 	sun light strenght
 
@@ -107,6 +98,8 @@ game:
 	implement player credits
 	entity health/shield/armor
 	gui concept artwork
+	docking
+	jumpgates, requires zones
 
 win32 port:
 	network not functional (ok)
@@ -114,4 +107,4 @@ win32 port:
 	screenshots are broken (ok)
 	sound is broken (ok)
 
-	directory creation
+	directory creation is broken