Merge from trunk.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1829

1 files changed, 12 insertions, 9 deletions

diff --git a/TODO b/TODO
index cd4006a3..b0acb8d3 100644
--- a/TODO
+++ b/TODO
@@ -1,17 +1,22 @@
+Currently in progress:
+
+* OPL MIDI playback (see: opl-branch)
+* Heretic/Hexen support (see: raven-branch)
+* Strife support (see: strife-branch)
+
 To do:
 
-* Install packages:
-  - Debian/Ubuntu .deb packages, Fedora .rpm packages.
-  - Windows NSIS installer.
-  - MacOS X .dmg packages (should be universal binaries!)
+* Demo hashes for regression testing of this and other ports.
 * File selector for chocolate-setup, so that WADs can be selected from
   a browser, instead of simply typing the filenames.
 * Multiplayer:
   - Master server for locating servers automatically - makes setting up
     public servers easier.
+  - Use UPnP to automatically configure port forwarding for NATted
+    networks.
   - Incorporate local LAN search into setup interface.
   - Multiplayer options and configuration file (server name, etc)
-* Improve multiplayer startup: 
+* Improve multiplayer startup:
   - Select an IWAD automatically from the server's game type rather than
     all players having to specify -iwad.
   - Send list of WADs to load instead of all clients having to specify -file.
@@ -20,16 +25,14 @@ To do:
   - Test on and fix for architectures where ((-2) >> 1) != -1
   - Use size-specific types (eg. int32_t instead of int)
   - Don't make structure packing assumptions when loading levels.
-* Port to every OS and architecture under the sun
+  - Port to every OS and architecture under the sun
 
 Crazy pie in the sky ideas:
 
 * Automatic WAD installer - download and run TCs from a list automatically
   (automating the current "instructions on wiki" system).
-* Textscreen interface to the Compet-N database: menu driven system to 
+* Textscreen interface to the Compet-N database: menu driven system to
   automatically download and play speedruns.
 * DWANGO-like interface for finding players and setting up games.
-* Demo hashes for regression testing of this and other ports.
-* OPL emulation
 * Video capture mode?