various minor issues: ESC closing chat, g_autolevel

2 files changed, 66 insertions, 29 deletions

diff --git a/doc/ROADMAP b/doc/ROADMAP
index 24a3643..3bd3dfd 100644
--- a/doc/ROADMAP
+++ b/doc/ROADMAP
@@ -1,6 +1,10 @@
-ROADMAP
 
-* MILESTONE 1 - version 0.1
+
+The Osirion Project - ROADMAP
+
+  ------------------------------------------------------------------
+
+* MILESTONE 1 - version 0.1 - The Universe
 
 Description:
 	The game takes place in a simple solar system with one star,
@@ -11,40 +15,65 @@ Description:
 	fly around and see each other. They can use chat to communicate, 
 	they can use private chat or global chat.
 
+	The game world is divided into zones, the zones can be populated
+	with entities. Players can jump between zones.
+
 Requires:
-	Client console
-	Entities
-	Ship instances
-	Network subsystem
-	Entities
-	Camera handling
-	Keyboard bindings
+	client console
+	entities
+	ship instances
+	network subsystem
+	entities
+	camera handling
+	keyboard bindings
+	zones
+	basic travelling
 
-* MILESTONE 2 - version 0.2
+  ------------------------------------------------------------------
+
+* MILESTONE 2 - version 0.2 - Interaction
 
 Description:
+	Players can dock at a space station, planets or large ships. Docking
+	a jumpgate enables hyperspace travel for smaller ships.
+	
 	Players can shoot at each other. They can crash into the star 
 	or the planet. Player ships explode on destruction.
 
 Requires:
-	Targetting
-	Events: explosions, weapons fire
-	Model weapon support
-	Turret and cannon models
-	Particle systems
+	basic docking
+	basic docking gui
+	targetting
+	events: explosions, weapons fire, sounds
+	weapon support
+	turret and cannon models
+	particle systems
 	clip brushes and collision detection
 
-* MILESTONE 3 - version 0.3
+  ------------------------------------------------------------------
 
-Description:
-	Players can dock at the space station and buy a ship or purchase
-	weapons.
+* MILESTONE 3 - version 0.3 - Commodities
 
+Description:
+	Players can buy and sell cargo at dockable entities.
+	
 Requires:
-	Docking
-	Docking GUI
+	player credits
+	enhanced docking
+	enhanced docking gui
+	commodities market
+	fuel system?
 
-* MILESTONE 4 - version 0.4
+  ------------------------------------------------------------------
+
+* MILESTONE 4 - version 0.4 - Equipment
+
+Description:
+	Players can buy and sell ship and equipment.
+
+Requires:
+	ship market
+	equipment market
 
 
 * MILESTONE 5
@@ -52,6 +81,8 @@ Requires:
 ..
 
 
+  ------------------------------------------------------------------
+
 * Release 1.0
 
 Requires:
diff --git a/doc/TODO b/doc/TODO
index d80556f..4c7d314 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,14 +2,15 @@ TODO
 
 milestone 1:
 	fix turning (needs more testing)
-	fix cl_prediction
+	fix cl_prediction (or not)
+	fix autolevel
 
 milestone 2:
 	zones
 	targetting system
 	server-client event system, hit-once lightweight entities
 	explosion events
-	weapon fire events
+	weapons fire events
 	
 milestone 3:
 	gui
@@ -37,11 +38,10 @@ core:
 	refactor 'say', it should not be a game function (ok)
 	execute config files (ok)
 	support entity secondairy color (ok)
+	toggle func to toggle a bool cvar (ok)
 
-	zones (breaks network proto)
 	game module loading/unloading (breaks network proto, server must send module type)
-	
-	toggle func to toggle a bool cvar
+	zone changes, clear entities
 
 network:
 	UDP datagrams (ok)
@@ -57,6 +57,8 @@ network:
 	group/clan chat (requires groups)
 	rcon authentication, rcon command, servers must be able to disable rcon
 
+	zone changes
+	send clients only updates from the current zone
 	fix lag/client interpolation
 	rename cl_prediction to cl_interpolation
 	detect and disconnect clients behaving badly
@@ -69,10 +71,12 @@ client:
 	better crosshair bitmaps (ok)
 	keyboard repeat (ok)
 	fix tracking camera (ok)
+	shift/ctrl/alt modifier key binds (ok)
 
 	fix camera frustum clip (size issue, postponed)
 
-	shift/ctrl/alt modifier key binds	
+	view_next, view_prev (ok)
+	mouse select on release event while 
 
 render:
 	render pipeline (ok)
@@ -83,6 +87,7 @@ render:
 
 	test/fix? lighting without sun in world.ini
 	sun light strenght
+	skysphere distortion at the poles
 
 gui:
 	a gui library with widgets and buttons
@@ -99,7 +104,8 @@ game:
 	entity health/shield/armor
 	gui concept artwork
 	docking
-	jumpgates, requires zones
+	jumpgates (required docking)
+	fix autolevel
 
 win32 port:
 	network not functional (ok)