Added a local chat channel. The say command defaults to zone chat, global messages can be send with the shout command.

Removed NonSolid flag fro race objects, have race use the local chat channel. 
Updated to network protocol version 22.
Updated developer documentation.

2 files changed, 44 insertions, 34 deletions

diff --git a/developer/ROADMAP b/developer/ROADMAP
index ed69556..98620ee 100644
--- a/developer/ROADMAP
+++ b/developer/ROADMAP
@@ -39,16 +39,16 @@
 
   Requires:
 
-	client console
-	entities
-	ship instances
-	network subsystem
-	entities
-	camera handling
-	keyboard bindings
-	zones
-	basic travelling: impulse drive, jump engine
-	basic docking
+	client console (ok)
+	entities (ok)
+	ship instances (ok)
+	network subsystem (ok)
+	entities (ok)
+	camera handling (ok)
+	keyboard bindings (ok)
+	zones (ok)
+	basic travelling: impulse drive, jump engine (ok)
+	basic docking (ok)
 
   ------------------------------------------------------------------
 
@@ -66,20 +66,17 @@
 	item info + lazy server-client exchange (ok)
 	trading (ok)
 	inventories (ok)
+	map entity descriptions (ok)
+	eject cargo/tractor beam (ok)
 
   Related:
 
-	map entity descriptions (ok)
-	eject cargo/tractor beam (ok) -> fx
-
+	beam particles
 	player-to-player trading
 	equipment trading
-	model weapon slots and positioning
 	
   Optional:
 
-	dockable player ships (ok)
-
 	fuel system
 	economy
 	per-item adjustabe depletion rate (won't do)
@@ -99,41 +96,53 @@
 		shop allows multiple buyers, p2p trading just one
 	player factory ships + base factories, per-item adjustabe conversion rate and ratio
 		e.g. 2 units of niobum to 1 superconductor per 30 seconds
-	player saving and network authentication
 	
+
+  Features:
+
+      	collision physics (ok)
+	collision meshes (ok)
+	dockable player ships (ok)
+
+	player saving and network authentication
+	zone chat
+
   ------------------------------------------------------------------
 
-  version 0.3.0 - Equipment
+  version 0.3.0 - Weapons and Equipment
 
   Description:
 
-	Players can buy and sell ship upgrades like armor and scanners,
-	this will require additional game mechanics.
 	Players can buy and sell weapons.
-
+	Players can buy and sell ship upgrades like armor and scanners,
+	
   Requires:
 	
 	cannons and turrets
 	cannon and turret models
+	model weapon slots and positioning
+	targetting
+	explosions, weapons fire and related sounds
+	equipment
+	weapon dealers and equipment traders
 
-  ------------------------------------------------------------------
+	improved particle systems	
 
-  version 0.4.0 - Physics
+  Features:
 
-  Requires:
+  ------------------------------------------------------------------
 
-	collision physics (box model collision implemented)
-	collision meshes
-	targetting
-	explosions, weapons fire and related sounds
+  version 0.4.0 - 
 
-	particle systems
+  Requires:
 
+  Features:
+	
   ------------------------------------------------------------------
 
-  version 0.5.0 - public alpha
+  version 0.5.0 - Public alpha
 
-  version 0.5.1 - bugfix release
+  version 0.5.1 - Bugfix release
 
   Description:
 
@@ -155,7 +164,7 @@
 
   ------------------------------------------------------------------
 
-  version 0.6.0 - NPC
+  version 0.6.0 - NPC's
 
   Requires:
 
@@ -189,4 +198,4 @@
 
   ------------------------------------------------------------------
 
-  version 2.0.0 - rewrite of the engine
+  version 2.0.0 - rewrite of the engine, singleplayer
diff --git a/developer/TODO b/developer/TODO
index 0e36ee0..69183f3 100644
--- a/developer/TODO
+++ b/developer/TODO
@@ -48,7 +48,6 @@ core:
 
 network:
 	protocol description (incomplete)
-	zone chat
 	group chat (requires player groups)
 	rcon authentication, rcon command, servers must be able to disable rcon
 	rconpassword: send md5sum instead of plaintext
@@ -65,6 +64,8 @@ network:
 	
 	reliable network messages (e.g. entity create/die)
 
+	(ok) zone chat
+
 client:
 	beam and eject cargo (commands implemented, needs UI and general FX)
 	add map window target model