trade updates

2 files changed, 12 insertions, 30 deletions

diff --git a/doc/GAMEPLAY b/doc/GAMEPLAY
index 54766ad..79fafba 100644
--- a/doc/GAMEPLAY
+++ b/doc/GAMEPLAY
@@ -149,10 +149,9 @@ Traveling
 
 Capital Ships
 
-	As the player earns money, he will hopefully eventually be able
-	to buy very large capital ships. Apart from beeing large and powerful,
-	capship can be docked by other players and used like any other dockable
-	planet or station.
+	As the player earns money, he will eventually be able to buy very large capital ships. 
+	Apart from beeing large and powerful, capship can be docked by other players and 
+	used like any other dockable planet or station.
 
 	A ship docked at the capship is able to use it as a carrier, and launch
 	when the carrier has reached its destination, or circumstances require it.
diff --git a/doc/TODO b/doc/TODO
index ef42f7f..3349760 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -5,26 +5,15 @@
 
   ------------------------------------------------------------------
 
-version 0.1.0:
+general:
 	documentation cleanup
 	finish player guide
-	udpate user manual
-	
-	SVN reorganisation
-	data reorganization
-
-	fix ui widget hierarchy
-
-version 0.2.0:
-	cargo
-	inventories
+	update user manual
 	server-client event system, hit-once lightweight entities
 	explosion events
 	sound events
 	world sounds
 	eject/beam cargo
-	
-version 0.3.0:
 	weapons
 	ship improvements (radars, shield, armor)
 	
@@ -37,13 +26,12 @@ filesystem:
 	fs_base, fs_mod, fs_game, to be used by modules
 	
 model:
-	read .ase material name
-	correct .map texture scaling issues
-	import .ase models into .map files (+submodel instancing) (ok, misc_model)
-	correct misc_model position issue when importing .map files
+	.ase submaterials
+	.3ds support
+	.md3 support
 
 core:
-	BUG dedicated server does not show chat messages
+	BUG dedicated server does not show chat messages (to be verified)
 	fix game.ini load/save sequence
 	
 network:
@@ -57,6 +45,7 @@ network:
 	fix lag/client interpolation
 	cl_prediction or cl_interpolation
 	detect and disconnect clients behaving badly
+
 	EXT messages, update extended property "ext id prop value prop value etc", type checking/seperator etc..
 	EXT zone/color/shield/armor/health
 	
@@ -66,25 +55,19 @@ client:
 	fix camera frustum clip (size issue, postponed)
 	tracking camera absolute speed/position
 	gui concept artwork
-	sanitize view menu remote command (ok)
-	fix map/hud selection interaction
-	split chat into chatwindow, chatbox and chathistory
-	add statuswindow and inventorywindow.h
 
 render:
 	star light strenght
 	sphere texture distortion at the poles
 
 ui:
-	add generic trade/inventory widget
+	
 
 sound:
 	entity/event positional sounds
 	jump drive sound events
 
 game:
-	player credits (ok)
-
 	entity health/shield/armor
 
 data:
@@ -92,4 +75,4 @@ data:
 	rename skies (lindblade1, lindblade2, ...)
 	
 win32 port:
-	pdcurses support (ok)
+